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

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
index 9229a8cbe78c97ec3cadea56c1e6025cec62bb54..342e1861918edca6462ba1476f977adec383606a 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
@@ -100,7 +100,7 @@ PartitionInstallElToritoChildHandles (
     Status = DiskIo->ReadDisk (\r
                        DiskIo,\r
                        Media->MediaId,\r
-                       VolDescriptorLba,\r
+                       MultU64x32 (VolDescriptorLba, Media->BlockSize),\r
                        Media->BlockSize,\r
                        VolDescriptor\r
                        );\r
@@ -143,7 +143,7 @@ PartitionInstallElToritoChildHandles (
     Status = DiskIo->ReadDisk (\r
                        DiskIo,\r
                        Media->MediaId,\r
-                       Lba,\r
+                       MultU64x32 (Lba, Media->BlockSize),\r
                        Media->BlockSize,\r
                        Catalog\r
                        );\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
index 3f352cc318ee57e03124f8ee95baf45579ff56a3..a54bd48ba9b6b80f0dd137a5cd84ebf53bbd97bd 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
@@ -296,12 +296,12 @@ PartitionInstallGptChildHandles (
   }\r
 \r
   Status = DiskIo->ReadDisk (\r
-                    DiskIo,\r
-                    BlockIo->Media->MediaId,\r
-                    MultU64x32(PrimaryHeader->PartitionEntryLBA, BlockSize),\r
-                    PrimaryHeader->NumberOfPartitionEntries * (PrimaryHeader->SizeOfPartitionEntry),\r
-                    PartEntry\r
-                    );\r
+                     DiskIo,\r
+                     BlockIo->Media->MediaId,\r
+                     MultU64x32(PrimaryHeader->PartitionEntryLBA, BlockSize),\r
+                     PrimaryHeader->NumberOfPartitionEntries * (PrimaryHeader->SizeOfPartitionEntry),\r
+                     PartEntry\r
+                     );\r
   if (EFI_ERROR (Status)) {\r
     GptValidStatus = Status;\r
     DEBUG ((EFI_D_ERROR, " Partition Entry ReadDisk error\n"));\r
@@ -436,7 +436,7 @@ PartitionValidGptTable (
   Status = DiskIo->ReadDisk (\r
                      DiskIo,\r
                      BlockIo->Media->MediaId,\r
-                     Lba,\r
+                     MultU64x32 (Lba, BlockSize),\r
                      BlockSize,\r
                      PartHdr\r
                      );\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
index cfa43f4fe9067accc57999e7e3ca7b1a52487f4c..393f538428d37b5005f02602ce67c6ec13fcc89b 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
@@ -242,7 +242,7 @@ PartitionInstallMbrChildHandles (
       Status = DiskIo->ReadDisk (\r
                          DiskIo,\r
                          BlockIo->Media->MediaId,\r
-                         ExtMbrStartingLba,\r
+                         MultU64x32 (ExtMbrStartingLba, BlockIo->Media->BlockSize),\r
                          BlockIo->Media->BlockSize,\r
                          Mbr\r
                          );\r