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.20671.1665584194296859719 for ; Wed, 12 Oct 2022 07:16:34 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=Qa1DakbU; 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 5E92920F0F63; Wed, 12 Oct 2022 07:16:33 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 5E92920F0F63 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1665584193; bh=w5VvV5oexCkglOgQmIsti1Sp1rJxA4HHsh8DBNtgGI0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qa1DakbUyRQy0jVlBjGfLVNHy6C7Hl3/sj/2+gkgHPabzBDWDQhJP4QEfk/NHJuuv xkGPpqu1ipYKmfuxj0FOFOxwG7/VwUEF+HKd3/2J5BgWB1gNvpAmwWY5jVYri6C03m eFwh7TqrggecrHJIcUgzbx0LhTeYE2EKtqGIzYyk= From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Chasel Chiu , Sai Chaganty Subject: [edk2-platforms][PATCH v2 1/3] CoffeelakeSiliconPkg: Fix invalid debug macros Date: Wed, 12 Oct 2022 10:16:08 -0400 Message-Id: <20221012141610.668-2-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 CoffeelakeSiliconPkg to correctly match print specifiers to actual arguments. Cc: Chasel Chiu Cc: Sai Chaganty Signed-off-by: Michael Kubacki --- Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintP= olicy.c | 2 +- Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/GbeMdi= Lib.c | 2 +- Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c= | 4 ++-- Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciEx= pressHelpersLib/PchPciExpressHelpersLibrary.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyL= ib/CpuPrintPolicy.c b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiC= puPolicyLib/CpuPrintPolicy.c index 38cf383e8da2..2e50068ba193 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuP= rintPolicy.c +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuP= rintPolicy.c @@ -161,7 +161,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/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeM= diLib/GbeMdiLib.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxe= SmmGbeMdiLib/GbeMdiLib.c index e5aa10de3b7b..70e8f7bb6f50 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/G= beMdiLib.c +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiDxeSmmGbeMdiLib/G= beMdiLib.c @@ -335,7 +335,7 @@ GbeMdiGetLanPhyRevision ( Status =3D 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. Status: %r\n", Status)); // // Taking over LANPHYPC // 1. SW signal override - 1st cycle. diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/P= eiOcWdtLib.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib= /PeiOcWdtLib.c index 22f6fb215fcc..e2014f97e58c 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdt= Lib.c +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdt= Lib.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_CT= L_NO_ICCSURV_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_ACPI_IO_OC_WDT_CTL_FAILURE_STS; Readback |=3D (B_ACPI_IO_OC_WDT_CTL_ICCSURV_STS | B_ACPI_IO_OC_WDT_C= TL_NO_ICCSURV_STS); Readback &=3D ~(B_ACPI_IO_OC_WDT_CTL_UNXP_RESET_STS); @@ -98,7 +98,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_ACPI_IO_OC_WDT_CTL_FAILURE_STS); Readback |=3D (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/PeiDx= eSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c b/Silicon/Intel= /CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLi= b/PchPciExpressHelpersLibrary.c index dcb43285b73e..120d0d1ec29b 100644 --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPch= PciExpressHelpersLib/PchPciExpressHelpersLibrary.c +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPch= PciExpressHelpersLib/PchPciExpressHelpersLibrary.c @@ -1800,7 +1800,7 @@ RecursiveIoApicCheck ( IoApicPresent =3D FALSE; =20 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:%x\n", Sbdf.Seg, Sbdf.Bus= , Sbdf.Dev, Sbdf.Func)); return TRUE; } if (HasChildBus (Sbdf, &ChildSbdf)) { --=20 2.28.0.windows.1