From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web10.20672.1665584197007975174 for ; Wed, 12 Oct 2022 07:16:37 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=GsCMB64H; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: mikuback@linux.microsoft.com) Received: from localhost.localdomain (unknown [47.201.8.94]) by linux.microsoft.com (Postfix) with ESMTPSA id 1E79120F0F63; Wed, 12 Oct 2022 07:16:36 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 1E79120F0F63 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1665584196; bh=gpo713Vyok9SSBxMgvoh8D6F04AsJgNMIiET1NQyLIs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GsCMB64HGY9giZ64hvJul2OnpU13qkPBb0/84VrXqSr88HKT8TFUWWqyIUcUnik4y s3546uDNafApa9yeGMWZqLn23DPNH/MNzheSIDpWryCNP4yMsAp0AKAMCgVj98Brh3 vCcpxxrMYluDVm1lu/4rLFZy56q1zI1dR8NYgDhQ= From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Chasel Chiu , Sai Chaganty , Nate DeSimone Subject: [edk2-platforms][PATCH v2 2/3] KabylakeSiliconPkg: Fix invalid debug macros Date: Wed, 12 Oct 2022 10:16:09 -0400 Message-Id: <20221012141610.668-3-mikuback@linux.microsoft.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20221012141610.668-1-mikuback@linux.microsoft.com> References: <20221012141610.668-1-mikuback@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Kubacki REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D4095 Updates several debug macros in KabylakeSiliconPkg to correctly match print specifiers to actual arguments. Cc: Chasel Chiu Cc: Sai Chaganty Signed-off-by: Michael Kubacki Reviewed-by: Nate DeSimone --- Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPol= icy.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/PeiCpuPo= licyLib/CpuPrintPolicy.c index f13ca92661ae..d20945b7cae3 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPri= ntPolicy.c +++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPri= ntPolicy.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 =3D 0x%X , ThreeCoreRatioLimit =3D 0x%X , Four= CoreRatioLimit =3D 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 , Two= CoreRatioLimit =3D 0x%X , ThreeCoreRatioLimit =3D 0x%X , FourCoreRatioLim= it =3D 0x%X\n" + " FiveCoreRatioLimit : 0x%X , Si= xCoreRatioLimit =3D 0x%X , SevenCoreRatioLimit =3D 0x%X , EightCoreRatioL= imit =3D 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", CpuP= owerMgmtBasicConfig->Hwp)); DEBUG ((DEBUG_INFO, " CPU_POWER_MGMT_BASIC_CONFIG: SkipSetBootPState := 0x%x\n", CpuPowerMgmtBasicConfig->SkipSetBootPState)); @@ -151,7 +154,7 @@ CpuPidTestConfigPrint ( { UINT32 Index =3D 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", CpuPi= dTestConfig->PidTuning)); if ( CpuPidTestConfig->PidTuning =3D=3D 1) { for (Index =3D PID_DOMAIN_KP; Index <=3D 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/Pei= OcWdtLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/Pei= OcWdtLib.c index e8c8dab6e7ad..467f71bff92b 100644 --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLi= b.c +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLi= b.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_ICC= SURV_STS)) { - DEBUG ((DEBUG_ERROR, "(WDT) Expiration detected.\n", Readback)); + DEBUG ((DEBUG_ERROR, "(WDT) Expiration detected. Read back =3D 0x%08= x\n", Readback)); Readback |=3D B_PCH_OC_WDT_CTL_FAILURE_STS; Readback |=3D (B_PCH_OC_WDT_CTL_ICCSURV_STS | B_PCH_OC_WDT_CTL_NO_IC= CSURV_STS); Readback &=3D ~(B_PCH_OC_WDT_CTL_UNXP_RESET_STS); @@ -102,7 +102,7 @@ OcWdtResetCheck ( /// /// No WDT expiration and no unexpected reset - clear Failure stat= us /// - DEBUG ((DEBUG_INFO, "(WDT) Status OK.\n", Readback)); + DEBUG ((DEBUG_INFO, "(WDT) Status OK.\n")); Readback &=3D ~(B_PCH_OC_WDT_CTL_FAILURE_STS); Readback |=3D (B_PCH_OC_WDT_CTL_ICCSURV_STS | B_PCH_OC_WDT_CTL_NO_= ICCSURV_STS); } --=20 2.28.0.windows.1