[edk2-platforms][PATCH v1 0/3] Platform/Intel: Fix invalid DEBUG() macros

[edk2-platforms][PATCH v1 0/3] Platform/Intel: Fix invalid DEBUG() macros

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

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

Fixes several debug macros in Platform/Intel that have a mismatched
number of print specifiers to arguments.

The original author's intention is not always 100% obvious. Though,
this series is relatively straightforward.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Heng Luo <heng.luo@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>

Michael Kubacki (3):
  MinPlatformPkg: Fix invalid debug macros
  TigerLakeOpenBoardPkg: Remove unnecessary debug macro argument
  WhitleyOpenBoardPkg: Fix invalid debug macros

 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c                                                |  4 ++--
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmiHandlerInstrument.c                               |  4 ++--
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c                                             | 13 ++++--------
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHob.c                                                | 22 +++++++-------------
 Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMemDefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c |  2 +-
 Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c                                     |  2 +-
 Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c                                     |  2 +-
 Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c                           |  2 +-
 8 files changed, 20 insertions(+), 31 deletions(-)

--
2.28.0.windows.1

[edk2-platforms][PATCH v1 1/3] MinPlatformPkg: Fix invalid debug macros

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

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

Updates several debug macros in MinPlatformPkg to correctly match
print specifiers to actual arguments.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c                  |  4 ++--
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmiHandlerInstrument.c |  4 ++--
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c               | 13 ++++--------
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHob.c                  | 22 +++++++-------------
 4 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
index 575284ccc727..3259dae757fe 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
@@ -114,7 +114,7 @@ DumpPciBridge (
     PciData->Bridge.SecondaryBus,
     PciData->Bridge.SubordinateBus
     ));
