public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Michael Kubacki" <mikuback@linux.microsoft.com>
To: devel@edk2.groups.io
Cc: Isaac Oram <isaac.w.oram@intel.com>,
	Nate DeSimone <nathaniel.l.desimone@intel.com>,
	Chasel Chiu <chasel.chiu@intel.com>
Subject: [edk2-platforms][PATCH v1 3/3] WhitleyOpenBoardPkg: Fix invalid debug macros
Date: Tue,  4 Oct 2022 23:35:31 -0400	[thread overview]
Message-ID: <20221005033531.3994-4-mikuback@linux.microsoft.com> (raw)
In-Reply-To: <20221005033531.3994-1-mikuback@linux.microsoft.com>

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


  parent reply	other threads:[~2022-10-05  3:36 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-05  3:35 [edk2-platforms][PATCH v1 0/3] Platform/Intel: Fix invalid DEBUG() macros Michael Kubacki
2022-10-05  3:35 ` [edk2-platforms][PATCH v1 1/3] MinPlatformPkg: Fix invalid debug macros Michael Kubacki
2022-10-05  3:35 ` [edk2-platforms][PATCH v1 2/3] TigerLakeOpenBoardPkg: Remove unnecessary debug macro argument Michael Kubacki
2022-10-06 12:19   ` Heng Luo
2022-10-06 23:59   ` Chaganty, Rangasai V
2022-10-05  3:35 ` Michael Kubacki [this message]
2022-10-10 21:11 ` [edk2-platforms][PATCH v1 0/3] Platform/Intel: Fix invalid DEBUG() macros Isaac Oram
     [not found] ` <171CD17D6C79385E.7991@groups.io>
2022-10-10 21:17   ` [edk2-devel] " Isaac Oram

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221005033531.3994-4-mikuback@linux.microsoft.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox