From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web10.51282.1683777495014858920 for ; Wed, 10 May 2023 20:58:15 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=inZiKLM5; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: aryeh.chen@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683777494; x=1715313494; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=5Ptc/vqpNdRgF21zRpXgLovXo8rAOHArDnzeK1rXjXw=; b=inZiKLM5ssa4rg514n0HKuroncZFNDGtd+4BeaEx3lbzeXv8csWBbkoY 6yR/g/Au2Qt3WJzAkRS7P5t6iAD945ZZDFSPmqdg3hzMUWI3TUPGBUqSR 6Q8VpqvA7omzb91SdO1pn2H9RkphE+uHZiEUnrauBKK28uzbHmPaOHtFC M0F1nhZu0DNggFpGAagQ69naMEnGIA76AuL7Qp1F1LGPVn1s9xZGo/wYo byZojGNoNlr+T9BrLcyh8RbBZdRFWnRrOOsfxAu730jK/RP9TAKZURG5I jiQZAf5klVYqe6fTUKM4nYtWIYVuGiG/fZ9CVKdsBDGEjYYB3IocwdjUi Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="436712437" X-IronPort-AV: E=Sophos;i="5.99,266,1677571200"; d="scan'208";a="436712437" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2023 20:58:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="732405588" X-IronPort-AV: E=Sophos;i="5.99,266,1677571200"; d="scan'208";a="732405588" Received: from aryehche-desk1.gar.corp.intel.com ([10.5.215.13]) by orsmga001.jf.intel.com with ESMTP; 10 May 2023 20:58:11 -0700 From: "Chen, Aryeh" To: devel@edk2.groups.io Cc: Aryeh Chen , Chasel Chiu , Nate DeSimone , Isaac Oram , Liming Gao , Eric Dong , Jiewen Yao , Ankit Sinha Subject: [PATCH v3] MinPlatformPkg: Update ACPI 6.5 definition Date: Thu, 11 May 2023 11:58:07 +0800 Message-Id: <20230511035807.801-1-aryeh.chen@intel.com> X-Mailer: git-send-email 2.34.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Aryeh Chen https://bugzilla.tianocore.org/show_bug.cgi?id=3D4442 Update ACPI 6.5 definition on MinPlatformPkg Cc: Chasel Chiu Cc: Nate DeSimone Cc: Isaac Oram Cc: Liming Gao Cc: Eric Dong Cc: Jiewen Yao Cc: Ankit Sinha Signed-off-by: Aryeh Chen --- Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c = | 154 ++++++++++---------- Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c = | 8 +- Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c = | 46 +++--- Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c = | 4 +- Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib= .c | 2 +- Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec = | 2 +- Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.= c | 154 ++++++++++---------- Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiM= adt.c | 150 +++++++++---------- Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaPr= otection.c | 4 +- Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTr= ustedBoot.c | 2 +- Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointC= heckLib.c | 2 +- 11 files changed, 264 insertions(+), 264 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c b= /Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c index e967031a3b..2f2c96f907 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c @@ -27,9 +27,9 @@ typedef struct { // Define Union of IO APIC & Local APIC structure;=0D //=0D typedef union {=0D - EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE AcpiLocalApic;=0D - EFI_ACPI_6_3_IO_APIC_STRUCTURE AcpiIoApic;=0D - EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE AcpiLocalx2Apic;=0D + EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE AcpiLocalApic;=0D + EFI_ACPI_6_5_IO_APIC_STRUCTURE AcpiIoApic;=0D + EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE AcpiLocalx2Apic;=0D struct {=0D UINT8 Type;=0D UINT8 Length;=0D @@ -38,8 +38,8 @@ typedef union { =0D #pragma pack()=0D =0D -extern EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs;=0D -extern EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt;=0D +extern EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs;=0D +extern EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE Fadt;=0D extern EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER Hpet;=0D extern EFI_ACPI_WSMT_TABLE Wsmt;=0D =0D @@ -92,16 +92,16 @@ AppendCpuMapTableEntry ( )=0D {=0D EFI_STATUS Status;=0D - EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE *LocalApicPtr;=0D - EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE *LocalX2ApicPtr;=0D + EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *LocalApicPtr;=0D + EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *LocalX2ApicPtr;=0D UINT8 Type;=0D =0D Status =3D EFI_SUCCESS;=0D Type =3D ((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiApicCommon.Type;=0D - LocalApicPtr =3D (EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE *)(&((ACPI= _APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalApic);=0D - LocalX2ApicPtr =3D (EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE *)(&((= ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalx2Apic);=0D + LocalApicPtr =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *)(&((ACPI= _APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalApic);=0D + LocalX2ApicPtr =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *)(&((= ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalx2Apic);=0D =0D - if(Type =3D=3D EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC) {=0D + if(Type =3D=3D EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC) {=0D if(!mX2ApicEnabled) {=0D LocalApicPtr->Flags =3D (UINT8)CpuApicIdOrderTable[LocalA= picCounter].Flags;=0D LocalApicPtr->ApicId =3D (UINT8)CpuApicIdOrderTable[LocalA= picCounter].ApicId;=0D @@ -112,7 +112,7 @@ AppendCpuMapTableEntry ( LocalApicPtr->AcpiProcessorUid =3D (UINT8)0xFF;=0D Status =3D EFI_UNSUPPORTED;=0D }=0D - } else if(Type =3D=3D EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC) {=0D + } else if(Type =3D=3D EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC) {=0D if(mX2ApicEnabled) {=0D LocalX2ApicPtr->Flags =3D (UINT8)CpuApicIdOrderTable[Loca= lApicCounter].Flags;=0D LocalX2ApicPtr->X2ApicId =3D CpuApicIdOrderTable[LocalApicCo= unter].ApicId;=0D @@ -215,17 +215,17 @@ typedef struct { } STRUCTURE_HEADER;=0D =0D STRUCTURE_HEADER mMadtStructureTable[] =3D {=0D - {EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC, sizeof (EFI_ACPI_6_3_PROCES= SOR_LOCAL_APIC_STRUCTURE)},=0D - {EFI_ACPI_6_3_IO_APIC, sizeof (EFI_ACPI_6_3_IO_API= C_STRUCTURE)},=0D - {EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE, sizeof (EFI_ACPI_6_3_INTERR= UPT_SOURCE_OVERRIDE_STRUCTURE)},=0D - {EFI_ACPI_6_3_NON_MASKABLE_INTERRUPT_SOURCE, sizeof (EFI_ACPI_6_3_NON_MA= SKABLE_INTERRUPT_SOURCE_STRUCTURE)},=0D - {EFI_ACPI_6_3_LOCAL_APIC_NMI, sizeof (EFI_ACPI_6_3_LOCAL_= APIC_NMI_STRUCTURE)},=0D - {EFI_ACPI_6_3_LOCAL_APIC_ADDRESS_OVERRIDE, sizeof (EFI_ACPI_6_3_LOCAL_= APIC_ADDRESS_OVERRIDE_STRUCTURE)},=0D - {EFI_ACPI_6_3_IO_SAPIC, sizeof (EFI_ACPI_6_3_IO_SAP= IC_STRUCTURE)},=0D - {EFI_ACPI_6_3_LOCAL_SAPIC, sizeof (EFI_ACPI_6_3_PROCES= SOR_LOCAL_SAPIC_STRUCTURE)},=0D - {EFI_ACPI_6_3_PLATFORM_INTERRUPT_SOURCES, sizeof (EFI_ACPI_6_3_PLATFO= RM_INTERRUPT_SOURCES_STRUCTURE)},=0D - {EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC, sizeof (EFI_ACPI_6_3_PROCES= SOR_LOCAL_X2APIC_STRUCTURE)},=0D - {EFI_ACPI_6_3_LOCAL_X2APIC_NMI, sizeof (EFI_ACPI_6_3_LOCAL_= X2APIC_NMI_STRUCTURE)}=0D + {EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC, sizeof (EFI_ACPI_6_5_PROCES= SOR_LOCAL_APIC_STRUCTURE)},=0D + {EFI_ACPI_6_5_IO_APIC, sizeof (EFI_ACPI_6_5_IO_API= C_STRUCTURE)},=0D + {EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE, sizeof (EFI_ACPI_6_5_INTERR= UPT_SOURCE_OVERRIDE_STRUCTURE)},=0D + {EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE, sizeof (EFI_ACPI_6_5_NON_MA= SKABLE_INTERRUPT_SOURCE_STRUCTURE)},=0D + {EFI_ACPI_6_5_LOCAL_APIC_NMI, sizeof (EFI_ACPI_6_5_LOCAL_= APIC_NMI_STRUCTURE)},=0D + {EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE, sizeof (EFI_ACPI_6_5_LOCAL_= APIC_ADDRESS_OVERRIDE_STRUCTURE)},=0D + {EFI_ACPI_6_5_IO_SAPIC, sizeof (EFI_ACPI_6_5_IO_SAP= IC_STRUCTURE)},=0D + {EFI_ACPI_6_5_LOCAL_SAPIC, sizeof (EFI_ACPI_6_5_PROCES= SOR_LOCAL_SAPIC_STRUCTURE)},=0D + {EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES, sizeof (EFI_ACPI_6_5_PLATFO= RM_INTERRUPT_SOURCES_STRUCTURE)},=0D + {EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC, sizeof (EFI_ACPI_6_5_PROCES= SOR_LOCAL_X2APIC_STRUCTURE)},=0D + {EFI_ACPI_6_5_LOCAL_X2APIC_NMI, sizeof (EFI_ACPI_6_5_LOCAL_= X2APIC_NMI_STRUCTURE)}=0D };=0D =0D /**=0D @@ -384,7 +384,7 @@ InitializeHeader ( **/=0D EFI_STATUS=0D InitializeMadtHeader (=0D - IN OUT EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *MadtHeader=0D + IN OUT EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *MadtHeader=0D )=0D {=0D EFI_STATUS Status;=0D @@ -396,8 +396,8 @@ InitializeMadtHeader ( =0D Status =3D InitializeHeader (=0D &MadtHeader->Header,=0D - EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE,=0D - EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION,=0D + EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE,=0D + EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION,=0D 0=0D );=0D if (EFI_ERROR (Status)) {=0D @@ -405,7 +405,7 @@ InitializeMadtHeader ( }=0D =0D MadtHeader->LocalApicAddress =3D PcdGet32(PcdLocalApicAddress);=0D - MadtHeader->Flags =3D EFI_ACPI_6_3_PCAT_COMPAT;=0D + MadtHeader->Flags =3D EFI_ACPI_6_5_PCAT_COMPAT;=0D =0D return EFI_SUCCESS;=0D }=0D @@ -442,7 +442,7 @@ CopyStructure ( //=0D // Initialize the number of table entries and the table based on the tab= le header passed in.=0D //=0D - if (Header->Signature =3D=3D EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABL= E_SIGNATURE) {=0D + if (Header->Signature =3D=3D EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABL= E_SIGNATURE) {=0D TableNumEntries =3D sizeof (mMadtStructureTable) / sizeof (STRUCTURE_H= EADER);=0D StructureTable =3D mMadtStructureTable;=0D } else {=0D @@ -552,7 +552,7 @@ BuildAcpiTable ( return EFI_INVALID_PARAMETER;=0D }=0D =0D - if (AcpiHeader->Signature !=3D EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TA= BLE_SIGNATURE) {=0D + if (AcpiHeader->Signature !=3D EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TA= BLE_SIGNATURE) {=0D DEBUG ((=0D DEBUG_ERROR,=0D "MADT header signature is expected, actually 0x%08x\n",=0D @@ -643,15 +643,15 @@ InstallMadtFromScratch ( {=0D EFI_STATUS Status;=0D UINTN Index;=0D - EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *NewMadtTable;=0D + EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *NewMadtTable;=0D UINTN TableHandle;=0D - EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER MadtTableHeader;=0D - EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE ProcLocalApicStruct;= =0D - EFI_ACPI_6_3_IO_APIC_STRUCTURE IoApicStruct;=0D - EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE IntSrcOverrideStruct= ;=0D - EFI_ACPI_6_3_LOCAL_APIC_NMI_STRUCTURE LocalApciNmiStruct;= =0D - EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE ProcLocalX2ApicStruc= t;=0D - EFI_ACPI_6_3_LOCAL_X2APIC_NMI_STRUCTURE LocalX2ApicNmiStruct= ;=0D + EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER MadtTableHeader;=0D + EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE ProcLocalApicStruct;= =0D + EFI_ACPI_6_5_IO_APIC_STRUCTURE IoApicStruct;=0D + EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE IntSrcOverrideStruct= ;=0D + EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE LocalApciNmiStruct;= =0D + EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE ProcLocalX2ApicStruc= t;=0D + EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE LocalX2ApicNmiStruct= ;=0D EFI_CPU_ID_ORDER_MAP *CpuApicIdOrderTable= ;=0D STRUCTURE_HEADER **MadtStructs;=0D UINTN MaxMadtStructCount;= =0D @@ -714,11 +714,11 @@ InstallMadtFromScratch ( //=0D // Build Processor Local APIC Structures and Processor Local X2APIC Stru= ctures=0D //=0D - ProcLocalApicStruct.Type =3D EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC;=0D - ProcLocalApicStruct.Length =3D sizeof (EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC= _STRUCTURE);=0D + ProcLocalApicStruct.Type =3D EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC;=0D + ProcLocalApicStruct.Length =3D sizeof (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC= _STRUCTURE);=0D =0D - ProcLocalX2ApicStruct.Type =3D EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC;=0D - ProcLocalX2ApicStruct.Length =3D sizeof (EFI_ACPI_6_3_PROCESSOR_LOCAL_X2= APIC_STRUCTURE);=0D + ProcLocalX2ApicStruct.Type =3D EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC;=0D + ProcLocalX2ApicStruct.Length =3D sizeof (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2= APIC_STRUCTURE);=0D ProcLocalX2ApicStruct.Reserved[0] =3D 0;=0D ProcLocalX2ApicStruct.Reserved[1] =3D 0;=0D =0D @@ -760,8 +760,8 @@ InstallMadtFromScratch ( //=0D // Build I/O APIC Structures=0D //=0D - IoApicStruct.Type =3D EFI_ACPI_6_3_IO_APIC;=0D - IoApicStruct.Length =3D sizeof (EFI_ACPI_6_3_IO_APIC_STRUCTURE);=0D + IoApicStruct.Type =3D EFI_ACPI_6_5_IO_APIC;=0D + IoApicStruct.Length =3D sizeof (EFI_ACPI_6_5_IO_APIC_STRUCTURE);=0D IoApicStruct.Reserved =3D 0;=0D =0D PcIoApicEnable =3D PcdGet32 (PcdPcIoApicEnable);=0D @@ -807,8 +807,8 @@ InstallMadtFromScratch ( //=0D // Build Interrupt Source Override Structures=0D //=0D - IntSrcOverrideStruct.Type =3D EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE;=0D - IntSrcOverrideStruct.Length =3D sizeof (EFI_ACPI_6_3_INTERRUPT_SOURCE_OV= ERRIDE_STRUCTURE);=0D + IntSrcOverrideStruct.Type =3D EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE;=0D + IntSrcOverrideStruct.Length =3D sizeof (EFI_ACPI_6_5_INTERRUPT_SOURCE_OV= ERRIDE_STRUCTURE);=0D =0D //=0D // IRQ0=3D>IRQ2 Interrupt Source Override Structure=0D @@ -852,8 +852,8 @@ InstallMadtFromScratch ( // Build Local APIC NMI Structures=0D //=0D if (!mX2ApicEnabled) {=0D - LocalApciNmiStruct.Type =3D EFI_ACPI_6_3_LOCAL_APIC_NMI;=0D - LocalApciNmiStruct.Length =3D sizeof (EFI_ACPI_6_3_LOCAL_APIC_NMI_STRU= CTURE);=0D + LocalApciNmiStruct.Type =3D EFI_ACPI_6_5_LOCAL_APIC_NMI;=0D + LocalApciNmiStruct.Length =3D sizeof (EFI_ACPI_6_5_LOCAL_APIC_NMI_STRU= CTURE);=0D LocalApciNmiStruct.AcpiProcessorUid =3D 0xFF; // Applies to all p= rocessors=0D LocalApciNmiStruct.Flags =3D 0x0005; // Flags - Edge-tig= gered, Active High=0D LocalApciNmiStruct.LocalApicLint =3D 0x1;=0D @@ -874,8 +874,8 @@ InstallMadtFromScratch ( // Build Local x2APIC NMI Structure=0D //=0D if (mX2ApicEnabled) {=0D - LocalX2ApicNmiStruct.Type =3D EFI_ACPI_6_3_LOCAL_X2APIC_NMI;=0D - LocalX2ApicNmiStruct.Length =3D sizeof (EFI_ACPI_6_3_LOCAL_X2APIC_NMI_= STRUCTURE);=0D + LocalX2ApicNmiStruct.Type =3D EFI_ACPI_6_5_LOCAL_X2APIC_NMI;=0D + LocalX2ApicNmiStruct.Length =3D sizeof (EFI_ACPI_6_5_LOCAL_X2APIC_NMI_= STRUCTURE);=0D LocalX2ApicNmiStruct.Flags =3D 0x000D; // Flags - Leve= l-tiggered, Active High=0D LocalX2ApicNmiStruct.AcpiProcessorUid =3D 0xFFFFFFFF; // Applies to a= ll processors=0D LocalX2ApicNmiStruct.LocalX2ApicLint =3D 0x01;=0D @@ -900,7 +900,7 @@ InstallMadtFromScratch ( //=0D Status =3D BuildAcpiTable (=0D (EFI_ACPI_DESCRIPTION_HEADER *) &MadtTableHeader,=0D - sizeof (EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER),= =0D + sizeof (EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER),= =0D MadtStructs,=0D MadtStructsIndex,=0D (UINT8 **)&NewMadtTable=0D @@ -970,7 +970,7 @@ InstallMcfgFromScratch ( =0D Status =3D InitializeHeader (=0D &McfgTable->Header,=0D - EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BA= SE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE,=0D + EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BA= SE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE,=0D EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_REVIS= ION,=0D FixedPcdGet32 (PcdAcpiDefaultOemRevision)=0D );=0D @@ -1024,10 +1024,10 @@ PlatformUpdateTables ( IN OUT EFI_ACPI_TABLE_VERSION *Version=0D )=0D {=0D - EFI_ACPI_DESCRIPTION_HEADER *TableHeader;=0D - UINT8 *TempOemId;=0D - UINT64 TempOemTableId;=0D - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE *FadtHeader;=0D + EFI_ACPI_DESCRIPTION_HEADER *TableHeader;=0D + UINT8 *TempOemId;=0D + UINT64 TempOemTableId;=0D + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *FadtHeader;=0D EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *HpetTable;=0D UINT32 HpetBaseAddress;=0D EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_BLOCK_ID HpetBlockId;=0D @@ -1045,7 +1045,7 @@ PlatformUpdateTables ( //=0D // Update the OEM and creator information for every table except FACS.=0D //=0D - if (Table->Signature !=3D EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_S= IGNATURE) {=0D + if (Table->Signature !=3D EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE_S= IGNATURE) {=0D TempOemId =3D (UINT8 *)PcdGetPtr(PcdAcpiDefaultOemId);=0D CopyMem (&TableHeader->OemId, TempOemId, 6);=0D =0D @@ -1053,9 +1053,9 @@ PlatformUpdateTables ( // Skip OEM table ID and creator information for DSDT, SSDT and PSDT t= ables, since these are=0D // created by an ASL compiler and the creator information is useful.=0D //=0D - if (Table->Signature !=3D EFI_ACPI_1_0_DIFFERENTIATED_SYSTEM_DESCRIPTI= ON_TABLE_SIGNATURE &&=0D - Table->Signature !=3D EFI_ACPI_1_0_SECONDARY_SYSTEM_DESCRIPTION_TA= BLE_SIGNATURE &&=0D - Table->Signature !=3D EFI_ACPI_1_0_PERSISTENT_SYSTEM_DESCRIPTION_T= ABLE_SIGNATURE=0D + if (Table->Signature !=3D EFI_ACPI_6_5_DIFFERENTIATED_SYSTEM_DESCRIPTI= ON_TABLE_SIGNATURE &&=0D + Table->Signature !=3D EFI_ACPI_6_5_SECONDARY_SYSTEM_DESCRIPTION_TA= BLE_SIGNATURE &&=0D + Table->Signature !=3D EFI_ACPI_6_5_PERSISTENT_SYSTEM_DESCRIPTION_T= ABLE_SIGNATURE=0D ) {=0D TempOemTableId =3D PcdGet64(PcdAcpiDefaultOemTableId);=0D CopyMem (&TableHeader->OemTableId, &TempOemTableId, 8);=0D @@ -1089,12 +1089,12 @@ PlatformUpdateTables ( //=0D switch (Table->Signature) {=0D =0D - case EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE:=0D + case EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE:=0D ASSERT(FALSE);=0D break;=0D =0D - case EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE:=0D - FadtHeader =3D (EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE *) Table;=0D + case EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE:=0D + FadtHeader =3D (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *) Table;=0D =0D FadtHeader->Header.Revision =3D PcdGet8 (PcdFadtMajo= rVersion);=0D FadtHeader->PreferredPmProfile =3D PcdGet8 (PcdFadtPref= erredPmProfile);=0D @@ -1159,7 +1159,7 @@ PlatformUpdateTables ( DEBUG ((DEBUG_INFO, " Flags 0x%x\n", FadtHeader->Flags));=0D break;=0D =0D - case EFI_ACPI_6_3_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE:=0D + case EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE:=0D HpetTable =3D (EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *)Tabl= e;=0D HpetBaseAddress =3D PcdGet32 (PcdHpetBaseAddress);=0D HpetTable->BaseAddressLower32Bit.Address =3D HpetBaseAddress;=0D @@ -1180,7 +1180,7 @@ PlatformUpdateTables ( DEBUG ((DEBUG_INFO, " HPET base 0x%x\n", PcdGet32 (PcdHpetBaseAddress= )));=0D break;=0D =0D - case EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADD= RESS_DESCRIPTION_TABLE_SIGNATURE:=0D + case EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADD= RESS_DESCRIPTION_TABLE_SIGNATURE:=0D ASSERT (FALSE);=0D break;=0D =0D @@ -1201,18 +1201,18 @@ IsHardwareChange ( VOID=0D )=0D {=0D - EFI_STATUS Status;=0D - UINTN Index;=0D - UINTN HandleCount;=0D - EFI_HANDLE *HandleBuffer;=0D - EFI_PCI_IO_PROTOCOL *PciIo;=0D - UINT32 CRC;=0D - UINT32 *HWChange;=0D - UINTN HWChangeSize;=0D - UINT32 PciId;=0D - UINTN Handle;=0D - EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE *FacsPtr;=0D - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE *pFADT;=0D + EFI_STATUS Status;=0D + UINTN Index;=0D + UINTN HandleCount;=0D + EFI_HANDLE *HandleBuffer;=0D + EFI_PCI_IO_PROTOCOL *PciIo;=0D + UINT32 CRC;=0D + UINT32 *HWChange;=0D + UINTN HWChangeSize;=0D + UINT32 PciId;=0D + UINTN Handle;=0D + EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *FacsPtr;=0D + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *pFADT;=0D =0D HandleCount =3D 0;=0D HandleBuffer =3D NULL;=0D @@ -1258,7 +1258,7 @@ IsHardwareChange ( //=0D Handle =3D 0;=0D Status =3D LocateAcpiTableBySignature (=0D - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,=0D + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,=0D (EFI_ACPI_DESCRIPTION_HEADER **) &pFADT,=0D &Handle=0D );=0D @@ -1280,7 +1280,7 @@ IsHardwareChange ( //=0D // Set HardwareSignature value based on CRC value.=0D //=0D - FacsPtr =3D (EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)pFADT= ->FirmwareCtrl;=0D + FacsPtr =3D (EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN) pFAD= T->FirmwareCtrl;=0D FacsPtr->HardwareSignature =3D CRC;=0D FreePool (HWChange);=0D }=0D diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c b/Pl= atform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c index 8700c44e63..5addba69bc 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c @@ -36,9 +36,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // Please modify all values in Facs.h only.=0D //=0D =0D -EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs =3D {=0D - EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE,=0D - sizeof (EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE),=0D +EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs =3D {=0D + EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE,=0D + sizeof (EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE),=0D =0D //=0D // Hardware Signature will be updated at runtime=0D @@ -49,7 +49,7 @@ EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs =3D { EFI_ACPI_GLOBAL_LOCK,=0D EFI_ACPI_FIRMWARE_CONTROL_STRUCTURE_FLAGS,=0D EFI_ACPI_X_FIRMWARE_WAKING_VECTOR,=0D - EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION,=0D + EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION,=0D {=0D EFI_ACPI_RESERVED_BYTE,=0D EFI_ACPI_RESERVED_BYTE,=0D diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c b/Pl= atform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c index 70b769b846..6c9cec580b 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c @@ -60,7 +60,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent //=0D // PM1A Event Register Block Generic Address Information=0D //=0D -#define EFI_ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO=0D +#define EFI_ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO=0D #define EFI_ACPI_PM1A_EVT_BLK_BIT_WIDTH 0x20=0D #define EFI_ACPI_PM1A_EVT_BLK_BIT_OFFSET 0x00=0D #define EFI_ACPI_PM1A_EVT_BLK_ADDRESS 0 // To be fixed=0D @@ -68,7 +68,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent //=0D // PM1B Event Register Block Generic Address Information=0D //=0D -#define EFI_ACPI_PM1B_EVT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO=0D +#define EFI_ACPI_PM1B_EVT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO=0D #define EFI_ACPI_PM1B_EVT_BLK_BIT_WIDTH 0x00=0D #define EFI_ACPI_PM1B_EVT_BLK_BIT_OFFSET 0x00=0D #define EFI_ACPI_PM1B_EVT_BLK_ADDRESS 0 // To be fixed=0D @@ -76,7 +76,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent //=0D // PM1A Control Register Block Generic Address Information=0D //=0D -#define EFI_ACPI_PM1A_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO=0D +#define EFI_ACPI_PM1A_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO=0D #define EFI_ACPI_PM1A_CNT_BLK_BIT_WIDTH 0x10=0D #define EFI_ACPI_PM1A_CNT_BLK_BIT_OFFSET 0x00=0D #define EFI_ACPI_PM1A_CNT_BLK_ADDRESS 0 // To be fixed=0D @@ -84,7 +84,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent //=0D // PM1B Control Register Block Generic Address Information=0D //=0D -#define EFI_ACPI_PM1B_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO=0D +#define EFI_ACPI_PM1B_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO=0D #define EFI_ACPI_PM1B_CNT_BLK_BIT_WIDTH 0x00=0D #define EFI_ACPI_PM1B_CNT_BLK_BIT_OFFSET 0x00=0D #define EFI_ACPI_PM1B_CNT_BLK_ADDRESS 0 // To be fixed=0D @@ -92,7 +92,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent //=0D // PM2 Control Register Block Generic Address Information=0D //=0D -#define EFI_ACPI_PM2_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO=0D +#define EFI_ACPI_PM2_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO=0D #define EFI_ACPI_PM2_CNT_BLK_BIT_WIDTH 0x08=0D #define EFI_ACPI_PM2_CNT_BLK_BIT_OFFSET 0x00=0D #define EFI_ACPI_PM2_CNT_BLK_ADDRESS 0 // To be fixed=0D @@ -101,7 +101,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // Power Management Timer Control Register Block Generic Address=0D // Information=0D //=0D -#define EFI_ACPI_PM_TMR_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO=0D +#define EFI_ACPI_PM_TMR_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO=0D #define EFI_ACPI_PM_TMR_BLK_BIT_WIDTH 0x20=0D #define EFI_ACPI_PM_TMR_BLK_BIT_OFFSET 0x00=0D #define EFI_ACPI_PM_TMR_BLK_ADDRESS 0 // To be fixed=0D @@ -110,7 +110,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // General Purpose Event 0 Register Block Generic Address=0D // Information=0D //=0D -#define EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO=0D +#define EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO=0D #define EFI_ACPI_GPE0_BLK_BIT_WIDTH 0 // size of R_PCH_ACPI_GPE0_= STS_127_96 + R_PCH_ACPI_GPE0_EN_127_96=0D #define EFI_ACPI_GPE0_BLK_BIT_OFFSET 0x00=0D #define EFI_ACPI_GPE0_BLK_ADDRESS 0 // To be fixed=0D @@ -119,14 +119,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // General Purpose Event 1 Register Block Generic Address=0D // Information=0D //=0D -#define EFI_ACPI_GPE1_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO=0D +#define EFI_ACPI_GPE1_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO=0D #define EFI_ACPI_GPE1_BLK_BIT_WIDTH 0x0=0D #define EFI_ACPI_GPE1_BLK_BIT_OFFSET 0x0=0D #define EFI_ACPI_GPE1_BLK_ADDRESS 0 // To be fixed=0D //=0D // Reset Register Generic Address Information=0D //=0D -#define EFI_ACPI_RESET_REG_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO=0D +#define EFI_ACPI_RESET_REG_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO=0D #define EFI_ACPI_RESET_REG_BIT_WIDTH 0x08=0D #define EFI_ACPI_RESET_REG_BIT_OFFSET 0x00=0D #define EFI_ACPI_RESET_REG_ADDRESS 0x00000CF9=0D @@ -167,11 +167,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // Please modify all values in Fadt.h only.=0D //=0D =0D -EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D {=0D +EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D {=0D {=0D - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,=0D - sizeof (EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE),=0D - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_REVISION,=0D + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,=0D + sizeof (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE),=0D + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_REVISION,=0D =0D //=0D // Checksum will be updated at runtime=0D @@ -245,13 +245,13 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { EFI_ACPI_RESET_REG_ADDRESS_SPACE_ID,=0D EFI_ACPI_RESET_REG_BIT_WIDTH,=0D EFI_ACPI_RESET_REG_BIT_OFFSET,=0D - EFI_ACPI_6_3_BYTE,=0D + EFI_ACPI_6_5_BYTE,=0D EFI_ACPI_RESET_REG_ADDRESS=0D },=0D EFI_ACPI_RESET_VALUE,=0D =0D EFI_ACPI_ARM_BOOT_ARCH,=0D - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_MINOR_REVISION,=0D + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_MINOR_REVISION,=0D =0D //=0D // These addresses will be updated at runtime=0D @@ -266,7 +266,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { EFI_ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID,=0D EFI_ACPI_PM1A_EVT_BLK_BIT_WIDTH,=0D EFI_ACPI_PM1A_EVT_BLK_BIT_OFFSET,=0D - EFI_ACPI_6_3_WORD,=0D + EFI_ACPI_6_5_WORD,=0D EFI_ACPI_PM1A_EVT_BLK_ADDRESS=0D },=0D {=0D @@ -276,7 +276,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { EFI_ACPI_PM1B_EVT_BLK_ADDRESS_SPACE_ID,=0D EFI_ACPI_PM1B_EVT_BLK_BIT_WIDTH,=0D EFI_ACPI_PM1B_EVT_BLK_BIT_OFFSET,=0D - EFI_ACPI_6_3_WORD,=0D + EFI_ACPI_6_5_WORD,=0D EFI_ACPI_PM1B_EVT_BLK_ADDRESS=0D },=0D {=0D @@ -286,7 +286,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { EFI_ACPI_PM1A_CNT_BLK_ADDRESS_SPACE_ID,=0D EFI_ACPI_PM1A_CNT_BLK_BIT_WIDTH,=0D EFI_ACPI_PM1A_CNT_BLK_BIT_OFFSET,=0D - EFI_ACPI_6_3_WORD,=0D + EFI_ACPI_6_5_WORD,=0D EFI_ACPI_PM1A_CNT_BLK_ADDRESS=0D },=0D {=0D @@ -296,7 +296,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { EFI_ACPI_PM1B_CNT_BLK_ADDRESS_SPACE_ID,=0D EFI_ACPI_PM1B_CNT_BLK_BIT_WIDTH,=0D EFI_ACPI_PM1B_CNT_BLK_BIT_OFFSET,=0D - EFI_ACPI_6_3_WORD,=0D + EFI_ACPI_6_5_WORD,=0D EFI_ACPI_PM1B_CNT_BLK_ADDRESS=0D },=0D {=0D @@ -306,7 +306,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { EFI_ACPI_PM2_CNT_BLK_ADDRESS_SPACE_ID,=0D EFI_ACPI_PM2_CNT_BLK_BIT_WIDTH,=0D EFI_ACPI_PM2_CNT_BLK_BIT_OFFSET,=0D - EFI_ACPI_6_3_BYTE,=0D + EFI_ACPI_6_5_BYTE,=0D EFI_ACPI_PM2_CNT_BLK_ADDRESS=0D },=0D {=0D @@ -316,7 +316,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { EFI_ACPI_PM_TMR_BLK_ADDRESS_SPACE_ID,=0D EFI_ACPI_PM_TMR_BLK_BIT_WIDTH,=0D EFI_ACPI_PM_TMR_BLK_BIT_OFFSET,=0D - EFI_ACPI_6_3_DWORD,=0D + EFI_ACPI_6_5_DWORD,=0D EFI_ACPI_PM_TMR_BLK_ADDRESS=0D },=0D {=0D @@ -326,7 +326,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID,=0D EFI_ACPI_GPE0_BLK_BIT_WIDTH,=0D EFI_ACPI_GPE0_BLK_BIT_OFFSET,=0D - EFI_ACPI_6_3_BYTE,=0D + EFI_ACPI_6_5_BYTE,=0D EFI_ACPI_GPE0_BLK_ADDRESS=0D },=0D {=0D @@ -336,7 +336,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { EFI_ACPI_GPE1_BLK_ADDRESS_SPACE_ID,=0D EFI_ACPI_GPE1_BLK_BIT_WIDTH,=0D EFI_ACPI_GPE1_BLK_BIT_OFFSET,=0D - EFI_ACPI_6_3_BYTE,=0D + EFI_ACPI_6_5_BYTE,=0D EFI_ACPI_GPE1_BLK_ADDRESS=0D },=0D {=0D diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c b/Pl= atform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c index 8721beb03f..9f56d78133 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c @@ -25,7 +25,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent //=0D // Event Timer Block Base Address Information=0D //=0D -#define EFI_ACPI_EVENT_TIMER_BLOCK_ADDRESS_SPACE_ID EFI_ACPI_3_0_SYSTEM_ME= MORY=0D +#define EFI_ACPI_EVENT_TIMER_BLOCK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_ME= MORY=0D #define EFI_ACPI_EVENT_TIMER_BLOCK_BIT_WIDTH 0x40=0D #define EFI_ACPI_EVENT_TIMER_BLOCK_BIT_OFFSET 0x00=0D #define EFI_ACPI_EVENT_TIMER_ACCESS_SIZE 0x00=0D @@ -44,7 +44,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =0D EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER Hpet =3D {=0D {=0D - EFI_ACPI_3_0_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE,=0D + EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE,=0D sizeof (EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER),=0D EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_REVISION,=0D =0D diff --git a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/Dxe= AslUpdateLib.c b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib= /DxeAslUpdateLib.c index 78efc8c0a7..12d19a7b7b 100644 --- a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpda= teLib.c +++ b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpda= teLib.c @@ -146,7 +146,7 @@ UpdateNameAslCode ( ///=0D Handle =3D 0;=0D Status =3D LocateAcpiTableBySignature (=0D - EFI_ACPI_3_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATUR= E,=0D + EFI_ACPI_6_5_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATUR= E,=0D (EFI_ACPI_DESCRIPTION_HEADER **) &Table,=0D &Handle=0D );=0D diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec b/Platform/In= tel/MinPlatformPkg/MinPlatformPkg.dec index 784abb828e..635384b851 100644 --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec @@ -347,7 +347,7 @@ gMinPlatformPkgTokenSpaceGuid.PcdFadtIaPcBootArch|0x0001|UINT16|0x900000= 26=0D gMinPlatformPkgTokenSpaceGuid.PcdFadtFlags|0x000086A5|UINT32|0x90000027= =0D gMinPlatformPkgTokenSpaceGuid.PcdFadtMajorVersion|0x06|UINT8|0x90000030= =0D - gMinPlatformPkgTokenSpaceGuid.PcdFadtMinorVersion|0x03|UINT8|0x90000031= =0D + gMinPlatformPkgTokenSpaceGuid.PcdFadtMinorVersion|0x05|UINT8|0x90000031= =0D =0D [PcdsFixedAtBuild]=0D =0D diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/D= xeCheckAcpi.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLi= b/DxeCheckAcpi.c index 3d75e5012a..f0c0aaf7d2 100644 --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck= Acpi.c +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck= Acpi.c @@ -28,7 +28,7 @@ UINTN mAcpi= GcdIoMapNumberOfDescrip =0D VOID=0D DumpAcpiMadt (=0D - IN EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt=0D + IN EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt=0D );=0D =0D VOID=0D @@ -63,7 +63,7 @@ DumpAcpiTcpa ( =0D EFI_STATUS=0D CheckAcpiMadt (=0D - IN EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt=0D + IN EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt=0D );=0D =0D EFI_STATUS=0D @@ -187,7 +187,7 @@ DumpAcpiTableHeader ( =0D VOID=0D DumpAcpiFadt (=0D - IN EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt=0D + IN EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *Fadt=0D )=0D {=0D DumpAcpiTableHeader (&Fadt->Header);=0D @@ -201,7 +201,7 @@ DumpAcpiFadt ( =0D EFI_STATUS=0D CheckAcpiFadt (=0D - IN EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt=0D + IN EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *Fadt=0D )=0D {=0D if (Fadt->SmiCmd !=3D 0) {=0D @@ -258,16 +258,16 @@ CheckAcpiFadt ( return EFI_NOT_STARTED;=0D }=0D }=0D - if (Fadt->Header.Length > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_= TABLE, ResetReg)) {=0D + if (Fadt->Header.Length > OFFSET_OF(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_= TABLE, ResetReg)) {=0D if (Fadt->ResetReg.Address !=3D 0) {=0D switch (Fadt->ResetReg.AddressSpaceId) {=0D - case EFI_ACPI_5_0_SYSTEM_MEMORY:=0D + case EFI_ACPI_6_5_SYSTEM_MEMORY:=0D if (!IsMmioExit (Fadt->ResetReg.Address, Fadt->ResetReg.RegisterBi= tWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.ResetReg resource (0x%x) is not repor= ted correctly.\n", Fadt->ResetReg.Address));=0D return EFI_NOT_STARTED;=0D }=0D break;=0D - case EFI_ACPI_5_0_SYSTEM_IO:=0D + case EFI_ACPI_6_5_SYSTEM_IO:=0D if (!IsIoExit (Fadt->ResetReg.Address, Fadt->ResetReg.RegisterBitW= idth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.ResetReg resource (0x%x) is not repor= ted correctly.\n", Fadt->ResetReg.Address));=0D return EFI_NOT_STARTED;=0D @@ -276,16 +276,16 @@ CheckAcpiFadt ( }=0D }=0D }=0D - if (Fadt->Header.Length > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_= TABLE, XPm1aEvtBlk)) {=0D + if (Fadt->Header.Length > OFFSET_OF (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION= _TABLE, XPm1aEvtBlk)) {=0D if (Fadt->XPm1aEvtBlk.Address !=3D 0) {=0D switch (Fadt->XPm1aEvtBlk.AddressSpaceId) {=0D - case EFI_ACPI_5_0_SYSTEM_MEMORY:=0D + case EFI_ACPI_6_5_SYSTEM_MEMORY:=0D if (!IsMmioExit (Fadt->XPm1aEvtBlk.Address, Fadt->XPm1aEvtBlk.Regi= sterBitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XPm1aEvtBlk resource (0x%x) is not re= ported correctly.\n", Fadt->XPm1aEvtBlk.Address));=0D return EFI_NOT_STARTED;=0D }=0D break;=0D - case EFI_ACPI_5_0_SYSTEM_IO:=0D + case EFI_ACPI_6_5_SYSTEM_IO:=0D if (!IsIoExit (Fadt->XPm1aEvtBlk.Address, Fadt->XPm1aEvtBlk.Regist= erBitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XPm1aEvtBlk resource (0x%x) is not re= ported correctly.\n", Fadt->XPm1aEvtBlk.Address));=0D return EFI_NOT_STARTED;=0D @@ -294,16 +294,16 @@ CheckAcpiFadt ( }=0D }=0D }=0D - if (Fadt->Header.Length > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_= TABLE, XPm1bEvtBlk)) {=0D + if (Fadt->Header.Length > OFFSET_OF (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION= _TABLE, XPm1bEvtBlk)) {=0D if (Fadt->XPm1bEvtBlk.Address !=3D 0) {=0D switch (Fadt->XPm1bEvtBlk.AddressSpaceId) {=0D - case EFI_ACPI_5_0_SYSTEM_MEMORY:=0D + case EFI_ACPI_6_5_SYSTEM_MEMORY:=0D if (!IsMmioExit (Fadt->XPm1bEvtBlk.Address, Fadt->XPm1bEvtBlk.Regi= sterBitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XPm1bEvtBlk resource (0x%x) is not re= ported correctly.\n", Fadt->XPm1bEvtBlk.Address));=0D return EFI_NOT_STARTED;=0D }=0D break;=0D - case EFI_ACPI_5_0_SYSTEM_IO:=0D + case EFI_ACPI_6_5_SYSTEM_IO:=0D if (!IsIoExit (Fadt->XPm1bEvtBlk.Address, Fadt->XPm1bEvtBlk.Regist= erBitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XPm1bEvtBlk resource (0x%x) is not re= ported correctly.\n", Fadt->XPm1bEvtBlk.Address));=0D return EFI_NOT_STARTED;=0D @@ -312,16 +312,16 @@ CheckAcpiFadt ( }=0D }=0D }=0D - if (Fadt->Header.Length > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_= TABLE, XPm1aCntBlk)) {=0D + if (Fadt->Header.Length > OFFSET_OF (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION= _TABLE, XPm1aCntBlk)) {=0D if (Fadt->XPm1aCntBlk.Address !=3D 0) {=0D switch (Fadt->XPm1aCntBlk.AddressSpaceId) {=0D - case EFI_ACPI_5_0_SYSTEM_MEMORY:=0D + case EFI_ACPI_6_5_SYSTEM_MEMORY:=0D if (!IsMmioExit (Fadt->XPm1aCntBlk.Address, Fadt->XPm1aCntBlk.Regi= sterBitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XPm1aCntBlk resource (0x%x) is not re= ported correctly.\n", Fadt->XPm1aCntBlk.Address));=0D return EFI_NOT_STARTED;=0D }=0D break;=0D - case EFI_ACPI_5_0_SYSTEM_IO:=0D + case EFI_ACPI_6_5_SYSTEM_IO:=0D if (!IsIoExit (Fadt->XPm1aCntBlk.Address, Fadt->XPm1aCntBlk.Regist= erBitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XPm1aCntBlk resource (0x%x) is not re= ported correctly.\n", Fadt->XPm1aCntBlk.Address));=0D return EFI_NOT_STARTED;=0D @@ -330,16 +330,16 @@ CheckAcpiFadt ( }=0D }=0D }=0D - if (Fadt->Header.Length > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_= TABLE, XPm1bCntBlk)) {=0D + if (Fadt->Header.Length > OFFSET_OF (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION= _TABLE, XPm1bCntBlk)) {=0D if (Fadt->XPm1bCntBlk.Address !=3D 0) {=0D switch (Fadt->XPm1bCntBlk.AddressSpaceId) {=0D - case EFI_ACPI_5_0_SYSTEM_MEMORY:=0D + case EFI_ACPI_6_5_SYSTEM_MEMORY:=0D if (!IsMmioExit (Fadt->XPm1bCntBlk.Address, Fadt->XPm1bCntBlk.Regi= sterBitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XPm1bCntBlk resource (0x%x) is not re= ported correctly.\n", Fadt->XPm1bCntBlk.Address));=0D return EFI_NOT_STARTED;=0D }=0D break;=0D - case EFI_ACPI_5_0_SYSTEM_IO:=0D + case EFI_ACPI_6_5_SYSTEM_IO:=0D if (!IsIoExit (Fadt->XPm1bCntBlk.Address, Fadt->XPm1bCntBlk.Regist= erBitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XPm1bCntBlk resource (0x%x) is not re= ported correctly.\n", Fadt->XPm1bCntBlk.Address));=0D return EFI_NOT_STARTED;=0D @@ -348,16 +348,16 @@ CheckAcpiFadt ( }=0D }=0D }=0D - if (Fadt->Header.Length > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_= TABLE, XPm2CntBlk)) {=0D + if (Fadt->Header.Length > OFFSET_OF (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION= _TABLE, XPm2CntBlk)) {=0D if (Fadt->XPm2CntBlk.Address !=3D 0) {=0D switch (Fadt->XPm2CntBlk.AddressSpaceId) {=0D - case EFI_ACPI_5_0_SYSTEM_MEMORY:=0D + case EFI_ACPI_6_5_SYSTEM_MEMORY:=0D if (!IsMmioExit (Fadt->XPm2CntBlk.Address, Fadt->XPm2CntBlk.Regist= erBitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XPm2CntBlk resource (0x%x) is not rep= orted correctly.\n", Fadt->XPm2CntBlk.Address));=0D return EFI_NOT_STARTED;=0D }=0D break;=0D - case EFI_ACPI_5_0_SYSTEM_IO:=0D + case EFI_ACPI_6_5_SYSTEM_IO:=0D if (!IsIoExit (Fadt->XPm2CntBlk.Address, Fadt->XPm2CntBlk.Register= BitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XPm2CntBlk resource (0x%x) is not rep= orted correctly.\n", Fadt->XPm2CntBlk.Address));=0D return EFI_NOT_STARTED;=0D @@ -366,16 +366,16 @@ CheckAcpiFadt ( }=0D }=0D }=0D - if (Fadt->Header.Length > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_= TABLE, XPmTmrBlk)) {=0D + if (Fadt->Header.Length > OFFSET_OF (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION= _TABLE, XPmTmrBlk)) {=0D if (Fadt->XPmTmrBlk.Address !=3D 0) {=0D switch (Fadt->XPmTmrBlk.AddressSpaceId) {=0D - case EFI_ACPI_5_0_SYSTEM_MEMORY:=0D + case EFI_ACPI_6_5_SYSTEM_MEMORY:=0D if (!IsMmioExit (Fadt->XPmTmrBlk.Address, Fadt->XPmTmrBlk.Register= BitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XPmTmrBlk resource (0x%x) is not repo= rted correctly.\n", Fadt->XPmTmrBlk.Address));=0D return EFI_NOT_STARTED;=0D }=0D break;=0D - case EFI_ACPI_5_0_SYSTEM_IO:=0D + case EFI_ACPI_6_5_SYSTEM_IO:=0D if (!IsIoExit (Fadt->XPmTmrBlk.Address, Fadt->XPmTmrBlk.RegisterBi= tWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XPmTmrBlk resource (0x%x) is not repo= rted correctly.\n", Fadt->XPmTmrBlk.Address));=0D return EFI_NOT_STARTED;=0D @@ -384,16 +384,16 @@ CheckAcpiFadt ( }=0D }=0D }=0D - if (Fadt->Header.Length > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_= TABLE, XGpe0Blk)) {=0D + if (Fadt->Header.Length > OFFSET_OF (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION= _TABLE, XGpe0Blk)) {=0D if (Fadt->XGpe0Blk.Address !=3D 0) {=0D switch (Fadt->XGpe0Blk.AddressSpaceId) {=0D - case EFI_ACPI_5_0_SYSTEM_MEMORY:=0D + case EFI_ACPI_6_5_SYSTEM_MEMORY:=0D if (!IsMmioExit (Fadt->XGpe0Blk.Address, Fadt->XGpe0Blk.RegisterBi= tWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XGpe0Blk resource (0x%x) is not repor= ted correctly.\n", Fadt->XGpe0Blk.Address));=0D return EFI_NOT_STARTED;=0D }=0D break;=0D - case EFI_ACPI_5_0_SYSTEM_IO:=0D + case EFI_ACPI_6_5_SYSTEM_IO:=0D if (!IsIoExit (Fadt->XGpe0Blk.Address, Fadt->XGpe0Blk.RegisterBitW= idth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XGpe0Blk resource (0x%x) is not repor= ted correctly.\n", Fadt->XGpe0Blk.Address));=0D return EFI_NOT_STARTED;=0D @@ -402,16 +402,16 @@ CheckAcpiFadt ( }=0D }=0D }=0D - if (Fadt->Header.Length > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_= TABLE, XGpe1Blk)) {=0D + if (Fadt->Header.Length > OFFSET_OF (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION= _TABLE, XGpe1Blk)) {=0D if (Fadt->XGpe1Blk.Address !=3D 0) {=0D switch (Fadt->XGpe1Blk.AddressSpaceId) {=0D - case EFI_ACPI_5_0_SYSTEM_MEMORY:=0D + case EFI_ACPI_6_5_SYSTEM_MEMORY:=0D if (!IsMmioExit (Fadt->XGpe1Blk.Address, Fadt->XGpe1Blk.RegisterBi= tWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XGpe1Blk resource (0x%x) is not repor= ted correctly.\n", Fadt->XGpe1Blk.Address));=0D return EFI_NOT_STARTED;=0D }=0D break;=0D - case EFI_ACPI_5_0_SYSTEM_IO:=0D + case EFI_ACPI_6_5_SYSTEM_IO:=0D if (!IsIoExit (Fadt->XGpe1Blk.Address, Fadt->XGpe1Blk.RegisterBitW= idth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.XGpe1Blk resource (0x%x) is not repor= ted correctly.\n", Fadt->XGpe1Blk.Address));=0D return EFI_NOT_STARTED;=0D @@ -420,16 +420,16 @@ CheckAcpiFadt ( }=0D }=0D }=0D - if (Fadt->Header.Length > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_= TABLE, SleepControlReg)) {=0D + if (Fadt->Header.Length > OFFSET_OF (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION= _TABLE, SleepControlReg)) {=0D if (Fadt->SleepControlReg.Address !=3D 0) {=0D switch (Fadt->SleepControlReg.AddressSpaceId) {=0D - case EFI_ACPI_5_0_SYSTEM_MEMORY:=0D + case EFI_ACPI_6_5_SYSTEM_MEMORY:=0D if (!IsMmioExit (Fadt->SleepControlReg.Address, Fadt->SleepControl= Reg.RegisterBitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.SleepControlReg resource (0x%x) is no= t reported correctly.\n", Fadt->SleepControlReg.Address));=0D return EFI_NOT_STARTED;=0D }=0D break;=0D - case EFI_ACPI_5_0_SYSTEM_IO:=0D + case EFI_ACPI_6_5_SYSTEM_IO:=0D if (!IsIoExit (Fadt->SleepControlReg.Address, Fadt->SleepControlRe= g.RegisterBitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.SleepControlReg resource (0x%x) is no= t reported correctly.\n", Fadt->SleepControlReg.Address));=0D return EFI_NOT_STARTED;=0D @@ -438,16 +438,16 @@ CheckAcpiFadt ( }=0D }=0D }=0D - if (Fadt->Header.Length > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_= TABLE, SleepStatusReg)) {=0D + if (Fadt->Header.Length > OFFSET_OF (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION= _TABLE, SleepStatusReg)) {=0D if (Fadt->SleepStatusReg.Address !=3D 0) {=0D switch (Fadt->SleepStatusReg.AddressSpaceId) {=0D - case EFI_ACPI_5_0_SYSTEM_MEMORY:=0D + case EFI_ACPI_6_5_SYSTEM_MEMORY:=0D if (!IsMmioExit (Fadt->SleepStatusReg.Address, Fadt->SleepStatusRe= g.RegisterBitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.SleepStatusReg resource (0x%x) is not= reported correctly.\n", Fadt->SleepStatusReg.Address));=0D return EFI_NOT_STARTED;=0D }=0D break;=0D - case EFI_ACPI_5_0_SYSTEM_IO:=0D + case EFI_ACPI_6_5_SYSTEM_IO:=0D if (!IsIoExit (Fadt->SleepStatusReg.Address, Fadt->SleepStatusReg.= RegisterBitWidth/8, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "FADT.SleepStatusReg resource (0x%x) is not= reported correctly.\n", Fadt->SleepStatusReg.Address));=0D return EFI_NOT_STARTED;=0D @@ -461,7 +461,7 @@ CheckAcpiFadt ( =0D VOID=0D DumpAcpiFacs (=0D - IN EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *Facs=0D + IN EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *Facs=0D )=0D {=0D DEBUG ((DEBUG_INFO, " "));=0D @@ -476,21 +476,21 @@ DumpAcpiTable ( IN EFI_ACPI_DESCRIPTION_HEADER *Table=0D )=0D {=0D - EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt;=0D + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *Fadt;=0D =0D if (Table =3D=3D NULL) {=0D return ;=0D }=0D =0D switch (Table->Signature) {=0D - case EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE:=0D - Fadt =3D (EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *)Table;=0D + case EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE:=0D + Fadt =3D (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *) Table;=0D DumpAcpiFadt (Fadt);=0D - if (Fadt->Header.Revision >=3D EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TAB= LE_REVISION) {=0D + if (Fadt->Header.Revision >=3D EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TAB= LE_REVISION) {=0D if (Fadt->XFirmwareCtrl !=3D 0) {=0D - DumpAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UIN= TN)Fadt->XFirmwareCtrl);=0D + DumpAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UIN= TN) Fadt->XFirmwareCtrl);=0D } else {=0D - DumpAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UIN= TN)Fadt->FirmwareCtrl);=0D + DumpAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UIN= TN) Fadt->FirmwareCtrl);=0D }=0D if (Fadt->XDsdt !=3D 0) {=0D DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->XDsdt);= =0D @@ -498,29 +498,29 @@ DumpAcpiTable ( DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->Dsdt);= =0D }=0D } else {=0D - DumpAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN= )Fadt->FirmwareCtrl);=0D + DumpAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN= ) Fadt->FirmwareCtrl);=0D DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->Dsdt);=0D }=0D break;=0D - case EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE:=0D - DumpAcpiMadt ((EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *)T= able);=0D + case EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE:=0D + DumpAcpiMadt ((EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *) = Table);=0D break;=0D - case EFI_ACPI_2_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SIGNATU= RE:=0D + case EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADD= RESS_DESCRIPTION_TABLE_SIGNATURE:=0D DumpAcpiMcfg ((EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE= _HEADER *)Table);=0D break;=0D - case EFI_ACPI_3_0_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE:=0D - DumpAcpiHpet ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *)Tabl= e);=0D + case EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE:=0D + DumpAcpiHpet ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *) Tab= le);=0D break;=0D - case EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE:=0D + case EFI_ACPI_6_5_DMA_REMAPPING_TABLE_SIGNATURE:=0D DumpAcpiDmar ((EFI_ACPI_DMAR_HEADER *)Table);=0D break;=0D case EFI_ACPI_WINDOWS_SMM_SECURITY_MITIGATION_TABLE_SIGNATURE:=0D DumpAcpiWsmt ((EFI_ACPI_WSMT_TABLE *)Table);=0D break;=0D - case EFI_ACPI_5_0_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE:=0D + case EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE:=0D DumpAcpiTpm2 ((EFI_TPM2_ACPI_TABLE *)Table);=0D break;=0D - case EFI_ACPI_3_0_TRUSTED_COMPUTING_PLATFORM_ALLIANCE_CAPABILITIES_TABLE= _SIGNATURE:=0D + case EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_ALLIANCE_CAPABILITIES_TABLE= _SIGNATURE:=0D DumpAcpiTcpa ((VOID *)Table);=0D break;=0D default:=0D @@ -534,52 +534,52 @@ CheckAcpiTableResource ( IN EFI_ACPI_DESCRIPTION_HEADER *Table=0D )=0D {=0D - EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt;=0D + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *Fadt;=0D =0D if (Table =3D=3D NULL) {=0D return EFI_INVALID_PARAMETER;=0D }=0D =0D switch (Table->Signature) {=0D - case EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE:=0D - Fadt =3D (EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *)Table;=0D + case EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE:=0D + Fadt =3D (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *) Table;=0D CheckAcpiFadt (Fadt);=0D - if (Fadt->Header.Revision >=3D EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TAB= LE_REVISION) {=0D + if (Fadt->Header.Revision >=3D EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TAB= LE_REVISION) {=0D if (Fadt->XFirmwareCtrl !=3D 0) {=0D - // CheckAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)= (UINTN)Fadt->XFirmwareCtrl);=0D + // CheckAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)= (UINTN) Fadt->XFirmwareCtrl);=0D } else {=0D - // CheckAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)= (UINTN)Fadt->FirmwareCtrl);=0D + // CheckAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)= (UINTN) Fadt->FirmwareCtrl);=0D }=0D if (Fadt->XDsdt !=3D 0) {=0D - // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->XDsd= t);=0D + // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Fadt->XDs= dt);=0D } else {=0D - // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->Dsdt= );=0D + // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Fadt->Dsd= t);=0D }=0D } else {=0D - // CheckAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(U= INTN)Fadt->FirmwareCtrl);=0D + // CheckAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(U= INTN) Fadt->FirmwareCtrl);=0D // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->Dsdt);= =0D }=0D break;=0D - case EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE:=0D - return CheckAcpiMadt ((EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HE= ADER *)Table);=0D + case EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE:=0D + return CheckAcpiMadt ((EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HE= ADER *) Table);=0D break;=0D - case EFI_ACPI_2_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SIGNATU= RE:=0D - return CheckAcpiMcfg ((EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRE= SS_TABLE_HEADER *)Table);=0D + case EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADD= RESS_DESCRIPTION_TABLE_SIGNATURE:=0D + return CheckAcpiMcfg ((EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRE= SS_TABLE_HEADER *) Table);=0D break;=0D - case EFI_ACPI_3_0_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE:=0D - return CheckAcpiHpet ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADE= R *)Table);=0D + case EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE:=0D + return CheckAcpiHpet ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADE= R *) Table);=0D break;=0D - case EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE:=0D - return CheckAcpiDmar ((EFI_ACPI_DMAR_HEADER *)Table);=0D + case EFI_ACPI_6_5_DMA_REMAPPING_TABLE_SIGNATURE:=0D + return CheckAcpiDmar ((EFI_ACPI_DMAR_HEADER *) Table);=0D break;=0D case EFI_ACPI_WINDOWS_SMM_SECURITY_MITIGATION_TABLE_SIGNATURE:=0D // CheckAcpiWsmt ((EFI_ACPI_WSMT_TABLE *)Table);=0D break;=0D - case EFI_ACPI_5_0_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE:=0D - return CheckAcpiTpm2 ((EFI_TPM2_ACPI_TABLE *)Table);=0D + case EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE:=0D + return CheckAcpiTpm2 ((EFI_TPM2_ACPI_TABLE *) Table);=0D break;=0D - case EFI_ACPI_3_0_TRUSTED_COMPUTING_PLATFORM_ALLIANCE_CAPABILITIES_TABLE= _SIGNATURE:=0D - return CheckAcpiTcpa ((VOID *)Table);=0D + case EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_ALLIANCE_CAPABILITIES_TABLE= _SIGNATURE:=0D + return CheckAcpiTcpa ((VOID *) Table);=0D break;=0D default:=0D break;=0D @@ -701,7 +701,7 @@ DumpAcpiXsdt ( =0D EFI_STATUS=0D DumpAcpiRsdp (=0D - IN EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER *Rsdp,=0D + IN EFI_ACPI_6_5_ROOT_SYSTEM_DESCRIPTION_POINTER *Rsdp,=0D IN UINT32 *Signature, OPTIONAL=0D OUT VOID **Table,=0D IN BOOLEAN DumpPrint,=0D @@ -720,7 +720,7 @@ DumpAcpiRsdp ( DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, " RSDT=3D0x%08x XSDT=3D0x%016lx\n", Rsdp->RsdtAddr= ess, Rsdp->XsdtAddress));=0D =0D - if (Rsdp->Revision >=3D EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_R= EVISION) {=0D + if (Rsdp->Revision >=3D EFI_ACPI_6_5_ROOT_SYSTEM_DESCRIPTION_POINTER_R= EVISION) {=0D DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Rsdp->XsdtAddre= ss);=0D }=0D DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Rsdp->RsdtAddress= );=0D @@ -729,7 +729,7 @@ DumpAcpiRsdp ( //=0D // Search XSDT=0D //=0D - if (Rsdp->Revision >=3D EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REV= ISION) {=0D + if (Rsdp->Revision >=3D EFI_ACPI_6_5_ROOT_SYSTEM_DESCRIPTION_POINTER_REV= ISION) {=0D Xsdt =3D (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Rsdp->XsdtAddress;=0D Status =3D DumpAcpiXsdt (Xsdt, Signature, Table, DumpPrint, CheckResou= rce);=0D } else {=0D diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/D= xeCheckAcpiMadt.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointChe= ckLib/DxeCheckAcpiMadt.c index b743bad6dd..7e29b47a0b 100644 --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck= AcpiMadt.c +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck= AcpiMadt.c @@ -69,22 +69,22 @@ ShortNameOfMadtType( =0D VOID=0D DumpAcpiMadt (=0D - IN EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt=0D + IN EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt=0D )=0D {=0D APIC_STRUCT_HEADER *ApicStructHeader;= =0D INTN MadtLen;=0D - EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE *ProcessorLocalApi= c;=0D - EFI_ACPI_4_0_IO_APIC_STRUCTURE *IOApic;=0D - EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *InterruptSourceOv= erride;=0D - EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *NonMaskableInterr= uptSource;=0D - EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI;=0D - EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE *LocalApicAddressO= verride;=0D - EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *IOSapic;=0D - EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE *ProcessorLocalSap= ic;=0D - EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE *PlatformInterrupt= Source;=0D - EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE *ProcessorLocalX2A= pic;=0D - EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi;=0D + EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *ProcessorLocalApi= c;=0D + EFI_ACPI_6_5_IO_APIC_STRUCTURE *IOApic;=0D + EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *InterruptSourceOv= erride;=0D + EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *NonMaskableInterr= uptSource;=0D + EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI;=0D + EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE *LocalApicAddressO= verride;=0D + EFI_ACPI_6_5_IO_SAPIC_STRUCTURE *IOSapic;=0D + EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTURE *ProcessorLocalSap= ic;=0D + EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES_STRUCTURE *PlatformInterrupt= Source;=0D + EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *ProcessorLocalX2A= pic;=0D + EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi;=0D =0D DumpAcpiTableHeader (&Madt->Header);=0D DEBUG ((DEBUG_INFO, " "));=0D @@ -93,25 +93,25 @@ DumpAcpiMadt ( //=0D // Sub table=0D //=0D - MadtLen =3D Madt->Header.Length - sizeof(EFI_ACPI_4_0_MULTIPLE_APIC_DES= CRIPTION_TABLE_HEADER);=0D + MadtLen =3D Madt->Header.Length - sizeof(EFI_ACPI_6_5_MULTIPLE_APIC_DES= CRIPTION_TABLE_HEADER);=0D ApicStructHeader =3D (APIC_STRUCT_HEADER *)(Madt + 1);=0D while (MadtLen > 0) {=0D switch (ApicStructHeader->Type) {=0D - case EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC:=0D - ProcessorLocalApic =3D (EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE = *)ApicStructHeader;=0D + case EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC:=0D + ProcessorLocalApic =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE = *) ApicStructHeader;=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));=0D DEBUG ((DEBUG_INFO, ": [0x%02x]", ApicStructHeader->Type));=0D - DEBUG ((DEBUG_INFO, " ID=3D0x%02x", ProcessorLocalApic->AcpiProcesso= rId));=0D + DEBUG ((DEBUG_INFO, " ID=3D0x%02x", ProcessorLocalApic->AcpiProcesso= rUid));=0D DEBUG ((DEBUG_INFO, " ApicId=3D0x%02x", ProcessorLocalApic->ApicId))= ;=0D - if ((ProcessorLocalApic->Flags & EFI_ACPI_4_0_LOCAL_APIC_ENABLED) != =3D 0) {=0D + if ((ProcessorLocalApic->Flags & EFI_ACPI_6_5_LOCAL_APIC_ENABLED) != =3D 0) {=0D DEBUG ((DEBUG_INFO, " (Enabled)"));=0D }=0D DEBUG ((DEBUG_INFO, "\n"));=0D break;=0D - case EFI_ACPI_4_0_IO_APIC:=0D - IOApic =3D (EFI_ACPI_4_0_IO_APIC_STRUCTURE *)ApicStructHeader;=0D + case EFI_ACPI_6_5_IO_APIC:=0D + IOApic =3D (EFI_ACPI_6_5_IO_APIC_STRUCTURE *) ApicStructHeader;=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));=0D @@ -121,8 +121,8 @@ DumpAcpiMadt ( DEBUG ((DEBUG_INFO, " InterruptBase=3D0x%08x", IOApic->GlobalSystemI= nterruptBase));=0D DEBUG ((DEBUG_INFO, "\n"));=0D break;=0D - case EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE:=0D - InterruptSourceOverride =3D (EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_= STRUCTURE *)ApicStructHeader;=0D + case EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE:=0D + InterruptSourceOverride =3D (EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_= STRUCTURE *) ApicStructHeader;=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));=0D @@ -133,8 +133,8 @@ DumpAcpiMadt ( DEBUG ((DEBUG_INFO, " Flags=3D0x%04x", InterruptSourceOverride->Flag= s));=0D DEBUG ((DEBUG_INFO, "\n"));=0D break;=0D - case EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE:=0D - NonMaskableInterruptSource =3D (EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_= SOURCE_STRUCTURE *)ApicStructHeader;=0D + case EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE:=0D + NonMaskableInterruptSource =3D (EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_= SOURCE_STRUCTURE *) ApicStructHeader;=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));=0D @@ -143,19 +143,19 @@ DumpAcpiMadt ( DEBUG ((DEBUG_INFO, " Flags=3D0x%04x", NonMaskableInterruptSource->F= lags));=0D DEBUG ((DEBUG_INFO, "\n"));=0D break;=0D - case EFI_ACPI_4_0_LOCAL_APIC_NMI:=0D - LocalApicNMI =3D (EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *)ApicStruct= Header;=0D + case EFI_ACPI_6_5_LOCAL_APIC_NMI:=0D + LocalApicNMI =3D (EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE *) ApicStruc= tHeader;=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));=0D DEBUG ((DEBUG_INFO, ": [0x%02x]", ApicStructHeader->Type));=0D - DEBUG ((DEBUG_INFO, " ID=3D0x%02x", LocalApicNMI->AcpiProcessorId));= =0D + DEBUG ((DEBUG_INFO, " ID=3D0x%02x", LocalApicNMI->AcpiProcessorUid))= ;=0D DEBUG ((DEBUG_INFO, " Lint=3D0x%02x", LocalApicNMI->LocalApicLint));= =0D DEBUG ((DEBUG_INFO, " Flags=3D0x%04x", LocalApicNMI->Flags));=0D DEBUG ((DEBUG_INFO, "\n"));=0D break;=0D - case EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE:=0D - LocalApicAddressOverride =3D (EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRI= DE_STRUCTURE *)ApicStructHeader;=0D + case EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE:=0D + LocalApicAddressOverride =3D (EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRI= DE_STRUCTURE *) ApicStructHeader;=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));=0D @@ -163,8 +163,8 @@ DumpAcpiMadt ( DEBUG ((DEBUG_INFO, " LocalApicAddress=3D0x%016lx", LocalApicAddress= Override->LocalApicAddress));=0D DEBUG ((DEBUG_INFO, "\n"));=0D break;=0D - case EFI_ACPI_4_0_IO_SAPIC:=0D - IOSapic =3D (EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *)ApicStructHeader;=0D + case EFI_ACPI_6_5_IO_SAPIC:=0D + IOSapic =3D (EFI_ACPI_6_5_IO_SAPIC_STRUCTURE *) ApicStructHeader;=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));=0D @@ -174,8 +174,8 @@ DumpAcpiMadt ( DEBUG ((DEBUG_INFO, " IoSapicAddress=3D0x%016lx", IOSapic->IoSapicAd= dress));=0D DEBUG ((DEBUG_INFO, "\n"));=0D break;=0D - case EFI_ACPI_4_0_LOCAL_SAPIC:=0D - ProcessorLocalSapic =3D (EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTUR= E *)ApicStructHeader;=0D + case EFI_ACPI_6_5_LOCAL_SAPIC:=0D + ProcessorLocalSapic =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTUR= E *) ApicStructHeader;=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));=0D @@ -184,13 +184,13 @@ DumpAcpiMadt ( DEBUG ((DEBUG_INFO, " LocalSapicId=3D0x%02x", ProcessorLocalSapic->L= ocalSapicId));=0D DEBUG ((DEBUG_INFO, " LocalSapicEid=3D0x%02x", ProcessorLocalSapic->= LocalSapicEid));=0D DEBUG ((DEBUG_INFO, " UID=3D0x%08x", ProcessorLocalSapic->ACPIProces= sorUIDValue));=0D - if ((ProcessorLocalSapic->Flags & EFI_ACPI_5_0_LOCAL_APIC_ENABLED) != =3D 0) {=0D + if ((ProcessorLocalSapic->Flags & EFI_ACPI_6_5_LOCAL_APIC_ENABLED) != =3D 0) {=0D DEBUG ((DEBUG_INFO, " (Enabled)"));=0D }=0D DEBUG ((DEBUG_INFO, "\n"));=0D break;=0D - case EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES:=0D - PlatformInterruptSource =3D (EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES= _STRUCTURE *)ApicStructHeader;=0D + case EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES:=0D + PlatformInterruptSource =3D (EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES= _STRUCTURE *) ApicStructHeader;=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));=0D @@ -204,21 +204,21 @@ DumpAcpiMadt ( DEBUG ((DEBUG_INFO, " Flags=3D0x%04x", PlatformInterruptSource->Flag= s));=0D DEBUG ((DEBUG_INFO, "\n"));=0D break;=0D - case EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC:=0D - ProcessorLocalX2Apic =3D (EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCT= URE *)ApicStructHeader;=0D + case EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC:=0D + ProcessorLocalX2Apic =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCT= URE *) ApicStructHeader;=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));=0D DEBUG ((DEBUG_INFO, ": [0x%02x]", ApicStructHeader->Type));=0D DEBUG ((DEBUG_INFO, " X2ApicId=3D0x%08x", ProcessorLocalX2Apic->X2Ap= icId));=0D DEBUG ((DEBUG_INFO, " UID=3D0x%08x", ProcessorLocalX2Apic->AcpiProce= ssorUid));=0D - if ((ProcessorLocalX2Apic->Flags & EFI_ACPI_5_0_LOCAL_APIC_ENABLED) = !=3D 0) {=0D + if ((ProcessorLocalX2Apic->Flags & EFI_ACPI_6_5_LOCAL_APIC_ENABLED) = !=3D 0) {=0D DEBUG ((DEBUG_INFO, " (Enabled)"));=0D }=0D DEBUG ((DEBUG_INFO, "\n"));=0D break;=0D - case EFI_ACPI_4_0_LOCAL_X2APIC_NMI:=0D - LocalX2ApicNmi =3D (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE *)ApicSt= ructHeader;=0D + case EFI_ACPI_6_5_LOCAL_X2APIC_NMI:=0D + LocalX2ApicNmi =3D (EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE *) ApicS= tructHeader;=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, " "));=0D DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));=0D @@ -242,24 +242,24 @@ DumpAcpiMadt ( =0D EFI_STATUS=0D CheckAcpiMadt (=0D - IN EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt=0D + IN EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt=0D )=0D {=0D =0D APIC_STRUCT_HEADER *ApicStructHeader;= =0D INTN MadtLen;=0D - EFI_ACPI_4_0_IO_APIC_STRUCTURE *IOApic;=0D - EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE *LocalApicAddressO= verride;=0D - EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *IOSapic;=0D + EFI_ACPI_6_5_IO_APIC_STRUCTURE *IOApic;=0D + EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE *LocalApicAddressO= verride;=0D + EFI_ACPI_6_5_IO_SAPIC_STRUCTURE *IOSapic;=0D #if 0=0D - EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE *ProcessorLocalApi= c;=0D - EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *InterruptSourceOv= erride;=0D - EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *NonMaskableInterr= uptSource;=0D - EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI;=0D - EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE *ProcessorLocalSap= ic;=0D - EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE *PlatformInterrupt= Source;=0D - EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE *ProcessorLocalX2A= pic;=0D - EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi;=0D + EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *ProcessorLocalApi= c;=0D + EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *InterruptSourceOv= erride;=0D + EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *NonMaskableInterr= uptSource;=0D + EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI;=0D + EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTURE *ProcessorLocalSap= ic;=0D + EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES_STRUCTURE *PlatformInterrupt= Source;=0D + EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *ProcessorLocalX2A= pic;=0D + EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi;=0D #endif=0D =0D if (!IsMmioExit (Madt->LocalApicAddress, SIZE_4KB, TRUE)) {=0D @@ -270,55 +270,55 @@ CheckAcpiMadt ( //=0D // Sub table=0D //=0D - MadtLen =3D Madt->Header.Length - sizeof(EFI_ACPI_4_0_MULTIPLE_APIC_DES= CRIPTION_TABLE_HEADER);=0D + MadtLen =3D Madt->Header.Length - sizeof(EFI_ACPI_6_5_MULTIPLE_APIC_DES= CRIPTION_TABLE_HEADER);=0D ApicStructHeader =3D (APIC_STRUCT_HEADER *)(Madt + 1);=0D while (MadtLen > 0) {=0D switch (ApicStructHeader->Type) {=0D - case EFI_ACPI_4_0_IO_APIC:=0D - IOApic =3D (EFI_ACPI_4_0_IO_APIC_STRUCTURE *)ApicStructHeader;=0D + case EFI_ACPI_6_5_IO_APIC:=0D + IOApic =3D (EFI_ACPI_6_5_IO_APIC_STRUCTURE *) ApicStructHeader;=0D if (!IsMmioExit (IOApic->IoApicAddress, SIZE_4KB, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "MADT.IOAPIC resource (0x%x) is not reported = correctly.\n", IOApic->IoApicAddress));=0D return EFI_NOT_STARTED;=0D }=0D break;=0D - case EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE:=0D - LocalApicAddressOverride =3D (EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRI= DE_STRUCTURE *)ApicStructHeader;=0D + case EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE:=0D + LocalApicAddressOverride =3D (EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRI= DE_STRUCTURE *) ApicStructHeader;=0D if (!IsMmioExit (LocalApicAddressOverride->LocalApicAddress, SIZE_4K= B, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "MADT.LocalApicOverride resource (0x%x) is no= t reported correctly.\n", LocalApicAddressOverride->LocalApicAddress));=0D return EFI_NOT_STARTED;=0D }=0D break;=0D - case EFI_ACPI_4_0_IO_SAPIC:=0D - IOSapic =3D (EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *)ApicStructHeader;=0D + case EFI_ACPI_6_5_IO_SAPIC:=0D + IOSapic =3D (EFI_ACPI_6_5_IO_SAPIC_STRUCTURE *) ApicStructHeader;=0D if (!IsMmioExit (IOSapic->IoSapicAddress, SIZE_4KB, TRUE)) {=0D DEBUG ((DEBUG_ERROR, "MADT.IOSAPIC resource (0x%x) is not reported= correctly.\n", IOSapic->IoSapicAddress));=0D return EFI_NOT_STARTED;=0D }=0D break;=0D #if 0=0D - case EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC:=0D - ProcessorLocalApic =3D (EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE = *)ApicStructHeader;=0D + case EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC:=0D + ProcessorLocalApic =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE = *) ApicStructHeader;=0D break;=0D - case EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE:=0D - InterruptSourceOverride =3D (EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_= STRUCTURE *)ApicStructHeader;=0D + case EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE:=0D + InterruptSourceOverride =3D (EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_= STRUCTURE *) ApicStructHeader;=0D break;=0D - case EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE:=0D - NonMaskableInterruptSource =3D (EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_= SOURCE_STRUCTURE *)ApicStructHeader;=0D + case EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE:=0D + NonMaskableInterruptSource =3D (EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_= SOURCE_STRUCTURE *) ApicStructHeader;=0D break;=0D - case EFI_ACPI_4_0_LOCAL_APIC_NMI:=0D - LocalApicNMI =3D (EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *)ApicStruct= Header;=0D + case EFI_ACPI_6_5_LOCAL_APIC_NMI:=0D + LocalApicNMI =3D (EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE *) ApicStruc= tHeader;=0D break;=0D - case EFI_ACPI_4_0_LOCAL_SAPIC:=0D - ProcessorLocalSapic =3D (EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTUR= E *)ApicStructHeader;=0D + case EFI_ACPI_6_5_LOCAL_SAPIC:=0D + ProcessorLocalSapic =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTUR= E *) ApicStructHeader;=0D break;=0D - case EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES:=0D - PlatformInterruptSource =3D (EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES= _STRUCTURE *)ApicStructHeader;=0D + case EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES:=0D + PlatformInterruptSource =3D (EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES= _STRUCTURE *) ApicStructHeader;=0D break;=0D - case EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC:=0D - ProcessorLocalX2Apic =3D (EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCT= URE *)ApicStructHeader;=0D + case EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC:=0D + ProcessorLocalX2Apic =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCT= URE *) ApicStructHeader;=0D break;=0D - case EFI_ACPI_4_0_LOCAL_X2APIC_NMI:=0D - LocalX2ApicNmi =3D (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE *)ApicSt= ructHeader;=0D + case EFI_ACPI_6_5_LOCAL_X2APIC_NMI:=0D + LocalX2ApicNmi =3D (EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE *) ApicS= tructHeader;=0D break;=0D #endif=0D default:=0D diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/D= xeCheckDmaProtection.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPoi= ntCheckLib/DxeCheckDmaProtection.c index aba0985956..285de67c93 100644 --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck= DmaProtection.c +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck= DmaProtection.c @@ -32,7 +32,7 @@ CheckDrhd ( INTN DmarLen;=0D EFI_ACPI_DMAR_DRHD_HEADER *Drhd;=0D UINT32 Reg32;=0D - =0D +=0D //=0D // Sub table=0D //=0D @@ -73,7 +73,7 @@ TestPointVtdEngine ( =0D Status =3D EFI_SUCCESS;=0D =0D - Dmar =3D TestPointGetAcpi (EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE);= =0D + Dmar =3D TestPointGetAcpi (EFI_ACPI_6_5_DMA_REMAPPING_TABLE_SIGNATURE);= =0D if (Dmar =3D=3D NULL) {=0D DEBUG ((DEBUG_ERROR, "No DMAR table\n"));=0D Status =3D EFI_INVALID_PARAMETER;=0D diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/D= xeCheckTcgTrustedBoot.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPo= intCheckLib/DxeCheckTcgTrustedBoot.c index 5ec32fd2e8..eb81ba93c4 100644 --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck= TcgTrustedBoot.c +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck= TcgTrustedBoot.c @@ -70,7 +70,7 @@ TestPointCheckTcgTrustedBoot ( Status =3D EFI_NOT_FOUND;=0D }=0D =0D - Acpi =3D TestPointGetAcpi (EFI_ACPI_5_0_TRUSTED_COMPUTING_PLATFORM_2_TAB= LE_SIGNATURE);=0D + Acpi =3D TestPointGetAcpi (EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_2_TAB= LE_SIGNATURE);=0D if (Acpi =3D=3D NULL) {=0D DEBUG ((DEBUG_ERROR, "Tcg2 TPM2 table not found\n"));=0D Status =3D EFI_NOT_FOUND;=0D diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/D= xeTestPointCheckLib.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPoin= tCheckLib/DxeTestPointCheckLib.c index e5efbd0599..8e4030798e 100644 --- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP= ointCheckLib.c +++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP= ointCheckLib.c @@ -281,7 +281,7 @@ TestPointEndOfDxeDmaAcpiTableFunctional ( =0D DEBUG ((DEBUG_INFO, "=3D=3D=3D=3D=3D=3D=3D=3D TestPointEndOfDxeDmaAcpiTa= bleFunctional - Enter\n"));=0D =0D - Acpi =3D TestPointGetAcpi (EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE);= =0D + Acpi =3D TestPointGetAcpi (EFI_ACPI_6_5_DMA_REMAPPING_TABLE_SIGNATURE);= =0D if (Acpi =3D=3D NULL) {=0D DEBUG ((DEBUG_ERROR, "No DMAR table\n"));=0D TestPointLibAppendErrorString (=0D --=20 2.34.0.windows.1