UefiCpuPkg/PiSmmCpuDxeSmm: patch "gSmiCr3" with PatchInstructionX86()

[mirror_edk2.git] / OvmfPkg / BlockMmioToBlockIoDxe / BlockIo.c

diff --git a/OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.c b/OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.c
index bdd1402cc19bbde7d015f34ad784ff0c3031f85f..939792f2ada255f7b30cd5ca9587c36b39effffc 100644 (file)
--- a/OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.c
+++ b/OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.c
@@ -2,8 +2,8 @@
   The driver wrappers BlockMmio protocol instances to produce\r
   Block I/O Protocol instances.\r
 \r
-  Copyright (c) 2007 - 2010, Intel Corporation\r
-  All rights reserved. This program and the accompanying materials\r
+  Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   http://opensource.org/licenses/bsd-license.php\r
@@ -109,11 +109,11 @@ ReadOrWriteBlocks (
   //\r
   // BufferSize must be a multiple of the intrinsic block size of the device.\r
   //\r
-  if ((BufferSize % Media->BlockSize) != 0) {\r
+  if (ModU64x32 (BufferSize, Media->BlockSize) != 0) {\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
-  TotalBlock = BufferSize / Media->BlockSize;\r
+  TotalBlock = (UINTN) DivU64x32 (BufferSize, Media->BlockSize);\r
 \r
   //\r
   // Make sure the range to read is valid.\r
@@ -131,9 +131,9 @@ ReadOrWriteBlocks (
   }\r
 \r
   Address = Private->BlockMmio->BaseAddress;\r
-  Address += Media->BlockSize * Lba;\r
+  Address += MultU64x32 (Lba, Media->BlockSize);\r
 \r
-  Count = BufferSize / 8;\r
+  Count = BufferSize >> 3;\r
 \r
   if (ReadData) {\r
     CpuAccessFunction = Private->CpuIo->Mem.Read;\r
@@ -187,7 +187,8 @@ BlockIoReadBlocks (
   OUT VOID                    *Buffer\r
   )\r
 {\r
-  DEBUG ((EFI_D_INFO, "BlockIo (MMIO) ReadBlocks: lba=0x%lx, size=0x%x\n", Lba, BufferSize));\r
+  DEBUG ((EFI_D_INFO, "BlockIo (MMIO) ReadBlocks: lba=0x%Lx, size=0x%Lx\n",\r
+    Lba, (UINT64)BufferSize));\r
   return ReadOrWriteBlocks (\r
     This,\r
     TRUE,\r
@@ -234,7 +235,8 @@ BlockIoWriteBlocks (
   IN VOID                     *Buffer\r
   )\r
 {\r
-  DEBUG ((EFI_D_INFO, "BlockIo (MMIO) WriteBlocks: lba=0x%lx, size=0x%x\n", Lba, BufferSize));\r
+  DEBUG ((EFI_D_INFO, "BlockIo (MMIO) WriteBlocks: lba=0x%Lx, size=0x%Lx\n",\r
+    Lba, (UINT64)BufferSize));\r
   return ReadOrWriteBlocks (\r
     This,\r
     FALSE,\r
@@ -287,7 +289,7 @@ BlockIoInit (
   BLOCK_MMIO_TO_BLOCK_IO_DEVICE  *Private;\r
   BLOCK_MMIO_PROTOCOL            *BlockMmio;\r
 \r
-  Private = (BLOCK_MMIO_TO_BLOCK_IO_DEVICE*) AllocateZeroPool (sizeof (Private));\r
+  Private = (BLOCK_MMIO_TO_BLOCK_IO_DEVICE*) AllocateZeroPool (sizeof (*Private));\r
   ASSERT (Private != NULL);\r
 \r
   Status = gBS->LocateProtocol (\r
@@ -309,7 +311,7 @@ BlockIoInit (
     DEBUG ((EFI_D_ERROR, "BlockIoInit: OpenBlockMmioProtocol By Driver (%r)\n", Status));\r
     goto ON_ERROR;\r
   }\r
-  DEBUG ((EFI_D_INFO, "BlockMmio: 0x%x\n", BlockMmio));\r
+  DEBUG ((EFI_D_INFO, "BlockMmio: %p\n", BlockMmio));\r
   DEBUG ((EFI_D_INFO, "BlockMmio->Media->LastBlock: 0x%lx\n", BlockMmio->Media->LastBlock));\r
   \r
   Private->Signature            = BLOCK_MMIO_TO_BLOCK_IO_SIGNATURE;\r