Use DiskIo->ReadDisk() API to avoid alignment issue.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8144 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
index 444bc95d498d7622112b4535ff9d04b1e3b52722..9229a8cbe78c97ec3cadea56c1e6025cec62bb54 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
@@ -97,13 +97,13 @@ PartitionInstallElToritoChildHandles (
       break;\r
     }\r
 \r
       break;\r
     }\r
 \r

-    Status = BlockIo->ReadBlocks (\r
-                        BlockIo,\r
-                        Media->MediaId,\r
-                        VolDescriptorLba,\r
-                        Media->BlockSize,\r
-                        VolDescriptor\r
-                        );\r
+    Status = DiskIo->ReadDisk (\r
+                       DiskIo,\r
+                       Media->MediaId,\r
+                       VolDescriptorLba,\r
+                       Media->BlockSize,\r
+                       VolDescriptor\r
+                       );\r

     if (EFI_ERROR (Status)) {\r
       Found = Status;\r
       break;\r
     if (EFI_ERROR (Status)) {\r
       Found = Status;\r
       break;\r


@@ -140,13 +140,13 @@ PartitionInstallElToritoChildHandles (
       continue;\r
     }\r
 \r
       continue;\r
     }\r
 \r

-    Status = BlockIo->ReadBlocks (\r
-                        BlockIo,\r
-                        Media->MediaId,\r
-                        Lba,\r
-                        Media->BlockSize,\r
-                        Catalog\r
-                        );\r
+    Status = DiskIo->ReadDisk (\r
+                       DiskIo,\r
+                       Media->MediaId,\r
+                       Lba,\r
+                       Media->BlockSize,\r
+                       Catalog\r
+                       );\r

     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "EltCheckDevice: error reading catalog %r\n", Status));\r
       continue;\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_ERROR, "EltCheckDevice: error reading catalog %r\n", Status));\r
       continue;\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
index 8cb78abfc1ab64132f5731a963621c5fcc11dba7..3f352cc318ee57e03124f8ee95baf45579ff56a3 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
@@ -217,13 +217,13 @@ PartitionInstallGptChildHandles (
   //\r
   // Read the Protective MBR from LBA #0\r
   //\r
   //\r
   // Read the Protective MBR from LBA #0\r
   //\r

-  Status = BlockIo->ReadBlocks (\r
-                      BlockIo,\r
-                      BlockIo->Media->MediaId,\r
-                      0,\r
-                      BlockIo->Media->BlockSize,\r
-                      ProtectiveMbr\r
-                      );\r
+  Status = DiskIo->ReadDisk (\r
+                     DiskIo,\r
+                     BlockIo->Media->MediaId,\r
+                     0,\r
+                     BlockIo->Media->BlockSize,\r
+                     ProtectiveMbr\r
+                     );\r

   if (EFI_ERROR (Status)) {\r
     GptValidStatus = Status;\r
     goto Done;\r
   if (EFI_ERROR (Status)) {\r
     GptValidStatus = Status;\r
     goto Done;\r


@@ -304,7 +304,7 @@ PartitionInstallGptChildHandles (
                     );\r
   if (EFI_ERROR (Status)) {\r
     GptValidStatus = Status;\r
                     );\r
   if (EFI_ERROR (Status)) {\r
     GptValidStatus = Status;\r

-    DEBUG ((EFI_D_ERROR, " Partition Entry ReadBlocks error\n"));\r
+    DEBUG ((EFI_D_ERROR, " Partition Entry ReadDisk error\n"));\r

     goto Done;\r
   }\r
 \r
     goto Done;\r
   }\r
 \r


@@ -433,13 +433,13 @@ PartitionValidGptTable (
   //\r
   // Read the EFI Partition Table Header\r
   //\r
   //\r
   // Read the EFI Partition Table Header\r
   //\r

-  Status = BlockIo->ReadBlocks (\r
-                      BlockIo,\r
-                      BlockIo->Media->MediaId,\r
-                      Lba,\r
-                      BlockSize,\r
-                      PartHdr\r
-                      );\r
+  Status = DiskIo->ReadDisk (\r
+                     DiskIo,\r
+                     BlockIo->Media->MediaId,\r
+                     Lba,\r
+                     BlockSize,\r
+                     PartHdr\r
+                     );\r

   if (EFI_ERROR (Status)) {\r
     FreePool (PartHdr);\r
     return FALSE;\r
   if (EFI_ERROR (Status)) {\r
     FreePool (PartHdr);\r
     return FALSE;\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
index 5d544e8b775d5cae7c4053b3577eba5094ce9bfd..cfa43f4fe9067accc57999e7e3ca7b1a52487f4c 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
@@ -132,7 +132,6 @@ PartitionInstallMbrChildHandles (
   EFI_DEVICE_PATH_PROTOCOL  *DevicePathNode;\r
   EFI_DEVICE_PATH_PROTOCOL  *LastDevicePathNode;\r
 \r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePathNode;\r
   EFI_DEVICE_PATH_PROTOCOL  *LastDevicePathNode;\r
 \r

-  Mbr             = NULL;\r

   Found           = EFI_NOT_FOUND;\r
 \r
   Mbr             = AllocatePool (BlockIo->Media->BlockSize);\r
   Found           = EFI_NOT_FOUND;\r
 \r
   Mbr             = AllocatePool (BlockIo->Media->BlockSize);\r


@@ -140,13 +139,13 @@ PartitionInstallMbrChildHandles (
     goto Done;\r
   }\r
 \r
     goto Done;\r
   }\r
 \r

-  Status = BlockIo->ReadBlocks (\r
-                      BlockIo,\r
-                      BlockIo->Media->MediaId,\r
-                      0,\r
-                      BlockIo->Media->BlockSize,\r
-                      Mbr\r
-                      );\r
+  Status = DiskIo->ReadDisk (\r
+                     DiskIo,\r
+                     BlockIo->Media->MediaId,\r
+                     0,\r
+                     BlockIo->Media->BlockSize,\r
+                     Mbr\r
+                     );\r

   if (EFI_ERROR (Status)) {\r
     Found = Status;\r
     goto Done;\r
   if (EFI_ERROR (Status)) {\r
     Found = Status;\r
     goto Done;\r


@@ -240,13 +239,13 @@ PartitionInstallMbrChildHandles (
 \r
     do {\r
 \r
 \r
     do {\r
 \r

-      Status = BlockIo->ReadBlocks (\r
-                          BlockIo,\r
-                          BlockIo->Media->MediaId,\r
-                          ExtMbrStartingLba,\r
-                          BlockIo->Media->BlockSize,\r
-                          Mbr\r
-                          );\r
+      Status = DiskIo->ReadDisk (\r
+                         DiskIo,\r
+                         BlockIo->Media->MediaId,\r
+                         ExtMbrStartingLba,\r
+                         BlockIo->Media->BlockSize,\r
+                         Mbr\r
+                         );\r

       if (EFI_ERROR (Status)) {\r
         Found = Status;\r
         goto Done;\r
       if (EFI_ERROR (Status)) {\r
         Found = Status;\r
         goto Done;\r