[PATCH 34/35] UefiPayloadPkg/BlSupportPei: fix MMCONFIG assignment from XSDT


Laszlo Ersek
 

(This patch is unrelated to the rest of this series; its purpose is to
enable building the UefiPayloadPkg DSC files with GCC.)

When building "UefiPayloadPkg/UefiPayloadPkgIa32.dsc" with GCC48 for the
DEBUG target, the compiler reports that "Entry32" may be used
uninitialized in ParseAcpiInfo(), in the XSDT branch.

Code inspection proves the compiler right. In the XSDT branch, the code
from the RSDT branch must have been duplicated, and "Entry32" references
were replaced with "Entry64" -- except where "MmCfgHdr" is assigned.

Fix this bug by introducing a helper variable called "Signature", so that
we have to refer to "Entry32" or "Entry64" only once per loop body.

Cc: Benjamin You <benjamin.you@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---

Notes:
build-tested only

UefiPayloadPkg/BlSupportPei/BlSupportPei.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/UefiPayloadPkg/BlSupportPei/BlSupportPei.c b/UefiPayloadPkg/=
BlSupportPei/BlSupportPei.c
index 90433b609f22..22972453117a 100644
--- a/UefiPayloadPkg/BlSupportPei/BlSupportPei.c
+++ b/UefiPayloadPkg/BlSupportPei/BlSupportPei.c
@@ -164,6 +164,7 @@ ParseAcpiInfo (
UINT64 *Entry64;
UINTN Entry64Num;
UINTN Idx;
+ UINT32 *Signature;
EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_HEADER *MmCfgH=
dr;
EFI_ACPI_MEMORY_MAPPED_ENHANCED_CONFIGURATION_SPACE_BASE_ADDRESS_ALLOC=
ATION_STRUCTURE *MmCfgBase;
=20
@@ -181,13 +182,14 @@ ParseAcpiInfo (
Entry32 =3D (UINT32 *)(Rsdt + 1);
Entry32Num =3D (Rsdt->Length - sizeof(EFI_ACPI_DESCRIPTION_HEADER)) =
2;
for (Idx =3D 0; Idx < Entry32Num; Idx++) {
- if (*(UINT32 *)(UINTN)(Entry32[Idx]) =3D=3D EFI_ACPI_3_0_FIXED_ACP=
I_DESCRIPTION_TABLE_SIGNATURE) {
- Fadt =3D (EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *)(UINTN)(En=
try32[Idx]);
+ Signature =3D (UINT32 *)(UINTN)Entry32[Idx];
+ if (*Signature =3D=3D EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE_SI=
GNATURE) {
+ Fadt =3D (EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *)Signature;
DEBUG ((DEBUG_INFO, "Found Fadt in Rsdt\n"));
}
=20
- if (*(UINT32 *)(UINTN)(Entry32[Idx]) =3D=3D EFI_ACPI_5_0_PCI_EXPRE=
SS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNA=
TURE) {
- MmCfgHdr =3D (EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_=
TABLE_HEADER *)(UINTN)(Entry32[Idx]);
+ if (*Signature =3D=3D EFI_ACPI_5_0_PCI_EXPRESS_MEMORY_MAPPED_CONFI=
GURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE) {
+ MmCfgHdr =3D (EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_=
TABLE_HEADER *)Signature;
DEBUG ((DEBUG_INFO, "Found MM config address in Rsdt\n"));
}
=20
@@ -205,13 +207,14 @@ ParseAcpiInfo (
Entry64 =3D (UINT64 *)(Xsdt + 1);
Entry64Num =3D (Xsdt->Length - sizeof(EFI_ACPI_DESCRIPTION_HEADER)) =
3;
for (Idx =3D 0; Idx < Entry64Num; Idx++) {
- if (*(UINT32 *)(UINTN)(Entry64[Idx]) =3D=3D EFI_ACPI_3_0_FIXED_ACP=
I_DESCRIPTION_TABLE_SIGNATURE) {
- Fadt =3D (EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *)(UINTN)(En=
try64[Idx]);
+ Signature =3D (UINT32 *)(UINTN)Entry64[Idx];
+ if (*Signature =3D=3D EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE_SI=
GNATURE) {
+ Fadt =3D (EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *)Signature;
DEBUG ((DEBUG_INFO, "Found Fadt in Xsdt\n"));
}
=20
- if (*(UINT32 *)(UINTN)(Entry64[Idx]) =3D=3D EFI_ACPI_5_0_PCI_EXPRE=
SS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNA=
TURE) {
- MmCfgHdr =3D (EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_=
TABLE_HEADER *)(UINTN)(Entry32[Idx]);
+ if (*Signature =3D=3D EFI_ACPI_5_0_PCI_EXPRESS_MEMORY_MAPPED_CONFI=
GURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE) {
+ MmCfgHdr =3D (EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_=
TABLE_HEADER *)Signature;
DEBUG ((DEBUG_INFO, "Found MM config address in Xsdt\n"));
}
=20
--=20
2.19.1.3.g30247aa5d201

Join devel@edk2.groups.io to automatically receive all group messages.