From 7059dad90457cda5074783411fbe9b513c7c9ae3 Mon Sep 17 00:00:00 2001
From: qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 27 Apr 2009 04:03:40 +0000
Subject: [PATCH] Fix the bug that the "Offset" parameter for DiskIo protocol
 should be byte-oriented.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8175 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Universal/Disk/PartitionDxe/ElTorito.c         |  4 ++--
 MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c     | 14 +++++++-------
 MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c     |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
index 9229a8cbe7..342e186191 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
@@ -100,7 +100,7 @@ PartitionInstallElToritoChildHandles (
     Status = DiskIo->ReadDisk (
                        DiskIo,
                        Media->MediaId,
-                       VolDescriptorLba,
+                       MultU64x32 (VolDescriptorLba, Media->BlockSize),
                        Media->BlockSize,
                        VolDescriptor
                        );
@@ -143,7 +143,7 @@ PartitionInstallElToritoChildHandles (
     Status = DiskIo->ReadDisk (
                        DiskIo,
                        Media->MediaId,
-                       Lba,
+                       MultU64x32 (Lba, Media->BlockSize),
                        Media->BlockSize,
                        Catalog
                        );
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
index 3f352cc318..a54bd48ba9 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
@@ -296,12 +296,12 @@ PartitionInstallGptChildHandles (
   }
 
   Status = DiskIo->ReadDisk (
-                    DiskIo,
-                    BlockIo->Media->MediaId,
-                    MultU64x32(PrimaryHeader->PartitionEntryLBA, BlockSize),
-                    PrimaryHeader->NumberOfPartitionEntries * (PrimaryHeader->SizeOfPartitionEntry),
-                    PartEntry
-                    );
+                     DiskIo,
+                     BlockIo->Media->MediaId,
+                     MultU64x32(PrimaryHeader->PartitionEntryLBA, BlockSize),
+                     PrimaryHeader->NumberOfPartitionEntries * (PrimaryHeader->SizeOfPartitionEntry),
+                     PartEntry
+                     );
   if (EFI_ERROR (Status)) {
     GptValidStatus = Status;
     DEBUG ((EFI_D_ERROR, " Partition Entry ReadDisk error\n"));
@@ -436,7 +436,7 @@ PartitionValidGptTable (
   Status = DiskIo->ReadDisk (
                      DiskIo,
                      BlockIo->Media->MediaId,
-                     Lba,
+                     MultU64x32 (Lba, BlockSize),
                      BlockSize,
                      PartHdr
                      );
diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
index cfa43f4fe9..393f538428 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
@@ -242,7 +242,7 @@ PartitionInstallMbrChildHandles (
       Status = DiskIo->ReadDisk (
                          DiskIo,
                          BlockIo->Media->MediaId,
-                         ExtMbrStartingLba,
+                         MultU64x32 (ExtMbrStartingLba, BlockIo->Media->BlockSize),
                          BlockIo->Media->BlockSize,
                          Mbr
                          );
-- 
2.39.2