* [edk2-platforms][PATCH v1 0/3] Silicon/Intel: Fix invalid DEBUG() macros
@ 2022-10-05 4:06 Michael Kubacki
2022-10-05 4:06 ` [edk2-platforms][PATCH v1 1/3] CoffeelakeSiliconPkg: Fix invalid debug macros Michael Kubacki
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Michael Kubacki @ 2022-10-05 4:06 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Heng Luo, Nate DeSimone, Sai Chaganty
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4095
Fixes several debug macros in Silicon/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: Heng Luo <heng.luo@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Michael Kubacki (3):
CoffeelakeSiliconPkg: Fix invalid debug macros
KabylakeSiliconPkg: Fix invalid debug macros
TigerlakeSiliconPkg: Fix invalid debug macros
Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c | 2 +-
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c | 2 +-
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c | 4 ++--
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c | 2 +-
Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c | 19 +++++++++++--------
Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c | 4 ++--
Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Gbe/LibraryPrivate/PeiDxeSmmGbeMdiLib/GbeMdiLib.c | 2 +-
Silicon/Intel/TigerlakeSiliconPkg/IpBlock/PcieRp/LibraryPrivate/PciExpressHelpersLibrary/PciExpressHelpersLibrary.c | 2 +-
8 files changed, 20 insertions(+), 17 deletions(-)
--
2.28.0.windows.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [edk2-platforms][PATCH v1 1/3] CoffeelakeSiliconPkg: Fix invalid debug macros
2022-10-05 4:06 [edk2-platforms][PATCH v1 0/3] Silicon/Intel: Fix invalid DEBUG() macros Michael Kubacki
@ 2022-10-05 4:06 ` Michael Kubacki
2022-10-12 0:37 ` [edk2-devel] " Nate DeSimone
2022-10-05 4:06 ` [edk2-platforms][PATCH v1 2/3] KabylakeSiliconPkg: " Michael Kubacki
2022-10-05 4:06 ` [edk2-platforms][PATCH v1 3/3] TigerlakeSiliconPkg: " Michael Kubacki
2 siblings, 1 reply; 8+ messages in thread
From: Michael Kubacki @ 2022-10-05 4:06 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Sai Chaganty
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4095
Updates several debug macros in CoffeelakeSiliconPkg 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/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c | 2 +-
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c | 2 +-
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c | 4 ++--
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
index 38cf383e8da2..2e50068ba193 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
@@ -161,7 +161,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/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
index e5aa10de3b7b..7df011269af5 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
@@ -335,7 +335,7 @@ GbeMdiGetLanPhyRevision (
Status = EFI_DEVICE_ERROR;
goto PHY_EXIT;
}
- DEBUG ((DEBUG_INFO, "GbeMdiGetLanPhyRevision failed to read Revision. Overriding LANPHYPC\n", Status));
+ DEBUG ((DEBUG_INFO, "GbeMdiGetLanPhyRevision failed to read Revision. Overriding LANPHYPC.\n"));
//
// Taking over LANPHYPC
// 1. SW signal override - 1st cycle.
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
index 22f6fb215fcc..e2014f97e58c 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
@@ -71,7 +71,7 @@ OcWdtResetCheck (
/// Timeout status bits are cleared by writing '1'
///
if (Readback & (B_ACPI_IO_OC_WDT_CTL_ICCSURV_STS | B_ACPI_IO_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_ACPI_IO_OC_WDT_CTL_FAILURE_STS;
Readback |= (B_ACPI_IO_OC_WDT_CTL_ICCSURV_STS | B_ACPI_IO_OC_WDT_CTL_NO_ICCSURV_STS);
Readback &= ~(B_ACPI_IO_OC_WDT_CTL_UNXP_RESET_STS);
@@ -98,7 +98,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_ACPI_IO_OC_WDT_CTL_FAILURE_STS);
Readback |= (B_ACPI_IO_OC_WDT_CTL_ICCSURV_STS | B_ACPI_IO_OC_WDT_CTL_NO_ICCSURV_STS);
}
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
index dcb43285b73e..c55fa4efe188 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
@@ -1800,7 +1800,7 @@ RecursiveIoApicCheck (
IoApicPresent = FALSE;
if (IsIoApicDevice (SbdfToBase (Sbdf))) {
- DEBUG ((DEBUG_INFO, "IoApicFound @%x:%x:%x:%x\n", Sbdf.Bus, Sbdf.Dev, Sbdf.Func));
+ DEBUG ((DEBUG_INFO, "IoApicFound @%x:%x:%x\n", Sbdf.Bus, Sbdf.Dev, Sbdf.Func));
return TRUE;
}
if (HasChildBus (Sbdf, &ChildSbdf)) {
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [edk2-platforms][PATCH v1 2/3] KabylakeSiliconPkg: Fix invalid debug macros
2022-10-05 4:06 [edk2-platforms][PATCH v1 0/3] Silicon/Intel: Fix invalid DEBUG() macros Michael Kubacki
2022-10-05 4:06 ` [edk2-platforms][PATCH v1 1/3] CoffeelakeSiliconPkg: Fix invalid debug macros Michael Kubacki
@ 2022-10-05 4:06 ` Michael Kubacki
2022-10-12 0:37 ` [edk2-devel] " Nate DeSimone
2022-10-05 4:06 ` [edk2-platforms][PATCH v1 3/3] TigerlakeSiliconPkg: " Michael Kubacki
2 siblings, 1 reply; 8+ messages in thread
From: Michael Kubacki @ 2022-10-05 4:06 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Sai Chaganty
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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [edk2-platforms][PATCH v1 3/3] TigerlakeSiliconPkg: Fix invalid debug macros
2022-10-05 4:06 [edk2-platforms][PATCH v1 0/3] Silicon/Intel: Fix invalid DEBUG() macros Michael Kubacki
2022-10-05 4:06 ` [edk2-platforms][PATCH v1 1/3] CoffeelakeSiliconPkg: Fix invalid debug macros Michael Kubacki
2022-10-05 4:06 ` [edk2-platforms][PATCH v1 2/3] KabylakeSiliconPkg: " Michael Kubacki
@ 2022-10-05 4:06 ` Michael Kubacki
2022-10-12 0:37 ` Nate DeSimone
2 siblings, 1 reply; 8+ messages in thread
From: Michael Kubacki @ 2022-10-05 4:06 UTC (permalink / raw)
To: devel; +Cc: Sai Chaganty, Nate DeSimone, Heng Luo
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4095
Updates several debug macros in TigerlakeSiliconPkg to correctly
match print specifiers to actual arguments.
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Heng Luo <heng.luo@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Gbe/LibraryPrivate/PeiDxeSmmGbeMdiLib/GbeMdiLib.c | 2 +-
Silicon/Intel/TigerlakeSiliconPkg/IpBlock/PcieRp/LibraryPrivate/PciExpressHelpersLibrary/PciExpressHelpersLibrary.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Gbe/LibraryPrivate/PeiDxeSmmGbeMdiLib/GbeMdiLib.c b/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Gbe/LibraryPrivate/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
index 791747440662..01c097723083 100644
--- a/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Gbe/LibraryPrivate/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
+++ b/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Gbe/LibraryPrivate/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
@@ -323,7 +323,7 @@ GbeMdiGetLanPhyRevision (
Status = EFI_DEVICE_ERROR;
goto phy_exit;
}
- DEBUG ((DEBUG_INFO, "GbeMdiGetLanPhyRevision failed to read Revision. Overriding LANPHYPC\n", Status));
+ DEBUG ((DEBUG_INFO, "GbeMdiGetLanPhyRevision failed to read Revision. Overriding LANPHYPC.\n"));;
//
// Taking over LANPHYPC
// 1. SW signal override - 1st cycle.
diff --git a/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/PcieRp/LibraryPrivate/PciExpressHelpersLibrary/PciExpressHelpersLibrary.c b/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/PcieRp/LibraryPrivate/PciExpressHelpersLibrary/PciExpressHelpersLibrary.c
index 401a9fbe7b8a..d1c163c50f63 100644
--- a/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/PcieRp/LibraryPrivate/PciExpressHelpersLibrary/PciExpressHelpersLibrary.c
+++ b/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/PcieRp/LibraryPrivate/PciExpressHelpersLibrary/PciExpressHelpersLibrary.c
@@ -1227,7 +1227,7 @@ RecursiveIoApicCheck (
IoApicPresent = FALSE;
if (IsIoApicDevice (SbdfToBase (Sbdf))) {
- DEBUG ((DEBUG_INFO, "IoApicFound @%x:%x:%x:%x\n", Sbdf.Bus, Sbdf.Dev, Sbdf.Func));
+ DEBUG ((DEBUG_INFO, "IoApicFound @%x:%x:%x\n", Sbdf.Bus, Sbdf.Dev, Sbdf.Func));
return TRUE;
}
if (HasChildBus (Sbdf, &ChildSbdf)) {
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH v1 1/3] CoffeelakeSiliconPkg: Fix invalid debug macros
2022-10-05 4:06 ` [edk2-platforms][PATCH v1 1/3] CoffeelakeSiliconPkg: Fix invalid debug macros Michael Kubacki
@ 2022-10-12 0:37 ` Nate DeSimone
2022-10-12 13:58 ` Michael Kubacki
0 siblings, 1 reply; 8+ messages in thread
From: Nate DeSimone @ 2022-10-12 0:37 UTC (permalink / raw)
To: devel@edk2.groups.io, mikuback@linux.microsoft.com
Cc: Chiu, Chasel, Chaganty, Rangasai V
Hi Michael,
Please see feedback inline.
Thanks,
Nate
> -----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 1/3] CoffeelakeSiliconPkg:
> 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 CoffeelakeSiliconPkg 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/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c | 2 +-
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c | 2 +-
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c | 4 ++--
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c | 2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
> index 38cf383e8da2..2e50068ba193 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
> @@ -161,7 +161,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/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
> index e5aa10de3b7b..7df011269af5 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
> @@ -335,7 +335,7 @@ GbeMdiGetLanPhyRevision (
> Status = EFI_DEVICE_ERROR;
> goto PHY_EXIT;
> }
> - DEBUG ((DEBUG_INFO, "GbeMdiGetLanPhyRevision failed to read Revision. Overriding LANPHYPC\n", Status));
> + DEBUG ((DEBUG_INFO, "GbeMdiGetLanPhyRevision failed to read Revision. Overriding LANPHYPC.\n"));
That does not seem to be what the original author intended. I suspect this is the intent:
DEBUG ((DEBUG_INFO, "GbeMdiGetLanPhyRevision failed to read Revision. Overriding LANPHYPC. Status: %r\n", Status));
> //
> // Taking over LANPHYPC
> // 1. SW signal override - 1st cycle.
> diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> index 22f6fb215fcc..e2014f97e58c 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> @@ -71,7 +71,7 @@ OcWdtResetCheck (
> /// Timeout status bits are cleared by writing '1'
> ///
> if (Readback & (B_ACPI_IO_OC_WDT_CTL_ICCSURV_STS | B_ACPI_IO_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_ACPI_IO_OC_WDT_CTL_FAILURE_STS;
> Readback |= (B_ACPI_IO_OC_WDT_CTL_ICCSURV_STS | B_ACPI_IO_OC_WDT_CTL_NO_ICCSURV_STS);
> Readback &= ~(B_ACPI_IO_OC_WDT_CTL_UNXP_RESET_STS);
> @@ -98,7 +98,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_ACPI_IO_OC_WDT_CTL_FAILURE_STS);
> Readback |= (B_ACPI_IO_OC_WDT_CTL_ICCSURV_STS | B_ACPI_IO_OC_WDT_CTL_NO_ICCSURV_STS);
> }
> diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
> index dcb43285b73e..c55fa4efe188 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
> @@ -1800,7 +1800,7 @@ RecursiveIoApicCheck (
> IoApicPresent = FALSE;
>
> if (IsIoApicDevice (SbdfToBase (Sbdf))) {
> - DEBUG ((DEBUG_INFO, "IoApicFound @%x:%x:%x:%x\n", Sbdf.Bus, Sbdf.Dev, Sbdf.Func));
> + DEBUG ((DEBUG_INFO, "IoApicFound @%x:%x:%x\n", Sbdf.Bus, Sbdf.Dev, Sbdf.Func));
That does not seem to be what the original author intended. I suspect this is the intent:
DEBUG ((DEBUG_INFO, "IoApicFound @%x:%x:%x:%x\n", Sbdf.Seg, Sbdf.Bus, Sbdf.Dev, Sbdf.Func));
> return TRUE;
> }
> if (HasChildBus (Sbdf, &ChildSbdf)) {
> --
> 2.28.0.windows.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH v1 2/3] KabylakeSiliconPkg: Fix invalid debug macros
2022-10-05 4:06 ` [edk2-platforms][PATCH v1 2/3] KabylakeSiliconPkg: " Michael Kubacki
@ 2022-10-12 0:37 ` Nate DeSimone
0 siblings, 0 replies; 8+ messages in thread
From: Nate DeSimone @ 2022-10-12 0:37 UTC (permalink / raw)
To: devel@edk2.groups.io, mikuback@linux.microsoft.com
Cc: Chiu, Chasel, Chaganty, Rangasai V
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]
> -=-=-=-=-=-=
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [edk2-platforms][PATCH v1 3/3] TigerlakeSiliconPkg: Fix invalid debug macros
2022-10-05 4:06 ` [edk2-platforms][PATCH v1 3/3] TigerlakeSiliconPkg: " Michael Kubacki
@ 2022-10-12 0:37 ` Nate DeSimone
0 siblings, 0 replies; 8+ messages in thread
From: Nate DeSimone @ 2022-10-12 0:37 UTC (permalink / raw)
To: mikuback@linux.microsoft.com, devel@edk2.groups.io
Cc: Chaganty, Rangasai V, Luo, Heng
Hi Michael,
Please see feedback inline.
Thanks,
Nate
> -----Original Message-----
> From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com>
> Sent: Tuesday, October 4, 2022 9:07 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>
> Subject: [edk2-platforms][PATCH v1 3/3] TigerlakeSiliconPkg: 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 TigerlakeSiliconPkg to correctly match print
> specifiers to actual arguments.
>
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Heng Luo <heng.luo@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Gbe/LibraryPrivate/PeiDxeSmmGbeMdiLib/GbeMdiLib.c | 2 +-
> Silicon/Intel/TigerlakeSiliconPkg/IpBlock/PcieRp/LibraryPrivate/PciExpressHelpersLibrary/PciExpressHelpersLibrary.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Gbe/LibraryPrivate/PeiDxeSmmGbeMdiLib/GbeMdiLib.c b/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Gbe/LibraryPrivate/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
> index 791747440662..01c097723083 100644
> --- a/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Gbe/LibraryPrivate/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
> +++ b/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/Gbe/LibraryPrivate/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
> @@ -323,7 +323,7 @@ GbeMdiGetLanPhyRevision (
> Status = EFI_DEVICE_ERROR;
> goto phy_exit;
> }
> - DEBUG ((DEBUG_INFO, "GbeMdiGetLanPhyRevision failed to read Revision. Overriding LANPHYPC\n", Status));
> + DEBUG ((DEBUG_INFO, "GbeMdiGetLanPhyRevision failed to read Revision. Overriding LANPHYPC.\n"));;
That does not seem to be what the original author intended. I suspect this is the intent:
DEBUG ((DEBUG_INFO, "GbeMdiGetLanPhyRevision failed to read Revision. Overriding LANPHYPC. Status: %r\n", Status));
> //
> // Taking over LANPHYPC
> // 1. SW signal override - 1st cycle.
> diff --git a/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/PcieRp/LibraryPrivate/PciExpressHelpersLibrary/PciExpressHelpersLibrary.c b/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/PcieRp/LibraryPrivate/PciExpressHelpersLibrary/PciExpressHelpersLibrary.c
> index 401a9fbe7b8a..d1c163c50f63 100644
> --- a/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/PcieRp/LibraryPrivate/PciExpressHelpersLibrary/PciExpressHelpersLibrary.c
> +++ b/Silicon/Intel/TigerlakeSiliconPkg/IpBlock/PcieRp/LibraryPrivate/PciExpressHelpersLibrary/PciExpressHelpersLibrary.c
> @@ -1227,7 +1227,7 @@ RecursiveIoApicCheck (
> IoApicPresent = FALSE;
>
> if (IsIoApicDevice (SbdfToBase (Sbdf))) {
> - DEBUG ((DEBUG_INFO, "IoApicFound @%x:%x:%x:%x\n", Sbdf.Bus, Sbdf.Dev, Sbdf.Func));
> + DEBUG ((DEBUG_INFO, "IoApicFound @%x:%x:%x\n", Sbdf.Bus, Sbdf.Dev, Sbdf.Func));
That does not seem to be what the original author intended. I suspect this is the intent:
DEBUG ((DEBUG_INFO, "IoApicFound @%x:%x:%x:%x\n", Sbdf.Seg, Sbdf.Bus, Sbdf.Dev, Sbdf.Func));
> return TRUE;
> }
> if (HasChildBus (Sbdf, &ChildSbdf)) {
> --
> 2.28.0.windows.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH v1 1/3] CoffeelakeSiliconPkg: Fix invalid debug macros
2022-10-12 0:37 ` [edk2-devel] " Nate DeSimone
@ 2022-10-12 13:58 ` Michael Kubacki
0 siblings, 0 replies; 8+ messages in thread
From: Michael Kubacki @ 2022-10-12 13:58 UTC (permalink / raw)
To: devel, nathaniel.l.desimone; +Cc: Chiu, Chasel, Chaganty, Rangasai V
Thanks, I took the approach that no one seemed to miss bad/missing
information. I'll send a v2 with these suggestions.
On 10/11/2022 8:37 PM, Nate DeSimone wrote:
> Hi Michael,
>
> Please see feedback inline.
>
> Thanks,
> Nate
>
>> -----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 1/3] CoffeelakeSiliconPkg:
>> 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 CoffeelakeSiliconPkg 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/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c | 2 +-
>> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c | 2 +-
>> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c | 4 ++--
>> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c | 2 +-
>> 4 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
>> index 38cf383e8da2..2e50068ba193 100644
>> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
>> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
>> @@ -161,7 +161,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/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
>> index e5aa10de3b7b..7df011269af5 100644
>> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
>> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdiLib.c
>> @@ -335,7 +335,7 @@ GbeMdiGetLanPhyRevision (
>> Status = EFI_DEVICE_ERROR;
>> goto PHY_EXIT;
>> }
>> - DEBUG ((DEBUG_INFO, "GbeMdiGetLanPhyRevision failed to read Revision. Overriding LANPHYPC\n", Status));
>> + DEBUG ((DEBUG_INFO, "GbeMdiGetLanPhyRevision failed to read Revision. Overriding LANPHYPC.\n"));
>
> That does not seem to be what the original author intended. I suspect this is the intent:
>
> DEBUG ((DEBUG_INFO, "GbeMdiGetLanPhyRevision failed to read Revision. Overriding LANPHYPC. Status: %r\n", Status));
>
>> //
>> // Taking over LANPHYPC
>> // 1. SW signal override - 1st cycle.
>> diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
>> index 22f6fb215fcc..e2014f97e58c 100644
>> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
>> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
>> @@ -71,7 +71,7 @@ OcWdtResetCheck (
>> /// Timeout status bits are cleared by writing '1'
>> ///
>> if (Readback & (B_ACPI_IO_OC_WDT_CTL_ICCSURV_STS | B_ACPI_IO_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_ACPI_IO_OC_WDT_CTL_FAILURE_STS;
>> Readback |= (B_ACPI_IO_OC_WDT_CTL_ICCSURV_STS | B_ACPI_IO_OC_WDT_CTL_NO_ICCSURV_STS);
>> Readback &= ~(B_ACPI_IO_OC_WDT_CTL_UNXP_RESET_STS);
>> @@ -98,7 +98,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_ACPI_IO_OC_WDT_CTL_FAILURE_STS);
>> Readback |= (B_ACPI_IO_OC_WDT_CTL_ICCSURV_STS | B_ACPI_IO_OC_WDT_CTL_NO_ICCSURV_STS);
>> }
>> diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
>> index dcb43285b73e..c55fa4efe188 100644
>> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
>> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
>> @@ -1800,7 +1800,7 @@ RecursiveIoApicCheck (
>> IoApicPresent = FALSE;
>>
>> if (IsIoApicDevice (SbdfToBase (Sbdf))) {
>> - DEBUG ((DEBUG_INFO, "IoApicFound @%x:%x:%x:%x\n", Sbdf.Bus, Sbdf.Dev, Sbdf.Func));
>> + DEBUG ((DEBUG_INFO, "IoApicFound @%x:%x:%x\n", Sbdf.Bus, Sbdf.Dev, Sbdf.Func));
>
> That does not seem to be what the original author intended. I suspect this is the intent:
>
> DEBUG ((DEBUG_INFO, "IoApicFound @%x:%x:%x:%x\n", Sbdf.Seg, Sbdf.Bus, Sbdf.Dev, Sbdf.Func));
>
>> return TRUE;
>> }
>> if (HasChildBus (Sbdf, &ChildSbdf)) {
>> --
>> 2.28.0.windows.1
>
>
>
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-10-12 13:58 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-05 4:06 [edk2-platforms][PATCH v1 0/3] Silicon/Intel: Fix invalid DEBUG() macros Michael Kubacki
2022-10-05 4:06 ` [edk2-platforms][PATCH v1 1/3] CoffeelakeSiliconPkg: Fix invalid debug macros Michael Kubacki
2022-10-12 0:37 ` [edk2-devel] " Nate DeSimone
2022-10-12 13:58 ` Michael Kubacki
2022-10-05 4:06 ` [edk2-platforms][PATCH v1 2/3] KabylakeSiliconPkg: " Michael Kubacki
2022-10-12 0:37 ` [edk2-devel] " Nate DeSimone
2022-10-05 4:06 ` [edk2-platforms][PATCH v1 3/3] TigerlakeSiliconPkg: " Michael Kubacki
2022-10-12 0:37 ` Nate DeSimone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox