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.19484.1664940963866110038 for ; Tue, 04 Oct 2022 20:36:03 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=EGANkEyc; 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 1A63720E6F55; Tue, 4 Oct 2022 20:36:03 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 1A63720E6F55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1664940963; bh=xGm/cQKMnfVd3FkcILiieMBCUcX4QsuK0A6l+N6zx0E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EGANkEycHb7MSHwjnsm/wIiq7akTPZdnEI3ZysC+Vaw/oAguuCsdpACS58c026JC1 TPEvgc3C5WZnkI/iZpeDuCFWueJoyCyKjifgrIIHdpLbbJDayiDhujXUbA6hNaxfZL X1PmiSGP8XEhD5wFdcQs2sKrxiptRLU01Dpkgx+4= From: "Michael Kubacki" To: devel@edk2.groups.io Cc: Isaac Oram , Nate DeSimone , Chasel Chiu Subject: [edk2-platforms][PATCH v1 3/3] WhitleyOpenBoardPkg: Fix invalid debug macros Date: Tue, 4 Oct 2022 23:35:31 -0400 Message-Id: <20221005033531.3994-4-mikuback@linux.microsoft.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20221005033531.3994-1-mikuback@linux.microsoft.com> References: <20221005033531.3994-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=3D4094 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 Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Michael Kubacki --- Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlat= formLibApic.c | 2 +- Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlat= formLibSsdt.c | 2 +- Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessLib/Fs= pWrapperHobProcessLib.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTable= Lib/AcpiPlatformLibApic.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/Ac= piPlatformTableLib/AcpiPlatformLibApic.c index b8677340cae7..fc42bf380ae3 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/Acp= iPlatformLibApic.c +++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/Acp= iPlatformLibApic.c @@ -137,7 +137,7 @@ UpdateApicIdMap ( } =20 if (ThreadIndex !=3D mThreadCount[SocketId]) { - DEBUG((DEBUG_ERROR, ":: Skt: %d - Enabled ThreadCount is incorrect= !!!\n")); + DEBUG ((DEBUG_ERROR, ":: Skt: %d - Enabled ThreadCount is incorrec= t!!!\n", ThreadIndex)); break; } } diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTable= Lib/AcpiPlatformLibSsdt.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/Ac= piPlatformTableLib/AcpiPlatformLibSsdt.c index 111d32b44c42..29bf32564e49 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/Acp= iPlatformLibSsdt.c +++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/Acp= iPlatformLibSsdt.c @@ -254,7 +254,7 @@ SkipExternalSbOpcodes( } } =20 - DEBUG ((DEBUG_ERROR, "ExternSbExpected: %d, ExternSbFound: %d\n")); + DEBUG ((DEBUG_ERROR, "ExternSbExpected: %d, ExternSbFound: %d\n", Exte= rnSbExpected, ExternSbFound)); =20 ASSERT ((ExternSbFound % ExternSbExpected) =3D=3D 0); =20 diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobP= rocessLib/FspWrapperHobProcessLib.c b/Platform/Intel/WhitleyOpenBoardPkg/= Library/PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c index 19dc82d7a73f..e8a1c556cd2d 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessL= ib/FspWrapperHobProcessLib.c +++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiFspWrapperHobProcessL= ib/FspWrapperHobProcessLib.c @@ -185,7 +185,7 @@ CopyHobData ( OrgData =3D GET_GUID_HOB_DATA (OrgGuidHob); OrgDataSize =3D GET_GUID_HOB_DATA_SIZE (OrgGuidHob); if (OrgDataSize !=3D DataSize) { - DEBUG ((EFI_D_ERROR, "%a Hob Size Don't Match Between FSP and BootLo= ader. FSP:%x vs BootLoader:%x\n", OrgDataSize, DataSize)); + DEBUG ((DEBUG_ERROR, "Hob Size Don't Match Between FSP and BootLoade= r. FSP:%x vs BootLoader:%x\n", OrgDataSize, DataSize)); ASSERT (FALSE); } CopyMem (OrgData, Data, DataSize); --=20 2.28.0.windows.1