-  DEBUG ((DEBUG_INFO, " [00:00] [0000:0000] [0000:0000]",
+  DEBUG ((DEBUG_INFO, " [%02x:%02x] [%04x:%04x] [%04x:%04x]",
     PciData->Bridge.IoBase,
     PciData->Bridge.IoLimit,
     PciData->Bridge.MemoryBase,
@@ -122,7 +122,7 @@ DumpPciBridge (
     PciData->Bridge.PrefetchableMemoryBase,
     PciData->Bridge.PrefetchableMemoryLimit
     ));
-  DEBUG ((DEBUG_INFO, " [00000000:00000000] [0000:0000]",
+  DEBUG ((DEBUG_INFO, " [%08x:%08x] [%04x:%04x]",
     PciData->Bridge.PrefetchableBaseUpper32,
     PciData->Bridge.PrefetchableLimitUpper32,
     PciData->Bridge.IoBaseUpper16,
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmiHandlerInstrument.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmiHandlerInstrument.c
index 80e8d26f4e1d..3a0e4ff90b7f 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmiHandlerInstrument.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmiHandlerInstrument.c
@@ -596,12 +596,12 @@ DumpSmiHandler(
         if (ImageStruct != NULL) {
           DEBUG ((DEBUG_INFO, "         <RVA>0x%x</RVA>\n", (UINTN) (SmiHandlerStruct->Handler - ImageStruct->ImageBase)));
         }
-        DEBUG ((DEBUG_INFO, "      </Handler>\n", SmiHandlerStruct->Handler));
+        DEBUG ((DEBUG_INFO, "      </Handler>\n"));
         DEBUG ((DEBUG_INFO, "      <Caller Address=\"0x%lx\">\n", SmiHandlerStruct->CallerAddr));
         if (ImageStruct != NULL) {
           DEBUG ((DEBUG_INFO, "         <RVA>0x%x</RVA>\n", (UINTN) (SmiHandlerStruct->CallerAddr - ImageStruct->ImageBase)));
         }
-        DEBUG ((DEBUG_INFO, "      </Caller>\n", SmiHandlerStruct->Handler));
+        DEBUG ((DEBUG_INFO, "      </Caller>\n"));
         SmiHandlerStruct = (VOID *)((UINTN)SmiHandlerStruct + SmiHandlerStruct->Length);
         DEBUG ((DEBUG_INFO, "    </SmiHandler>\n"));
       }
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c
index 571743448eac..f8a651ee7222 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c
@@ -44,7 +44,7 @@ TestPointCheckFvInfo (
   EFI_PEI_FIRMWARE_VOLUME_INFO2_PPI  *FvInfo2;
   UINTN                              Index;
   UINTN                              Index2;
-  
+
   DEBUG ((DEBUG_INFO, "==== TestPointCheckFvInfo - Enter\n"));
   DEBUG ((DEBUG_INFO, "FV Info PPI\n"));
   for (Index = 0; ; Index++) {
@@ -61,9 +61,7 @@ TestPointCheckFvInfo (
       "  BA=%08x  L=%08x  Format={%g}",
       (UINT32)(UINTN)FvInfo->FvInfo,
       FvInfo->FvInfoSize,
-      &FvInfo->FvFormat,
-      FvInfo->ParentFvName,
-      FvInfo->ParentFileName
+      &FvInfo->FvFormat
       ));
     if (FvInfo->ParentFvName != NULL) {
       DEBUG ((DEBUG_INFO,
@@ -79,7 +77,7 @@ TestPointCheckFvInfo (
     }
     DEBUG ((DEBUG_INFO, "\n"));
   }
-  
+
   DEBUG ((DEBUG_INFO, "FV Info2 PPI\n"));
   for (Index2 = 0; ; Index2++) {
     Status = PeiServicesLocatePpi (
@@ -95,10 +93,7 @@ TestPointCheckFvInfo (
       "  BA=%08x  L=%08x  Format={%g}",
       (UINT32)(UINTN)FvInfo2->FvInfo,
       FvInfo2->FvInfoSize,
-      &FvInfo2->FvFormat,
-      FvInfo2->ParentFvName,
-      FvInfo2->ParentFileName,
-      FvInfo2->AuthenticationStatus
+      &FvInfo2->FvFormat
       ));
     if (FvInfo2->ParentFvName != NULL) {
       DEBUG ((DEBUG_INFO,
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHob.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHob.c
index b05f7ebab67f..92a14d7f40ae 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHob.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHob.c
@@ -91,7 +91,7 @@ DumpPhitHob (
   )
 {
   EFI_HOB_HANDOFF_INFO_TABLE  *PhitHob;
-  
+
   PhitHob = HobList;
   ASSERT(GET_HOB_TYPE(HobList) == EFI_HOB_TYPE_HANDOFF);
   DEBUG ((DEBUG_INFO, "PHIT HOB\n"));
@@ -132,7 +132,7 @@ DumpResourceHob (
 {
   EFI_PEI_HOB_POINTERS        Hob;
   EFI_HOB_RESOURCE_DESCRIPTOR *ResourceHob;
-  
+
   DEBUG ((DEBUG_INFO, "Resource Descriptor HOBs\n"));
   for (Hob.Raw = HobList; !END_OF_HOB_LIST (Hob); Hob.Raw = GET_NEXT_HOB (Hob)) {
 
@@ -180,7 +180,7 @@ DumpFvHob (
   EFI_PEI_HOB_POINTERS        Hob;
   EFI_HOB_FIRMWARE_VOLUME     *FirmwareVolumeHob;
   EFI_HOB_FIRMWARE_VOLUME2    *FirmwareVolume2Hob;
-  
+
   DEBUG ((DEBUG_INFO, "FV HOBs\n"));
   for (Hob.Raw = HobList; !END_OF_HOB_LIST (Hob); Hob.Raw = GET_NEXT_HOB (Hob)) {
     if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV) {
@@ -234,15 +234,9 @@ DumpMemoryAllocationHob (
       DEBUG ((DEBUG_INFO, ShortNameOfMemoryType(MemoryHob->AllocDescriptor.MemoryType)));
       if (!IsZeroGuid(&MemoryHob->AllocDescriptor.Name)) {
         if (CompareGuid(&gEfiHobMemoryAllocStackGuid, &MemoryHob->AllocDescriptor.Name)) {
-          DEBUG ((DEBUG_INFO,
-            "  {Stack}",
-            &MemoryHob->AllocDescriptor.Name
-            ));
+          DEBUG ((DEBUG_INFO, "  {%g}", &MemoryHob->AllocDescriptor.Name));
         } else if (CompareGuid(&gEfiHobMemoryAllocBspStoreGuid, &MemoryHob->AllocDescriptor.Name)) {
-          DEBUG ((DEBUG_INFO,
-            "  {BspStore}",
-            &MemoryHob->AllocDescriptor.Name
-            ));
+          DEBUG ((DEBUG_INFO, "  {%g}", &MemoryHob->AllocDescriptor.Name));
         } else if (CompareGuid(&gEfiHobMemoryAllocModuleGuid, &MemoryHob->AllocDescriptor.Name)) {
           DEBUG ((DEBUG_INFO,
             "  {Module=%g,Entry=0x%lx}",
@@ -290,13 +284,13 @@ TestPointDumpHob (
   )
 {
   VOID                        *HobList;
-  
+
   DEBUG ((DEBUG_INFO, "==== TestPointDumpHob - Enter\n"));
   //
   // Get Hob list
   //
   HobList = GetHobList ();
-  
+
   DumpPhitHob (HobList);
 
   if (PhitHobOnly) {
@@ -329,7 +323,7 @@ TestPointCheckMemoryResource (
   EFI_HOB_RESOURCE_DESCRIPTOR *ResourceHob;
   EFI_PEI_HOB_POINTERS        Hob2;
   EFI_HOB_RESOURCE_DESCRIPTOR *ResourceHob2;
-  
+
   HobList = GetHobList ();
 
   //
-- 
2.28.0.windows.1

[edk2-platforms][PATCH v1 2/3] TigerLakeOpenBoardPkg: Remove unnecessary debug macro argument

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

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

Removes an argument passed to a debug macro without a print
specifier. The argument appears to be useless.

Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Heng Luo <heng.luo@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMemDefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMemDefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c b/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMemDefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c
index f0eb3f3f141f..f31cec231e8c 100644
--- a/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMemDefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c
+++ b/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMemDefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c
@@ -32,7 +32,7 @@ PeiSiPreMemDefaultPolicyInitLibConstructor (
   if (PeiPreMemSiDefaultPolicyInitPpi == NULL) {
     return Status;
   }
-  DEBUG ((DEBUG_INFO, "PeiPreMemSiDefaultPolicyInitPpi->PeiPreMemPolicyInit ()\n", Status));
+  DEBUG ((DEBUG_INFO, "PeiPreMemSiDefaultPolicyInitPpi->PeiPreMemPolicyInit ()\n"));
   Status = PeiPreMemSiDefaultPolicyInitPpi->PeiPreMemPolicyInit ();
   ASSERT_EFI_ERROR (Status);
 
-- 
2.28.0.windows.1

Re: [edk2-platforms][PATCH v1 2/3] TigerLakeOpenBoardPkg: Remove unnecessary debug macro argument

[Heng Luo]

Reviewed-by: Heng Luo <heng.luo@intel.com>

> -----Original Message-----
> From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com>
> Sent: Wednesday, October 5, 2022 11:36 AM
> To: devel@edk2.groups.io
> Cc: Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Desimone,
> Nathaniel L <nathaniel.l.desimone@intel.com>; Luo, Heng
> <heng.luo@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>
> Subject: [edk2-platforms][PATCH v1 2/3] TigerLakeOpenBoardPkg: Remove
> unnecessary debug macro argument
> 
> From: Michael Kubacki <michael.kubacki@microsoft.com>
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4094
> 
> Removes an argument passed to a debug macro without a print specifier.
> The argument appears to be useless.
> 
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Heng Luo <heng.luo@intel.com>
> Cc: Isaac Oram <isaac.w.oram@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> 
> Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMemDe
> faultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git
> a/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMem
> DefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c
> b/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMem
> DefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c
> index f0eb3f3f141f..f31cec231e8c 100644
> ---
> a/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMem
> DefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c
> +++
> b/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMe
> +++ mDefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c
> @@ -32,7 +32,7 @@ PeiSiPreMemDefaultPolicyInitLibConstructor (
>    if (PeiPreMemSiDefaultPolicyInitPpi == NULL) {
>      return Status;
>    }
> -  DEBUG ((DEBUG_INFO, "PeiPreMemSiDefaultPolicyInitPpi-
> >PeiPreMemPolicyInit ()\n", Status));
> +  DEBUG ((DEBUG_INFO,
> + "PeiPreMemSiDefaultPolicyInitPpi->PeiPreMemPolicyInit ()\n"));
>    Status = PeiPreMemSiDefaultPolicyInitPpi->PeiPreMemPolicyInit ();
>    ASSERT_EFI_ERROR (Status);
> 
> --
> 2.28.0.windows.1

Re: [edk2-platforms][PATCH v1 2/3] TigerLakeOpenBoardPkg: Remove unnecessary debug macro argument

[Chaganty, Rangasai V]

Reviewed-by: Sai Chaganty <rangasai.v.chaganty@intel.com>

-----Original Message-----
From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com> 
Sent: Tuesday, October 04, 2022 8:36 PM
To: devel@edk2.groups.io
Cc: Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Luo, Heng <heng.luo@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>
Subject: [edk2-platforms][PATCH v1 2/3] TigerLakeOpenBoardPkg: Remove unnecessary debug macro argument

From: Michael Kubacki <michael.kubacki@microsoft.com>

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

Removes an argument passed to a debug macro without a print specifier. The argument appears to be useless.

Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Heng Luo <heng.luo@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMemDefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMemDefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c b/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMemDefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c
index f0eb3f3f141f..f31cec231e8c 100644
--- a/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMemDefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c
+++ b/Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMe
+++ mDefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c
@@ -32,7 +32,7 @@ PeiSiPreMemDefaultPolicyInitLibConstructor (
   if (PeiPreMemSiDefaultPolicyInitPpi == NULL) {
     return Status;
   }
-  DEBUG ((DEBUG_INFO, "PeiPreMemSiDefaultPolicyInitPpi->PeiPreMemPolicyInit ()\n", Status));
+  DEBUG ((DEBUG_INFO, 
+ "PeiPreMemSiDefaultPolicyInitPpi->PeiPreMemPolicyInit ()\n"));
   Status = PeiPreMemSiDefaultPolicyInitPpi->PeiPreMemPolicyInit ();
   ASSERT_EFI_ERROR (Status);
 
--
2.28.0.windows.1

[edk2-platforms][PATCH v1 3/3] WhitleyOpenBoardPkg: Fix invalid debug macros

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

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

Updates several debug macros in WhitleyOpenBoardPkg to correctly
match print specifiers to actual arguments.

Note: The "EFI_D_ERROR" macro was changed to "DEBUG_ERROR" in
FspWrapperHobProcessLib.c to pass PatchCheck and comply with latest
guidelines.

Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c           | 2 +-
 Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c           | 2 +-
 Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
index b8677340cae7..fc42bf380ae3 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
@@ -137,7 +137,7 @@ UpdateApicIdMap (
     }
 
     if (ThreadIndex != mThreadCount[SocketId]) {
-      DEBUG((DEBUG_ERROR, ":: Skt: %d - Enabled ThreadCount is incorrect!!!\n"));
+      DEBUG ((DEBUG_ERROR, ":: Skt: %d - Enabled ThreadCount is incorrect!!!\n", ThreadIndex));
       break;
     }
   }
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
index 111d32b44c42..29bf32564e49 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
@@ -254,7 +254,7 @@ SkipExternalSbOpcodes(
     }
   }
 
-  DEBUG ((DEBUG_ERROR, "ExternSbExpected: %d, ExternSbFound: %d\n"));
+  DEBUG ((DEBUG_ERROR, "ExternSbExpected: %d, ExternSbFound: %d\n", ExternSbExpected, ExternSbFound));
 
   ASSERT ((ExternSbFound % ExternSbExpected) == 0);
 
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c
index 19dc82d7a73f..e8a1c556cd2d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c
@@ -185,7 +185,7 @@ CopyHobData (
   OrgData = GET_GUID_HOB_DATA (OrgGuidHob);
   OrgDataSize = GET_GUID_HOB_DATA_SIZE (OrgGuidHob);
   if (OrgDataSize != DataSize) {
-    DEBUG ((EFI_D_ERROR, "%a Hob Size Don't Match Between FSP and BootLoader. FSP:%x vs BootLoader:%x\n", OrgDataSize, DataSize));
+    DEBUG ((DEBUG_ERROR, "Hob Size Don't Match Between FSP and BootLoader. FSP:%x vs BootLoader:%x\n", OrgDataSize, DataSize));
     ASSERT (FALSE);
   }
   CopyMem (OrgData, Data, DataSize);
-- 
2.28.0.windows.1

Re: [edk2-platforms][PATCH v1 0/3] Platform/Intel: Fix invalid DEBUG() macros

[Isaac Oram]

Series Reviewed-by: Isaac Oram <isaac.w.oram@intel.com>

-----Original Message-----
From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com> 
Sent: Tuesday, October 4, 2022 8:35 PM
To: devel@edk2.groups.io
Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>; Luo, Heng <heng.luo@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Dong, Eric <eric.dong@intel.com>
Subject: [edk2-platforms][PATCH v1 0/3] Platform/Intel: Fix invalid DEBUG() macros

From: Michael Kubacki <michael.kubacki@microsoft.com>

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

Fixes several debug macros in Platform/Intel that have a mismatched number of print specifiers to arguments.

The original author's intention is not always 100% obvious. Though, this series is relatively straightforward.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Heng Luo <heng.luo@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>

Michael Kubacki (3):
  MinPlatformPkg: Fix invalid debug macros
  TigerLakeOpenBoardPkg: Remove unnecessary debug macro argument
  WhitleyOpenBoardPkg: Fix invalid debug macros

 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c                                                |  4 ++--
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmiHandlerInstrument.c                               |  4 ++--
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c                                             | 13 ++++--------
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHob.c                                                | 22 +++++++-------------
 Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMemDefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c |  2 +-
 Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c                                     |  2 +-
 Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c                                     |  2 +-
 Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c                           |  2 +-
 8 files changed, 20 insertions(+), 31 deletions(-)

--
2.28.0.windows.1

Re: [edk2-devel] [edk2-platforms][PATCH v1 0/3] Platform/Intel: Fix invalid DEBUG() macros

[Isaac Oram]

Pushed as 45c2015953..66cef08cde

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Isaac Oram
Sent: Monday, October 10, 2022 2:12 PM
To: mikuback@linux.microsoft.com; devel@edk2.groups.io
Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Luo, Heng <heng.luo@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Dong, Eric <eric.dong@intel.com>
Subject: Re: [edk2-devel] [edk2-platforms][PATCH v1 0/3] Platform/Intel: Fix invalid DEBUG() macros

Series Reviewed-by: Isaac Oram <isaac.w.oram@intel.com>

-----Original Message-----
From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com> 
Sent: Tuesday, October 4, 2022 8:35 PM
To: devel@edk2.groups.io
Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>; Luo, Heng <heng.luo@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Dong, Eric <eric.dong@intel.com>
Subject: [edk2-platforms][PATCH v1 0/3] Platform/Intel: Fix invalid DEBUG() macros

From: Michael Kubacki <michael.kubacki@microsoft.com>

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

Fixes several debug macros in Platform/Intel that have a mismatched number of print specifiers to arguments.

The original author's intention is not always 100% obvious. Though, this series is relatively straightforward.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Heng Luo <heng.luo@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>

Michael Kubacki (3):
  MinPlatformPkg: Fix invalid debug macros
  TigerLakeOpenBoardPkg: Remove unnecessary debug macro argument
  WhitleyOpenBoardPkg: Fix invalid debug macros

 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c                                                |  4 ++--
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmiHandlerInstrument.c                               |  4 ++--
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckFvInfo.c                                             | 13 ++++--------
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckHob.c                                                | 22 +++++++-------------
 Platform/Intel/TigerlakeOpenBoardPkg/FspWrapper/Library/PeiSiPreMemDefaultPolicyInitLib/PeiSiPreMemDefaultPolicyInitLib.c |  2 +-
 Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c                                     |  2 +-
 Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c                                     |  2 +-
 Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c                           |  2 +-
 8 files changed, 20 insertions(+), 31 deletions(-)

--
2.28.0.windows.1