MdeModulePkg/NvmExpressDxe: Fix some bugs

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / NvmExpressDxe / NvmExpressBlockIo.c

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
index 458afd232b22a108d0a6198b14b9b401ffe5fbbe..c1aad6b8138e304f1831631354f24fd6b0c28e9c 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
@@ -172,10 +172,12 @@ NvmeRead (
   UINT32                           BlockSize;\r
   NVME_CONTROLLER_PRIVATE_DATA     *Controller;\r
   UINT32                           MaxTransferBlocks;\r
+  UINTN                            OrginalBlocks;\r
 \r
-  Status     = EFI_SUCCESS;\r
-  Controller = Device->Controller;\r
-  BlockSize  = Device->Media.BlockSize;\r
+  Status        = EFI_SUCCESS;\r
+  Controller    = Device->Controller;\r
+  BlockSize     = Device->Media.BlockSize;\r
+  OrginalBlocks = Blocks;\r
 \r
   if (Controller->ControllerData->Mdts != 0) {\r
     MaxTransferBlocks = (1 << (Controller->ControllerData->Mdts)) * (1 << (Controller->Cap.Mpsmin + 12)) / BlockSize;\r
@@ -200,7 +202,7 @@ NvmeRead (
     }\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "NvmeRead()  Lba = %8d, Blocks = %8d, BlockSize = %d Status = %r\n", Lba, Blocks, BlockSize, Status));\r
+  DEBUG ((EFI_D_INFO, "NvmeRead()  Lba = 0x%08x, Original = 0x%08x, Remaining = 0x%08x, BlockSize = 0x%x Status = %r\n", Lba, OrginalBlocks, Blocks, BlockSize, Status));\r
 \r
   return Status;\r
 }\r
@@ -229,10 +231,12 @@ NvmeWrite (
   UINT32                           BlockSize;\r
   NVME_CONTROLLER_PRIVATE_DATA     *Controller;\r
   UINT32                           MaxTransferBlocks;\r
+  UINTN                            OrginalBlocks;\r
 \r
-  Status     = EFI_SUCCESS;\r
-  Controller = Device->Controller;\r
-  BlockSize  = Device->Media.BlockSize;\r
+  Status        = EFI_SUCCESS;\r
+  Controller    = Device->Controller;\r
+  BlockSize     = Device->Media.BlockSize;\r
+  OrginalBlocks = Blocks;\r
 \r
   if (Controller->ControllerData->Mdts != 0) {\r
     MaxTransferBlocks = (1 << (Controller->ControllerData->Mdts)) * (1 << (Controller->Cap.Mpsmin + 12)) / BlockSize;\r
@@ -257,7 +261,7 @@ NvmeWrite (
     }\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "NvmeWrite() Lba = %8d, Blocks = %8d, BlockSize = %d Status = %r\n", Lba, Blocks, BlockSize, Status));\r
+  DEBUG ((EFI_D_INFO, "NvmeWrite() Lba = 0x%08x, Original = 0x%08x, Remaining = 0x%08x, BlockSize = 0x%x Status = %r\n", Lba, OrginalBlocks, Blocks, BlockSize, Status));\r
 \r
   return Status;\r
 }\r