[edk2-devel] [PATCH V2 2/2] MdeModulePkg/CapsulePei: Update the debug code to print 64bit data

[Gao, Zhichao]

From: Bret Barkelew <bret.barke...@microsoft.com>

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1677

For some pointer and UINT64 data, the debug code print with '%x'.
Which would loss the upper 32bit data. So update '%x' to '%lx'
for these data. And change the pointer value from '%x' to '%p'.

Cc: Jian J Wang <jian.j.w...@intel.com>
Cc: Hao Wu <hao.a...@intel.com>
Cc: Ray Ni <ray...@intel.com>
Cc: Star Zeng <star.z...@intel.com>
Cc: Liming Gao <liming....@intel.com>
Cc: Sean Brogan <sean.bro...@microsoft.com>
Cc: Michael Turner <michael.tur...@microsoft.com>
Cc: Bret Barkelew <bret.barke...@microsoft.com>
Signed-off-by: Zhichao Gao <zhichao....@intel.com>
---
 .../CapsulePei/Common/CapsuleCoalesce.c        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c 
b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
index a88b2fff95..468eea5d3f 100644
--- a/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
+++ b/MdeModulePkg/Universal/CapsulePei/Common/CapsuleCoalesce.c
@@ -327,9 +327,9 @@ ValidateCapsuleIntegrity (
     return NULL;
   }
 
-  DEBUG ((DEBUG_INFO, "Ptr - 0x%x\n", Ptr));
-  DEBUG ((DEBUG_INFO, "Ptr->Length - 0x%x\n", Ptr->Length));
-  DEBUG ((DEBUG_INFO, "Ptr->Union - 0x%x\n", Ptr->Union.ContinuationPointer));
+  DEBUG ((DEBUG_INFO, "Ptr - 0x%p\n", Ptr));
+  DEBUG ((DEBUG_INFO, "Ptr->Length - 0x%lx\n", Ptr->Length));
+  DEBUG ((DEBUG_INFO, "Ptr->Union - 0x%lx\n", Ptr->Union.ContinuationPointer));
   while ((Ptr->Length != 0) || (Ptr->Union.ContinuationPointer != 
(EFI_PHYSICAL_ADDRESS) (UINTN) NULL)) {
     //
     // Make sure the descriptor is aligned at UINT64 in memory
@@ -348,9 +348,9 @@ ValidateCapsuleIntegrity (
       if (!ValidateCapsuleByMemoryResource (MemoryResource, 
(EFI_PHYSICAL_ADDRESS) (UINTN) Ptr, sizeof (EFI_CAPSULE_BLOCK_DESCRIPTOR))) {
         return NULL;
       }
-      DEBUG ((DEBUG_INFO, "Ptr(C) - 0x%x\n", Ptr));
-      DEBUG ((DEBUG_INFO, "Ptr->Length - 0x%x\n", Ptr->Length));
-      DEBUG ((DEBUG_INFO, "Ptr->Union - 0x%x\n", 
Ptr->Union.ContinuationPointer));
+      DEBUG ((DEBUG_INFO, "Ptr(C) - 0x%p\n", Ptr));
+      DEBUG ((DEBUG_INFO, "Ptr->Length - 0x%lx\n", Ptr->Length));
+      DEBUG ((DEBUG_INFO, "Ptr->Union - 0x%lx\n", 
Ptr->Union.ContinuationPointer));
     } else {
       if (!ValidateCapsuleByMemoryResource (MemoryResource, 
Ptr->Union.DataBlock, Ptr->Length)) {
         return NULL;
@@ -403,9 +403,9 @@ ValidateCapsuleIntegrity (
       if (!ValidateCapsuleByMemoryResource (MemoryResource, 
(EFI_PHYSICAL_ADDRESS) (UINTN) Ptr, sizeof (EFI_CAPSULE_BLOCK_DESCRIPTOR))) {
         return NULL;
       }
-      DEBUG ((DEBUG_INFO, "Ptr(B) - 0x%x\n", Ptr));
-      DEBUG ((DEBUG_INFO, "Ptr->Length - 0x%x\n", Ptr->Length));
-      DEBUG ((DEBUG_INFO, "Ptr->Union - 0x%x\n", 
Ptr->Union.ContinuationPointer));
+      DEBUG ((DEBUG_INFO, "Ptr(B) - 0x%p\n", Ptr));
+      DEBUG ((DEBUG_INFO, "Ptr->Length - 0x%lx\n", Ptr->Length));
+      DEBUG ((DEBUG_INFO, "Ptr->Union - 0x%lx\n", 
Ptr->Union.ContinuationPointer));
     }
   }
 
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#38927): https://edk2.groups.io/g/devel/message/38927
Mute This Topic: https://groups.io/mt/31037126/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-