1. Patchew
  2. EDK2
  3. [edk2-devel] [edk2-platforms][PATCH v1 0/3] Silicon/Intel: Fix invalid DEBUG() macros
  4. View patch

[edk2-devel] [edk2-platforms][PATCH v1 2/3] KabylakeSiliconPkg: Fix invalid debug macros

Michael Kubacki posted 3 patches 3 years, 4 months ago
There is a newer version of this series
[edk2-devel] [edk2-platforms][PATCH v1 2/3] KabylakeSiliconPkg: Fix invalid debug macros
Posted by Michael Kubacki 3 years, 4 months ago 
From: Michael Kubacki <michael.kubacki@microsoft.com>

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

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

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c | 19 +++++++++++--------
 Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c        |  4 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
index f13ca92661ae..d20945b7cae3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
@@ -39,13 +39,16 @@ CpuPowerMgmtBasicConfigPrint (
   )
 {
   DEBUG ((DEBUG_INFO, "------------------ CPU Power Mgmt Basic Config ------------------\n"));
-  DEBUG ((DEBUG_INFO, " CPU_POWER_MGMT_BASIC_CONFIG : OneCoreRatioLimit : 0x%X , TwoCoreRatioLimit = 0x%X , ThreeCoreRatioLimit = 0x%X , FourCoreRatioLimit = 0x%X \n",  CpuPowerMgmtBasicConfig->OneCoreRatioLimit, \
-          CpuPowerMgmtBasicConfig->TwoCoreRatioLimit, \
-          CpuPowerMgmtBasicConfig->ThreeCoreRatioLimit, \
-          CpuPowerMgmtBasicConfig->FourCoreRatioLimit, \
-          CpuPowerMgmtBasicConfig->FiveCoreRatioLimit, \
-          CpuPowerMgmtBasicConfig->SixCoreRatioLimit, \
-          CpuPowerMgmtBasicConfig->SevenCoreRatioLimit, \
+  DEBUG ((DEBUG_INFO,
+          " CPU_POWER_MGMT_BASIC_CONFIG : OneCoreRatioLimit : 0x%X , TwoCoreRatioLimit = 0x%X , ThreeCoreRatioLimit = 0x%X , FourCoreRatioLimit = 0x%X\n"
+          "                               FiveCoreRatioLimit : 0x%X , SixCoreRatioLimit = 0x%X , SevenCoreRatioLimit = 0x%X , EightCoreRatioLimit = 0x%X\n",
+          CpuPowerMgmtBasicConfig->OneCoreRatioLimit,
+          CpuPowerMgmtBasicConfig->TwoCoreRatioLimit,
+          CpuPowerMgmtBasicConfig->ThreeCoreRatioLimit,
+          CpuPowerMgmtBasicConfig->FourCoreRatioLimit,
+          CpuPowerMgmtBasicConfig->FiveCoreRatioLimit,
+          CpuPowerMgmtBasicConfig->SixCoreRatioLimit,
+          CpuPowerMgmtBasicConfig->SevenCoreRatioLimit,
           CpuPowerMgmtBasicConfig->EightCoreRatioLimit));
   DEBUG ((DEBUG_INFO, " CPU_POWER_MGMT_BASIC_CONFIG: Hwp : 0x%x\n", CpuPowerMgmtBasicConfig->Hwp));
   DEBUG ((DEBUG_INFO, " CPU_POWER_MGMT_BASIC_CONFIG: SkipSetBootPState : 0x%x\n", CpuPowerMgmtBasicConfig->SkipSetBootPState));
@@ -151,7 +154,7 @@ CpuPidTestConfigPrint (
 {
   UINT32 Index = 0;
   DEBUG ((DEBUG_INFO, "------------------ CPU PID Test Config ------------------\n"));
-  DEBUG ((DEBUG_INFO, " CPU_PID_TEST_CONFIG : PidTuning : 0x%X\n", Index,  CpuPidTestConfig->PidTuning));
+  DEBUG ((DEBUG_INFO, " CPU_PID_TEST_CONFIG : PidTuning : 0x%X\n", CpuPidTestConfig->PidTuning));
   if ( CpuPidTestConfig->PidTuning == 1) {
     for (Index = PID_DOMAIN_KP; Index <= PID_DOMAIN_KD; Index++) {
         DEBUG ((DEBUG_INFO, " CPU_PID_TEST_CONFIG : Ratl[%X] : 0x%X\n", Index,  CpuPidTestConfig->Ratl[Index]));
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
index e8c8dab6e7ad..467f71bff92b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
@@ -75,7 +75,7 @@ OcWdtResetCheck (
   /// Timeout status bits are cleared by writing '1'
   ///
   if (Readback & (B_PCH_OC_WDT_CTL_ICCSURV_STS | B_PCH_OC_WDT_CTL_NO_ICCSURV_STS)) {
-    DEBUG ((DEBUG_ERROR, "(WDT) Expiration detected.\n", Readback));
+    DEBUG ((DEBUG_ERROR, "(WDT) Expiration detected. Read back = 0x%08x\n", Readback));
     Readback |= B_PCH_OC_WDT_CTL_FAILURE_STS;
     Readback |= (B_PCH_OC_WDT_CTL_ICCSURV_STS | B_PCH_OC_WDT_CTL_NO_ICCSURV_STS);
     Readback &= ~(B_PCH_OC_WDT_CTL_UNXP_RESET_STS);
@@ -102,7 +102,7 @@ OcWdtResetCheck (
       ///
       /// No WDT expiration and no unexpected reset - clear Failure status
       ///
-      DEBUG ((DEBUG_INFO, "(WDT) Status OK.\n", Readback));
+      DEBUG ((DEBUG_INFO, "(WDT) Status OK.\n"));
       Readback &= ~(B_PCH_OC_WDT_CTL_FAILURE_STS);
       Readback |= (B_PCH_OC_WDT_CTL_ICCSURV_STS | B_PCH_OC_WDT_CTL_NO_ICCSURV_STS);
     }
-- 
2.28.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#94740): https://edk2.groups.io/g/devel/message/94740
Mute This Topic: https://groups.io/mt/94129546/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms][PATCH v1 2/3] KabylakeSiliconPkg: Fix invalid debug macros
Posted by Nate DeSimone 3 years, 4 months ago 
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael
> Kubacki
> Sent: Tuesday, October 4, 2022 9:07 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaganty@intel.com>
> Subject: [edk2-devel] [edk2-platforms][PATCH v1 2/3] KabylakeSiliconPkg:
> Fix invalid debug macros
> 
> From: Michael Kubacki <michael.kubacki@microsoft.com>
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4095
> 
> Updates several debug macros in KabylakeSiliconPkg to correctly match print
> specifiers to actual arguments.
> 
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> 
> Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.
> c | 19 +++++++++++--------
>  Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> |  4 ++--
>  2 files changed, 13 insertions(+), 10 deletions(-)
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPoli
> cy.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPoli
> cy.c
> index f13ca92661ae..d20945b7cae3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPoli
> cy.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPr
> +++ intPolicy.c
> @@ -39,13 +39,16 @@ CpuPowerMgmtBasicConfigPrint (
>    )
>  {
>    DEBUG ((DEBUG_INFO, "------------------ CPU Power Mgmt Basic Config -----
> -------------\n"));
> -  DEBUG ((DEBUG_INFO, " CPU_POWER_MGMT_BASIC_CONFIG :
> OneCoreRatioLimit : 0x%X , TwoCoreRatioLimit = 0x%X , ThreeCoreRatioLimit
> = 0x%X , FourCoreRatioLimit = 0x%X \n",  CpuPowerMgmtBasicConfig-
> >OneCoreRatioLimit, \
> -          CpuPowerMgmtBasicConfig->TwoCoreRatioLimit, \
> -          CpuPowerMgmtBasicConfig->ThreeCoreRatioLimit, \
> -          CpuPowerMgmtBasicConfig->FourCoreRatioLimit, \
> -          CpuPowerMgmtBasicConfig->FiveCoreRatioLimit, \
> -          CpuPowerMgmtBasicConfig->SixCoreRatioLimit, \
> -          CpuPowerMgmtBasicConfig->SevenCoreRatioLimit, \
> +  DEBUG ((DEBUG_INFO,
> +          " CPU_POWER_MGMT_BASIC_CONFIG : OneCoreRatioLimit : 0x%X ,
> TwoCoreRatioLimit = 0x%X , ThreeCoreRatioLimit = 0x%X ,
> FourCoreRatioLimit = 0x%X\n"
> +          "                               FiveCoreRatioLimit : 0x%X , SixCoreRatioLimit = 0x%X ,
> SevenCoreRatioLimit = 0x%X , EightCoreRatioLimit = 0x%X\n",
> +          CpuPowerMgmtBasicConfig->OneCoreRatioLimit,
> +          CpuPowerMgmtBasicConfig->TwoCoreRatioLimit,
> +          CpuPowerMgmtBasicConfig->ThreeCoreRatioLimit,
> +          CpuPowerMgmtBasicConfig->FourCoreRatioLimit,
> +          CpuPowerMgmtBasicConfig->FiveCoreRatioLimit,
> +          CpuPowerMgmtBasicConfig->SixCoreRatioLimit,
> +          CpuPowerMgmtBasicConfig->SevenCoreRatioLimit,
>            CpuPowerMgmtBasicConfig->EightCoreRatioLimit));
>    DEBUG ((DEBUG_INFO, " CPU_POWER_MGMT_BASIC_CONFIG: Hwp :
> 0x%x\n", CpuPowerMgmtBasicConfig->Hwp));
>    DEBUG ((DEBUG_INFO, " CPU_POWER_MGMT_BASIC_CONFIG:
> SkipSetBootPState : 0x%x\n", CpuPowerMgmtBasicConfig-
> >SkipSetBootPState));
> @@ -151,7 +154,7 @@ CpuPidTestConfigPrint (  {
>    UINT32 Index = 0;
>    DEBUG ((DEBUG_INFO, "------------------ CPU PID Test Config ------------------
> \n"));
> -  DEBUG ((DEBUG_INFO, " CPU_PID_TEST_CONFIG : PidTuning : 0x%X\n",
> Index,  CpuPidTestConfig->PidTuning));
> +  DEBUG ((DEBUG_INFO, " CPU_PID_TEST_CONFIG : PidTuning : 0x%X\n",
> + CpuPidTestConfig->PidTuning));
>    if ( CpuPidTestConfig->PidTuning == 1) {
>      for (Index = PID_DOMAIN_KP; Index <= PID_DOMAIN_KD; Index++) {
>          DEBUG ((DEBUG_INFO, " CPU_PID_TEST_CONFIG : Ratl[%X] : 0x%X\n",
> Index,  CpuPidTestConfig->Ratl[Index])); diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> index e8c8dab6e7ad..467f71bff92b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtL
> +++ ib.c
> @@ -75,7 +75,7 @@ OcWdtResetCheck (
>    /// Timeout status bits are cleared by writing '1'
>    ///
>    if (Readback & (B_PCH_OC_WDT_CTL_ICCSURV_STS |
> B_PCH_OC_WDT_CTL_NO_ICCSURV_STS)) {
> -    DEBUG ((DEBUG_ERROR, "(WDT) Expiration detected.\n", Readback));
> +    DEBUG ((DEBUG_ERROR, "(WDT) Expiration detected. Read back =
> + 0x%08x\n", Readback));
>      Readback |= B_PCH_OC_WDT_CTL_FAILURE_STS;
>      Readback |= (B_PCH_OC_WDT_CTL_ICCSURV_STS |
> B_PCH_OC_WDT_CTL_NO_ICCSURV_STS);
>      Readback &= ~(B_PCH_OC_WDT_CTL_UNXP_RESET_STS);
> @@ -102,7 +102,7 @@ OcWdtResetCheck (
>        ///
>        /// No WDT expiration and no unexpected reset - clear Failure status
>        ///
> -      DEBUG ((DEBUG_INFO, "(WDT) Status OK.\n", Readback));
> +      DEBUG ((DEBUG_INFO, "(WDT) Status OK.\n"));
>        Readback &= ~(B_PCH_OC_WDT_CTL_FAILURE_STS);
>        Readback |= (B_PCH_OC_WDT_CTL_ICCSURV_STS |
> B_PCH_OC_WDT_CTL_NO_ICCSURV_STS);
>      }
> --
> 2.28.0.windows.1
> 
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#94740): https://edk2.groups.io/g/devel/message/94740
> Mute This Topic: https://groups.io/mt/94129546/1767664
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> [nathaniel.l.desimone@intel.com]
> -=-=-=-=-=-=
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95022): https://edk2.groups.io/g/devel/message/95022
Mute This Topic: https://groups.io/mt/94129546/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.