From: Aryeh Chen <aryeh.c...@intel.com>
https://bugzilla.tianocore.org/show_bug.cgi?id=4442
Update ACPI 6.5 definition on MinPlatformPkg
Cc: Chasel Chiu <chasel.c...@intel.com>
Cc: Nate DeSimone <nathaniel.l.desim...@intel.com>
Cc: Isaac Oram <isaac.w.o...@intel.com>
Cc: Liming Gao <gaolim...@byosoft.com.cn>
Cc: Eric Dong <eric.d...@intel.com>
Cc: Jiewen Yao <jiewen....@intel.com>
Cc: Ankit Sinha<ankit.si...@intel.com>
Signed-off-by: Aryeh Chen <aryeh.c...@intel.com>
---
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/Test/Library/TestPointCheckLib/DxeCheckAcpi.c
| 154 ++++++++++----------
Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c
| 150 +++++++++----------
Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaProtection.c
| 4 +-
Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c
| 2 +-
Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c
| 2 +-
10 files changed, 263 insertions(+), 263 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;
//
typedef union {
- EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE AcpiLocalApic;
- EFI_ACPI_6_3_IO_APIC_STRUCTURE AcpiIoApic;
- EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE AcpiLocalx2Apic;
+ EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE AcpiLocalApic;
+ EFI_ACPI_6_5_IO_APIC_STRUCTURE AcpiIoApic;
+ EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE AcpiLocalx2Apic;
struct {
UINT8 Type;
UINT8 Length;
@@ -38,8 +38,8 @@ typedef union {
#pragma pack()
-extern EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs;
-extern EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt;
+extern EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs;
+extern EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE Fadt;
extern EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER Hpet;
extern EFI_ACPI_WSMT_TABLE Wsmt;
@@ -92,16 +92,16 @@ AppendCpuMapTableEntry (
)
{
EFI_STATUS Status;
- EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE *LocalApicPtr;
- EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE *LocalX2ApicPtr;
+ EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *LocalApicPtr;
+ EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *LocalX2ApicPtr;
UINT8 Type;
Status = EFI_SUCCESS;
Type = ((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiApicCommon.Type;
- LocalApicPtr = (EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE
*)(&((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalApic);
- LocalX2ApicPtr = (EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE
*)(&((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalx2Apic);
+ LocalApicPtr = (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE
*)(&((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalApic);
+ LocalX2ApicPtr = (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE
*)(&((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalx2Apic);
- if(Type == EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC) {
+ if(Type == EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC) {
if(!mX2ApicEnabled) {
LocalApicPtr->Flags =
(UINT8)CpuApicIdOrderTable[LocalApicCounter].Flags;
LocalApicPtr->ApicId =
(UINT8)CpuApicIdOrderTable[LocalApicCounter].ApicId;
@@ -112,7 +112,7 @@ AppendCpuMapTableEntry (
LocalApicPtr->AcpiProcessorUid = (UINT8)0xFF;
Status = EFI_UNSUPPORTED;
}
- } else if(Type == EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC) {
+ } else if(Type == EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC) {
if(mX2ApicEnabled) {
LocalX2ApicPtr->Flags =
(UINT8)CpuApicIdOrderTable[LocalApicCounter].Flags;
LocalX2ApicPtr->X2ApicId =
CpuApicIdOrderTable[LocalApicCounter].ApicId;
@@ -215,17 +215,17 @@ typedef struct {
} STRUCTURE_HEADER;
STRUCTURE_HEADER mMadtStructureTable[] = {
- {EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC, sizeof
(EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE)},
- {EFI_ACPI_6_3_IO_APIC, sizeof
(EFI_ACPI_6_3_IO_APIC_STRUCTURE)},
- {EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE, sizeof
(EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE)},
- {EFI_ACPI_6_3_NON_MASKABLE_INTERRUPT_SOURCE, sizeof
(EFI_ACPI_6_3_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE)},
- {EFI_ACPI_6_3_LOCAL_APIC_NMI, sizeof
(EFI_ACPI_6_3_LOCAL_APIC_NMI_STRUCTURE)},
- {EFI_ACPI_6_3_LOCAL_APIC_ADDRESS_OVERRIDE, sizeof
(EFI_ACPI_6_3_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE)},
- {EFI_ACPI_6_3_IO_SAPIC, sizeof
(EFI_ACPI_6_3_IO_SAPIC_STRUCTURE)},
- {EFI_ACPI_6_3_LOCAL_SAPIC, sizeof
(EFI_ACPI_6_3_PROCESSOR_LOCAL_SAPIC_STRUCTURE)},
- {EFI_ACPI_6_3_PLATFORM_INTERRUPT_SOURCES, sizeof
(EFI_ACPI_6_3_PLATFORM_INTERRUPT_SOURCES_STRUCTURE)},
- {EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC, sizeof
(EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE)},
- {EFI_ACPI_6_3_LOCAL_X2APIC_NMI, sizeof
(EFI_ACPI_6_3_LOCAL_X2APIC_NMI_STRUCTURE)}
+ {EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC, sizeof
(EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE)},
+ {EFI_ACPI_6_5_IO_APIC, sizeof
(EFI_ACPI_6_5_IO_APIC_STRUCTURE)},
+ {EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE, sizeof
(EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE)},
+ {EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE, sizeof
(EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE)},
+ {EFI_ACPI_6_5_LOCAL_APIC_NMI, sizeof
(EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE)},
+ {EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE, sizeof
(EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE)},
+ {EFI_ACPI_6_5_IO_SAPIC, sizeof
(EFI_ACPI_6_5_IO_SAPIC_STRUCTURE)},
+ {EFI_ACPI_6_5_LOCAL_SAPIC, sizeof
(EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTURE)},
+ {EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES, sizeof
(EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES_STRUCTURE)},
+ {EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC, sizeof
(EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE)},
+ {EFI_ACPI_6_5_LOCAL_X2APIC_NMI, sizeof
(EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE)}
};
/**
@@ -384,7 +384,7 @@ InitializeHeader (
**/
EFI_STATUS
InitializeMadtHeader (
- IN OUT EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *MadtHeader
+ IN OUT EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *MadtHeader
)
{
EFI_STATUS Status;
@@ -396,8 +396,8 @@ InitializeMadtHeader (
Status = InitializeHeader (
&MadtHeader->Header,
- EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE,
- EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION,
+ EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE,
+ EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION,
0
);
if (EFI_ERROR (Status)) {
@@ -405,7 +405,7 @@ InitializeMadtHeader (
}
MadtHeader->LocalApicAddress = PcdGet32(PcdLocalApicAddress);
- MadtHeader->Flags = EFI_ACPI_6_3_PCAT_COMPAT;
+ MadtHeader->Flags = EFI_ACPI_6_5_PCAT_COMPAT;
return EFI_SUCCESS;
}
@@ -442,7 +442,7 @@ CopyStructure (
//
// Initialize the number of table entries and the table based on the table
header passed in.
//
- if (Header->Signature ==
EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE) {
+ if (Header->Signature ==
EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE) {
TableNumEntries = sizeof (mMadtStructureTable) / sizeof (STRUCTURE_HEADER);
StructureTable = mMadtStructureTable;
} else {
@@ -552,7 +552,7 @@ BuildAcpiTable (
return EFI_INVALID_PARAMETER;
}
- if (AcpiHeader->Signature !=
EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE) {
+ if (AcpiHeader->Signature !=
EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE) {
DEBUG ((
DEBUG_ERROR,
"MADT header signature is expected, actually 0x%08x\n",
@@ -643,15 +643,15 @@ InstallMadtFromScratch (
{
EFI_STATUS Status;
UINTN Index;
- EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *NewMadtTable;
+ EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *NewMadtTable;
UINTN TableHandle;
- EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER MadtTableHeader;
- EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE ProcLocalApicStruct;
- EFI_ACPI_6_3_IO_APIC_STRUCTURE IoApicStruct;
- EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE IntSrcOverrideStruct;
- EFI_ACPI_6_3_LOCAL_APIC_NMI_STRUCTURE LocalApciNmiStruct;
- EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE ProcLocalX2ApicStruct;
- EFI_ACPI_6_3_LOCAL_X2APIC_NMI_STRUCTURE LocalX2ApicNmiStruct;
+ EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER MadtTableHeader;
+ EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE ProcLocalApicStruct;
+ EFI_ACPI_6_5_IO_APIC_STRUCTURE IoApicStruct;
+ EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE IntSrcOverrideStruct;
+ EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE LocalApciNmiStruct;
+ EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE ProcLocalX2ApicStruct;
+ EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE LocalX2ApicNmiStruct;
EFI_CPU_ID_ORDER_MAP *CpuApicIdOrderTable;
STRUCTURE_HEADER **MadtStructs;
UINTN MaxMadtStructCount;
@@ -714,11 +714,11 @@ InstallMadtFromScratch (
//
// Build Processor Local APIC Structures and Processor Local X2APIC
Structures
//
- ProcLocalApicStruct.Type = EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC;
- ProcLocalApicStruct.Length = sizeof
(EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE);
+ ProcLocalApicStruct.Type = EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC;
+ ProcLocalApicStruct.Length = sizeof
(EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE);
- ProcLocalX2ApicStruct.Type = EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC;
- ProcLocalX2ApicStruct.Length = sizeof
(EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE);
+ ProcLocalX2ApicStruct.Type = EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC;
+ ProcLocalX2ApicStruct.Length = sizeof
(EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE);
ProcLocalX2ApicStruct.Reserved[0] = 0;
ProcLocalX2ApicStruct.Reserved[1] = 0;
@@ -760,8 +760,8 @@ InstallMadtFromScratch (
//
// Build I/O APIC Structures
//
- IoApicStruct.Type = EFI_ACPI_6_3_IO_APIC;
- IoApicStruct.Length = sizeof (EFI_ACPI_6_3_IO_APIC_STRUCTURE);
+ IoApicStruct.Type = EFI_ACPI_6_5_IO_APIC;
+ IoApicStruct.Length = sizeof (EFI_ACPI_6_5_IO_APIC_STRUCTURE);
IoApicStruct.Reserved = 0;
PcIoApicEnable = PcdGet32 (PcdPcIoApicEnable);
@@ -807,8 +807,8 @@ InstallMadtFromScratch (
//
// Build Interrupt Source Override Structures
//
- IntSrcOverrideStruct.Type = EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE;
- IntSrcOverrideStruct.Length = sizeof
(EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE);
+ IntSrcOverrideStruct.Type = EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE;
+ IntSrcOverrideStruct.Length = sizeof
(EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE);
//
// IRQ0=>IRQ2 Interrupt Source Override Structure
@@ -852,8 +852,8 @@ InstallMadtFromScratch (
// Build Local APIC NMI Structures
//
if (!mX2ApicEnabled) {
- LocalApciNmiStruct.Type = EFI_ACPI_6_3_LOCAL_APIC_NMI;
- LocalApciNmiStruct.Length = sizeof (EFI_ACPI_6_3_LOCAL_APIC_NMI_STRUCTURE);
+ LocalApciNmiStruct.Type = EFI_ACPI_6_5_LOCAL_APIC_NMI;
+ LocalApciNmiStruct.Length = sizeof (EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE);
LocalApciNmiStruct.AcpiProcessorUid = 0xFF; // Applies to all
processors
LocalApciNmiStruct.Flags = 0x0005; // Flags - Edge-tiggered,
Active High
LocalApciNmiStruct.LocalApicLint = 0x1;
@@ -874,8 +874,8 @@ InstallMadtFromScratch (
// Build Local x2APIC NMI Structure
//
if (mX2ApicEnabled) {
- LocalX2ApicNmiStruct.Type = EFI_ACPI_6_3_LOCAL_X2APIC_NMI;
- LocalX2ApicNmiStruct.Length = sizeof
(EFI_ACPI_6_3_LOCAL_X2APIC_NMI_STRUCTURE);
+ LocalX2ApicNmiStruct.Type = EFI_ACPI_6_5_LOCAL_X2APIC_NMI;
+ LocalX2ApicNmiStruct.Length = sizeof
(EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE);
LocalX2ApicNmiStruct.Flags = 0x000D; // Flags -
Level-tiggered, Active High
LocalX2ApicNmiStruct.AcpiProcessorUid = 0xFFFFFFFF; // Applies to all
processors
LocalX2ApicNmiStruct.LocalX2ApicLint = 0x01;
@@ -900,7 +900,7 @@ InstallMadtFromScratch (
//
Status = BuildAcpiTable (
(EFI_ACPI_DESCRIPTION_HEADER *) &MadtTableHeader,
- sizeof (EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER),
+ sizeof (EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER),
MadtStructs,
MadtStructsIndex,
(UINT8 **)&NewMadtTable
@@ -970,7 +970,7 @@ InstallMcfgFromScratch (
Status = InitializeHeader (
&McfgTable->Header,
-
EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE,
+
EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE,
EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_REVISION,
FixedPcdGet32 (PcdAcpiDefaultOemRevision)
);
@@ -1024,10 +1024,10 @@ PlatformUpdateTables (
IN OUT EFI_ACPI_TABLE_VERSION *Version
)
{
- EFI_ACPI_DESCRIPTION_HEADER *TableHeader;
- UINT8 *TempOemId;
- UINT64 TempOemTableId;
- EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE *FadtHeader;
+ EFI_ACPI_DESCRIPTION_HEADER *TableHeader;
+ UINT8 *TempOemId;
+ UINT64 TempOemTableId;
+ EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *FadtHeader;
EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *HpetTable;
UINT32 HpetBaseAddress;
EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_BLOCK_ID HpetBlockId;
@@ -1045,7 +1045,7 @@ PlatformUpdateTables (
//
// Update the OEM and creator information for every table except FACS.
//
- if (Table->Signature !=
EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) {
+ if (Table->Signature !=
EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) {
TempOemId = (UINT8 *)PcdGetPtr(PcdAcpiDefaultOemId);
CopyMem (&TableHeader->OemId, TempOemId, 6);
@@ -1053,9 +1053,9 @@ PlatformUpdateTables (
// Skip OEM table ID and creator information for DSDT, SSDT and PSDT
tables, since these are
// created by an ASL compiler and the creator information is useful.
//
- if (Table->Signature !=
EFI_ACPI_1_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE &&
- Table->Signature !=
EFI_ACPI_1_0_SECONDARY_SYSTEM_DESCRIPTION_TABLE_SIGNATURE &&
- Table->Signature !=
EFI_ACPI_1_0_PERSISTENT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE
+ if (Table->Signature !=
EFI_ACPI_6_5_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE &&
+ Table->Signature !=
EFI_ACPI_6_5_SECONDARY_SYSTEM_DESCRIPTION_TABLE_SIGNATURE &&
+ Table->Signature !=
EFI_ACPI_6_5_PERSISTENT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE
) {
TempOemTableId = PcdGet64(PcdAcpiDefaultOemTableId);
CopyMem (&TableHeader->OemTableId, &TempOemTableId, 8);
@@ -1089,12 +1089,12 @@ PlatformUpdateTables (
//
switch (Table->Signature) {
- case EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE:
+ case EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE:
ASSERT(FALSE);
break;
- case EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE:
- FadtHeader = (EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE *) Table;
+ case EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE:
+ FadtHeader = (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *) Table;
FadtHeader->Header.Revision = PcdGet8
(PcdFadtMajorVersion);
FadtHeader->PreferredPmProfile = PcdGet8
(PcdFadtPreferredPmProfile);
@@ -1159,7 +1159,7 @@ PlatformUpdateTables (
DEBUG ((DEBUG_INFO, " Flags 0x%x\n", FadtHeader->Flags));
break;
- case EFI_ACPI_6_3_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE:
+ case EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE:
HpetTable = (EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *)Table;
HpetBaseAddress = PcdGet32 (PcdHpetBaseAddress);
HpetTable->BaseAddressLower32Bit.Address = HpetBaseAddress;
@@ -1180,7 +1180,7 @@ PlatformUpdateTables (
DEBUG ((DEBUG_INFO, " HPET base 0x%x\n", PcdGet32 (PcdHpetBaseAddress)));
break;
- case
EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE:
+ case
EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE:
ASSERT (FALSE);
break;
@@ -1201,18 +1201,18 @@ IsHardwareChange (
VOID
)
{
- EFI_STATUS Status;
- UINTN Index;
- UINTN HandleCount;
- EFI_HANDLE *HandleBuffer;
- EFI_PCI_IO_PROTOCOL *PciIo;
- UINT32 CRC;
- UINT32 *HWChange;
- UINTN HWChangeSize;
- UINT32 PciId;
- UINTN Handle;
- EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE *FacsPtr;
- EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE *pFADT;
+ EFI_STATUS Status;
+ UINTN Index;
+ UINTN HandleCount;
+ EFI_HANDLE *HandleBuffer;
+ EFI_PCI_IO_PROTOCOL *PciIo;
+ UINT32 CRC;
+ UINT32 *HWChange;
+ UINTN HWChangeSize;
+ UINT32 PciId;
+ UINTN Handle;
+ EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *FacsPtr;
+ EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *pFADT;
HandleCount = 0;
HandleBuffer = NULL;
@@ -1258,7 +1258,7 @@ IsHardwareChange (
//
Handle = 0;
Status = LocateAcpiTableBySignature (
- EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,
+ EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,
(EFI_ACPI_DESCRIPTION_HEADER **) &pFADT,
&Handle
);
@@ -1280,7 +1280,7 @@ IsHardwareChange (
//
// Set HardwareSignature value based on CRC value.
//
- FacsPtr = (EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE
*)(UINTN)pFADT->FirmwareCtrl;
+ FacsPtr = (EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)
pFADT->FirmwareCtrl;
FacsPtr->HardwareSignature = CRC;
FreePool (HWChange);
}
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
b/Platform/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.
//
-EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs = {
- EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE,
- sizeof (EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE),
+EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs = {
+ EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE,
+ sizeof (EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE),
//
// Hardware Signature will be updated at runtime
@@ -49,7 +49,7 @@ EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs = {
EFI_ACPI_GLOBAL_LOCK,
EFI_ACPI_FIRMWARE_CONTROL_STRUCTURE_FLAGS,
EFI_ACPI_X_FIRMWARE_WAKING_VECTOR,
- EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION,
+ EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION,
{
EFI_ACPI_RESERVED_BYTE,
EFI_ACPI_RESERVED_BYTE,
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
b/Platform/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
//
// PM1A Event Register Block Generic Address Information
//
-#define EFI_ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO
+#define EFI_ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO
#define EFI_ACPI_PM1A_EVT_BLK_BIT_WIDTH 0x20
#define EFI_ACPI_PM1A_EVT_BLK_BIT_OFFSET 0x00
#define EFI_ACPI_PM1A_EVT_BLK_ADDRESS 0 // To be fixed
@@ -68,7 +68,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
//
// PM1B Event Register Block Generic Address Information
//
-#define EFI_ACPI_PM1B_EVT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO
+#define EFI_ACPI_PM1B_EVT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO
#define EFI_ACPI_PM1B_EVT_BLK_BIT_WIDTH 0x00
#define EFI_ACPI_PM1B_EVT_BLK_BIT_OFFSET 0x00
#define EFI_ACPI_PM1B_EVT_BLK_ADDRESS 0 // To be fixed
@@ -76,7 +76,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
//
// PM1A Control Register Block Generic Address Information
//
-#define EFI_ACPI_PM1A_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO
+#define EFI_ACPI_PM1A_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO
#define EFI_ACPI_PM1A_CNT_BLK_BIT_WIDTH 0x10
#define EFI_ACPI_PM1A_CNT_BLK_BIT_OFFSET 0x00
#define EFI_ACPI_PM1A_CNT_BLK_ADDRESS 0 // To be fixed
@@ -84,7 +84,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
//
// PM1B Control Register Block Generic Address Information
//
-#define EFI_ACPI_PM1B_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO
+#define EFI_ACPI_PM1B_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO
#define EFI_ACPI_PM1B_CNT_BLK_BIT_WIDTH 0x00
#define EFI_ACPI_PM1B_CNT_BLK_BIT_OFFSET 0x00
#define EFI_ACPI_PM1B_CNT_BLK_ADDRESS 0 // To be fixed
@@ -92,7 +92,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
//
// PM2 Control Register Block Generic Address Information
//
-#define EFI_ACPI_PM2_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO
+#define EFI_ACPI_PM2_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO
#define EFI_ACPI_PM2_CNT_BLK_BIT_WIDTH 0x08
#define EFI_ACPI_PM2_CNT_BLK_BIT_OFFSET 0x00
#define EFI_ACPI_PM2_CNT_BLK_ADDRESS 0 // To be fixed
@@ -101,7 +101,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
// Power Management Timer Control Register Block Generic Address
// Information
//
-#define EFI_ACPI_PM_TMR_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO
+#define EFI_ACPI_PM_TMR_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO
#define EFI_ACPI_PM_TMR_BLK_BIT_WIDTH 0x20
#define EFI_ACPI_PM_TMR_BLK_BIT_OFFSET 0x00
#define EFI_ACPI_PM_TMR_BLK_ADDRESS 0 // To be fixed
@@ -110,7 +110,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
// General Purpose Event 0 Register Block Generic Address
// Information
//
-#define EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO
+#define EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO
#define EFI_ACPI_GPE0_BLK_BIT_WIDTH 0 // size of
R_PCH_ACPI_GPE0_STS_127_96 + R_PCH_ACPI_GPE0_EN_127_96
#define EFI_ACPI_GPE0_BLK_BIT_OFFSET 0x00
#define EFI_ACPI_GPE0_BLK_ADDRESS 0 // To be fixed
@@ -119,14 +119,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
// General Purpose Event 1 Register Block Generic Address
// Information
//
-#define EFI_ACPI_GPE1_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO
+#define EFI_ACPI_GPE1_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO
#define EFI_ACPI_GPE1_BLK_BIT_WIDTH 0x0
#define EFI_ACPI_GPE1_BLK_BIT_OFFSET 0x0
#define EFI_ACPI_GPE1_BLK_ADDRESS 0 // To be fixed
//
// Reset Register Generic Address Information
//
-#define EFI_ACPI_RESET_REG_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO
+#define EFI_ACPI_RESET_REG_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO
#define EFI_ACPI_RESET_REG_BIT_WIDTH 0x08
#define EFI_ACPI_RESET_REG_BIT_OFFSET 0x00
#define EFI_ACPI_RESET_REG_ADDRESS 0x00000CF9
@@ -167,11 +167,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
// Please modify all values in Fadt.h only.
//
-EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
+EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
{
- EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,
- sizeof (EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE),
- EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_REVISION,
+ EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,
+ sizeof (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE),
+ EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_REVISION,
//
// Checksum will be updated at runtime
@@ -245,13 +245,13 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
EFI_ACPI_RESET_REG_ADDRESS_SPACE_ID,
EFI_ACPI_RESET_REG_BIT_WIDTH,
EFI_ACPI_RESET_REG_BIT_OFFSET,
- EFI_ACPI_6_3_BYTE,
+ EFI_ACPI_6_5_BYTE,
EFI_ACPI_RESET_REG_ADDRESS
},
EFI_ACPI_RESET_VALUE,
EFI_ACPI_ARM_BOOT_ARCH,
- EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_MINOR_REVISION,
+ EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_MINOR_REVISION,
//
// These addresses will be updated at runtime
@@ -266,7 +266,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
EFI_ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID,
EFI_ACPI_PM1A_EVT_BLK_BIT_WIDTH,
EFI_ACPI_PM1A_EVT_BLK_BIT_OFFSET,
- EFI_ACPI_6_3_WORD,
+ EFI_ACPI_6_5_WORD,
EFI_ACPI_PM1A_EVT_BLK_ADDRESS
},
{
@@ -276,7 +276,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
EFI_ACPI_PM1B_EVT_BLK_ADDRESS_SPACE_ID,
EFI_ACPI_PM1B_EVT_BLK_BIT_WIDTH,
EFI_ACPI_PM1B_EVT_BLK_BIT_OFFSET,
- EFI_ACPI_6_3_WORD,
+ EFI_ACPI_6_5_WORD,
EFI_ACPI_PM1B_EVT_BLK_ADDRESS
},
{
@@ -286,7 +286,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
EFI_ACPI_PM1A_CNT_BLK_ADDRESS_SPACE_ID,
EFI_ACPI_PM1A_CNT_BLK_BIT_WIDTH,
EFI_ACPI_PM1A_CNT_BLK_BIT_OFFSET,
- EFI_ACPI_6_3_WORD,
+ EFI_ACPI_6_5_WORD,
EFI_ACPI_PM1A_CNT_BLK_ADDRESS
},
{
@@ -296,7 +296,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
EFI_ACPI_PM1B_CNT_BLK_ADDRESS_SPACE_ID,
EFI_ACPI_PM1B_CNT_BLK_BIT_WIDTH,
EFI_ACPI_PM1B_CNT_BLK_BIT_OFFSET,
- EFI_ACPI_6_3_WORD,
+ EFI_ACPI_6_5_WORD,
EFI_ACPI_PM1B_CNT_BLK_ADDRESS
},
{
@@ -306,7 +306,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
EFI_ACPI_PM2_CNT_BLK_ADDRESS_SPACE_ID,
EFI_ACPI_PM2_CNT_BLK_BIT_WIDTH,
EFI_ACPI_PM2_CNT_BLK_BIT_OFFSET,
- EFI_ACPI_6_3_BYTE,
+ EFI_ACPI_6_5_BYTE,
EFI_ACPI_PM2_CNT_BLK_ADDRESS
},
{
@@ -316,7 +316,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
EFI_ACPI_PM_TMR_BLK_ADDRESS_SPACE_ID,
EFI_ACPI_PM_TMR_BLK_BIT_WIDTH,
EFI_ACPI_PM_TMR_BLK_BIT_OFFSET,
- EFI_ACPI_6_3_DWORD,
+ EFI_ACPI_6_5_DWORD,
EFI_ACPI_PM_TMR_BLK_ADDRESS
},
{
@@ -326,7 +326,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID,
EFI_ACPI_GPE0_BLK_BIT_WIDTH,
EFI_ACPI_GPE0_BLK_BIT_OFFSET,
- EFI_ACPI_6_3_BYTE,
+ EFI_ACPI_6_5_BYTE,
EFI_ACPI_GPE0_BLK_ADDRESS
},
{
@@ -336,7 +336,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
EFI_ACPI_GPE1_BLK_ADDRESS_SPACE_ID,
EFI_ACPI_GPE1_BLK_BIT_WIDTH,
EFI_ACPI_GPE1_BLK_BIT_OFFSET,
- EFI_ACPI_6_3_BYTE,
+ EFI_ACPI_6_5_BYTE,
EFI_ACPI_GPE1_BLK_ADDRESS
},
{
diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
b/Platform/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
//
// Event Timer Block Base Address Information
//
-#define EFI_ACPI_EVENT_TIMER_BLOCK_ADDRESS_SPACE_ID EFI_ACPI_3_0_SYSTEM_MEMORY
+#define EFI_ACPI_EVENT_TIMER_BLOCK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_MEMORY
#define EFI_ACPI_EVENT_TIMER_BLOCK_BIT_WIDTH 0x40
#define EFI_ACPI_EVENT_TIMER_BLOCK_BIT_OFFSET 0x00
#define EFI_ACPI_EVENT_TIMER_ACCESS_SIZE 0x00
@@ -44,7 +44,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER Hpet = {
{
- EFI_ACPI_3_0_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE,
+ EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE,
sizeof (EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER),
EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_REVISION,
diff --git
a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
index 78efc8c0a7..12d19a7b7b 100644
---
a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
+++
b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
@@ -146,7 +146,7 @@ UpdateNameAslCode (
///
Handle = 0;
Status = LocateAcpiTableBySignature (
- EFI_ACPI_3_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE,
+ EFI_ACPI_6_5_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE,
(EFI_ACPI_DESCRIPTION_HEADER **) &Table,
&Handle
);
diff --git
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c
index 3d75e5012a..f0c0aaf7d2 100644
---
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c
+++
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c
@@ -28,7 +28,7 @@ UINTN
mAcpiGcdIoMapNumberOfDescrip
VOID
DumpAcpiMadt (
- IN EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt
+ IN EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt
);
VOID
@@ -63,7 +63,7 @@ DumpAcpiTcpa (
EFI_STATUS
CheckAcpiMadt (
- IN EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt
+ IN EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt
);
EFI_STATUS
@@ -187,7 +187,7 @@ DumpAcpiTableHeader (
VOID
DumpAcpiFadt (
- IN EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt
+ IN EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *Fadt
)
{
DumpAcpiTableHeader (&Fadt->Header);
@@ -201,7 +201,7 @@ DumpAcpiFadt (
EFI_STATUS
CheckAcpiFadt (
- IN EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt
+ IN EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *Fadt
)
{
if (Fadt->SmiCmd != 0) {
@@ -258,16 +258,16 @@ CheckAcpiFadt (
return EFI_NOT_STARTED;
}
}
- if (Fadt->Header.Length >
OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, ResetReg)) {
+ if (Fadt->Header.Length >
OFFSET_OF(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, ResetReg)) {
if (Fadt->ResetReg.Address != 0) {
switch (Fadt->ResetReg.AddressSpaceId) {
- case EFI_ACPI_5_0_SYSTEM_MEMORY:
+ case EFI_ACPI_6_5_SYSTEM_MEMORY:
if (!IsMmioExit (Fadt->ResetReg.Address,
Fadt->ResetReg.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.ResetReg resource (0x%x) is not reported
correctly.\n", Fadt->ResetReg.Address));
return EFI_NOT_STARTED;
}
break;
- case EFI_ACPI_5_0_SYSTEM_IO:
+ case EFI_ACPI_6_5_SYSTEM_IO:
if (!IsIoExit (Fadt->ResetReg.Address,
Fadt->ResetReg.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.ResetReg resource (0x%x) is not reported
correctly.\n", Fadt->ResetReg.Address));
return EFI_NOT_STARTED;
@@ -276,16 +276,16 @@ CheckAcpiFadt (
}
}
}
- if (Fadt->Header.Length >
OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XPm1aEvtBlk)) {
+ if (Fadt->Header.Length > OFFSET_OF
(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XPm1aEvtBlk)) {
if (Fadt->XPm1aEvtBlk.Address != 0) {
switch (Fadt->XPm1aEvtBlk.AddressSpaceId) {
- case EFI_ACPI_5_0_SYSTEM_MEMORY:
+ case EFI_ACPI_6_5_SYSTEM_MEMORY:
if (!IsMmioExit (Fadt->XPm1aEvtBlk.Address,
Fadt->XPm1aEvtBlk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XPm1aEvtBlk resource (0x%x) is not
reported correctly.\n", Fadt->XPm1aEvtBlk.Address));
return EFI_NOT_STARTED;
}
break;
- case EFI_ACPI_5_0_SYSTEM_IO:
+ case EFI_ACPI_6_5_SYSTEM_IO:
if (!IsIoExit (Fadt->XPm1aEvtBlk.Address,
Fadt->XPm1aEvtBlk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XPm1aEvtBlk resource (0x%x) is not
reported correctly.\n", Fadt->XPm1aEvtBlk.Address));
return EFI_NOT_STARTED;
@@ -294,16 +294,16 @@ CheckAcpiFadt (
}
}
}
- if (Fadt->Header.Length >
OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XPm1bEvtBlk)) {
+ if (Fadt->Header.Length > OFFSET_OF
(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XPm1bEvtBlk)) {
if (Fadt->XPm1bEvtBlk.Address != 0) {
switch (Fadt->XPm1bEvtBlk.AddressSpaceId) {
- case EFI_ACPI_5_0_SYSTEM_MEMORY:
+ case EFI_ACPI_6_5_SYSTEM_MEMORY:
if (!IsMmioExit (Fadt->XPm1bEvtBlk.Address,
Fadt->XPm1bEvtBlk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XPm1bEvtBlk resource (0x%x) is not
reported correctly.\n", Fadt->XPm1bEvtBlk.Address));
return EFI_NOT_STARTED;
}
break;
- case EFI_ACPI_5_0_SYSTEM_IO:
+ case EFI_ACPI_6_5_SYSTEM_IO:
if (!IsIoExit (Fadt->XPm1bEvtBlk.Address,
Fadt->XPm1bEvtBlk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XPm1bEvtBlk resource (0x%x) is not
reported correctly.\n", Fadt->XPm1bEvtBlk.Address));
return EFI_NOT_STARTED;
@@ -312,16 +312,16 @@ CheckAcpiFadt (
}
}
}
- if (Fadt->Header.Length >
OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XPm1aCntBlk)) {
+ if (Fadt->Header.Length > OFFSET_OF
(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XPm1aCntBlk)) {
if (Fadt->XPm1aCntBlk.Address != 0) {
switch (Fadt->XPm1aCntBlk.AddressSpaceId) {
- case EFI_ACPI_5_0_SYSTEM_MEMORY:
+ case EFI_ACPI_6_5_SYSTEM_MEMORY:
if (!IsMmioExit (Fadt->XPm1aCntBlk.Address,
Fadt->XPm1aCntBlk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XPm1aCntBlk resource (0x%x) is not
reported correctly.\n", Fadt->XPm1aCntBlk.Address));
return EFI_NOT_STARTED;
}
break;
- case EFI_ACPI_5_0_SYSTEM_IO:
+ case EFI_ACPI_6_5_SYSTEM_IO:
if (!IsIoExit (Fadt->XPm1aCntBlk.Address,
Fadt->XPm1aCntBlk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XPm1aCntBlk resource (0x%x) is not
reported correctly.\n", Fadt->XPm1aCntBlk.Address));
return EFI_NOT_STARTED;
@@ -330,16 +330,16 @@ CheckAcpiFadt (
}
}
}
- if (Fadt->Header.Length >
OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XPm1bCntBlk)) {
+ if (Fadt->Header.Length > OFFSET_OF
(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XPm1bCntBlk)) {
if (Fadt->XPm1bCntBlk.Address != 0) {
switch (Fadt->XPm1bCntBlk.AddressSpaceId) {
- case EFI_ACPI_5_0_SYSTEM_MEMORY:
+ case EFI_ACPI_6_5_SYSTEM_MEMORY:
if (!IsMmioExit (Fadt->XPm1bCntBlk.Address,
Fadt->XPm1bCntBlk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XPm1bCntBlk resource (0x%x) is not
reported correctly.\n", Fadt->XPm1bCntBlk.Address));
return EFI_NOT_STARTED;
}
break;
- case EFI_ACPI_5_0_SYSTEM_IO:
+ case EFI_ACPI_6_5_SYSTEM_IO:
if (!IsIoExit (Fadt->XPm1bCntBlk.Address,
Fadt->XPm1bCntBlk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XPm1bCntBlk resource (0x%x) is not
reported correctly.\n", Fadt->XPm1bCntBlk.Address));
return EFI_NOT_STARTED;
@@ -348,16 +348,16 @@ CheckAcpiFadt (
}
}
}
- if (Fadt->Header.Length >
OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XPm2CntBlk)) {
+ if (Fadt->Header.Length > OFFSET_OF
(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XPm2CntBlk)) {
if (Fadt->XPm2CntBlk.Address != 0) {
switch (Fadt->XPm2CntBlk.AddressSpaceId) {
- case EFI_ACPI_5_0_SYSTEM_MEMORY:
+ case EFI_ACPI_6_5_SYSTEM_MEMORY:
if (!IsMmioExit (Fadt->XPm2CntBlk.Address,
Fadt->XPm2CntBlk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XPm2CntBlk resource (0x%x) is not
reported correctly.\n", Fadt->XPm2CntBlk.Address));
return EFI_NOT_STARTED;
}
break;
- case EFI_ACPI_5_0_SYSTEM_IO:
+ case EFI_ACPI_6_5_SYSTEM_IO:
if (!IsIoExit (Fadt->XPm2CntBlk.Address,
Fadt->XPm2CntBlk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XPm2CntBlk resource (0x%x) is not
reported correctly.\n", Fadt->XPm2CntBlk.Address));
return EFI_NOT_STARTED;
@@ -366,16 +366,16 @@ CheckAcpiFadt (
}
}
}
- if (Fadt->Header.Length >
OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XPmTmrBlk)) {
+ if (Fadt->Header.Length > OFFSET_OF
(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XPmTmrBlk)) {
if (Fadt->XPmTmrBlk.Address != 0) {
switch (Fadt->XPmTmrBlk.AddressSpaceId) {
- case EFI_ACPI_5_0_SYSTEM_MEMORY:
+ case EFI_ACPI_6_5_SYSTEM_MEMORY:
if (!IsMmioExit (Fadt->XPmTmrBlk.Address,
Fadt->XPmTmrBlk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XPmTmrBlk resource (0x%x) is not reported
correctly.\n", Fadt->XPmTmrBlk.Address));
return EFI_NOT_STARTED;
}
break;
- case EFI_ACPI_5_0_SYSTEM_IO:
+ case EFI_ACPI_6_5_SYSTEM_IO:
if (!IsIoExit (Fadt->XPmTmrBlk.Address,
Fadt->XPmTmrBlk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XPmTmrBlk resource (0x%x) is not reported
correctly.\n", Fadt->XPmTmrBlk.Address));
return EFI_NOT_STARTED;
@@ -384,16 +384,16 @@ CheckAcpiFadt (
}
}
}
- if (Fadt->Header.Length >
OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XGpe0Blk)) {
+ if (Fadt->Header.Length > OFFSET_OF
(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XGpe0Blk)) {
if (Fadt->XGpe0Blk.Address != 0) {
switch (Fadt->XGpe0Blk.AddressSpaceId) {
- case EFI_ACPI_5_0_SYSTEM_MEMORY:
+ case EFI_ACPI_6_5_SYSTEM_MEMORY:
if (!IsMmioExit (Fadt->XGpe0Blk.Address,
Fadt->XGpe0Blk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XGpe0Blk resource (0x%x) is not reported
correctly.\n", Fadt->XGpe0Blk.Address));
return EFI_NOT_STARTED;
}
break;
- case EFI_ACPI_5_0_SYSTEM_IO:
+ case EFI_ACPI_6_5_SYSTEM_IO:
if (!IsIoExit (Fadt->XGpe0Blk.Address,
Fadt->XGpe0Blk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XGpe0Blk resource (0x%x) is not reported
correctly.\n", Fadt->XGpe0Blk.Address));
return EFI_NOT_STARTED;
@@ -402,16 +402,16 @@ CheckAcpiFadt (
}
}
}
- if (Fadt->Header.Length >
OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XGpe1Blk)) {
+ if (Fadt->Header.Length > OFFSET_OF
(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XGpe1Blk)) {
if (Fadt->XGpe1Blk.Address != 0) {
switch (Fadt->XGpe1Blk.AddressSpaceId) {
- case EFI_ACPI_5_0_SYSTEM_MEMORY:
+ case EFI_ACPI_6_5_SYSTEM_MEMORY:
if (!IsMmioExit (Fadt->XGpe1Blk.Address,
Fadt->XGpe1Blk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XGpe1Blk resource (0x%x) is not reported
correctly.\n", Fadt->XGpe1Blk.Address));
return EFI_NOT_STARTED;
}
break;
- case EFI_ACPI_5_0_SYSTEM_IO:
+ case EFI_ACPI_6_5_SYSTEM_IO:
if (!IsIoExit (Fadt->XGpe1Blk.Address,
Fadt->XGpe1Blk.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.XGpe1Blk resource (0x%x) is not reported
correctly.\n", Fadt->XGpe1Blk.Address));
return EFI_NOT_STARTED;
@@ -420,16 +420,16 @@ CheckAcpiFadt (
}
}
}
- if (Fadt->Header.Length >
OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, SleepControlReg)) {
+ if (Fadt->Header.Length > OFFSET_OF
(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, SleepControlReg)) {
if (Fadt->SleepControlReg.Address != 0) {
switch (Fadt->SleepControlReg.AddressSpaceId) {
- case EFI_ACPI_5_0_SYSTEM_MEMORY:
+ case EFI_ACPI_6_5_SYSTEM_MEMORY:
if (!IsMmioExit (Fadt->SleepControlReg.Address,
Fadt->SleepControlReg.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.SleepControlReg resource (0x%x) is not
reported correctly.\n", Fadt->SleepControlReg.Address));
return EFI_NOT_STARTED;
}
break;
- case EFI_ACPI_5_0_SYSTEM_IO:
+ case EFI_ACPI_6_5_SYSTEM_IO:
if (!IsIoExit (Fadt->SleepControlReg.Address,
Fadt->SleepControlReg.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.SleepControlReg resource (0x%x) is not
reported correctly.\n", Fadt->SleepControlReg.Address));
return EFI_NOT_STARTED;
@@ -438,16 +438,16 @@ CheckAcpiFadt (
}
}
}
- if (Fadt->Header.Length >
OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, SleepStatusReg)) {
+ if (Fadt->Header.Length > OFFSET_OF
(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, SleepStatusReg)) {
if (Fadt->SleepStatusReg.Address != 0) {
switch (Fadt->SleepStatusReg.AddressSpaceId) {
- case EFI_ACPI_5_0_SYSTEM_MEMORY:
+ case EFI_ACPI_6_5_SYSTEM_MEMORY:
if (!IsMmioExit (Fadt->SleepStatusReg.Address,
Fadt->SleepStatusReg.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.SleepStatusReg resource (0x%x) is not
reported correctly.\n", Fadt->SleepStatusReg.Address));
return EFI_NOT_STARTED;
}
break;
- case EFI_ACPI_5_0_SYSTEM_IO:
+ case EFI_ACPI_6_5_SYSTEM_IO:
if (!IsIoExit (Fadt->SleepStatusReg.Address,
Fadt->SleepStatusReg.RegisterBitWidth/8, TRUE)) {
DEBUG ((DEBUG_ERROR, "FADT.SleepStatusReg resource (0x%x) is not
reported correctly.\n", Fadt->SleepStatusReg.Address));
return EFI_NOT_STARTED;
@@ -461,7 +461,7 @@ CheckAcpiFadt (
VOID
DumpAcpiFacs (
- IN EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *Facs
+ IN EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *Facs
)
{
DEBUG ((DEBUG_INFO, " "));
@@ -476,21 +476,21 @@ DumpAcpiTable (
IN EFI_ACPI_DESCRIPTION_HEADER *Table
)
{
- EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt;
+ EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *Fadt;
if (Table == NULL) {
return ;
}
switch (Table->Signature) {
- case EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE:
- Fadt = (EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *)Table;
+ case EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE:
+ Fadt = (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *) Table;
DumpAcpiFadt (Fadt);
- if (Fadt->Header.Revision >=
EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION) {
+ if (Fadt->Header.Revision >=
EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_REVISION) {
if (Fadt->XFirmwareCtrl != 0) {
- DumpAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE
*)(UINTN)Fadt->XFirmwareCtrl);
+ DumpAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)
Fadt->XFirmwareCtrl);
} else {
- DumpAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE
*)(UINTN)Fadt->FirmwareCtrl);
+ DumpAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)
Fadt->FirmwareCtrl);
}
if (Fadt->XDsdt != 0) {
DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->XDsdt);
@@ -498,29 +498,29 @@ DumpAcpiTable (
DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->Dsdt);
}
} else {
- DumpAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE
*)(UINTN)Fadt->FirmwareCtrl);
+ DumpAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)
Fadt->FirmwareCtrl);
DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->Dsdt);
}
break;
- case EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE:
- DumpAcpiMadt ((EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER
*)Table);
+ case EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE:
+ DumpAcpiMadt ((EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *)
Table);
break;
- case EFI_ACPI_2_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SIGNATURE:
+ case
EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE:
DumpAcpiMcfg
((EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_HEADER *)Table);
break;
- case EFI_ACPI_3_0_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE:
- DumpAcpiHpet ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *)Table);
+ case EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE:
+ DumpAcpiHpet ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *) Table);
break;
- case EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE:
+ case EFI_ACPI_6_5_DMA_REMAPPING_TABLE_SIGNATURE:
DumpAcpiDmar ((EFI_ACPI_DMAR_HEADER *)Table);
break;
case EFI_ACPI_WINDOWS_SMM_SECURITY_MITIGATION_TABLE_SIGNATURE:
DumpAcpiWsmt ((EFI_ACPI_WSMT_TABLE *)Table);
break;
- case EFI_ACPI_5_0_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE:
+ case EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE:
DumpAcpiTpm2 ((EFI_TPM2_ACPI_TABLE *)Table);
break;
- case
EFI_ACPI_3_0_TRUSTED_COMPUTING_PLATFORM_ALLIANCE_CAPABILITIES_TABLE_SIGNATURE:
+ case
EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_ALLIANCE_CAPABILITIES_TABLE_SIGNATURE:
DumpAcpiTcpa ((VOID *)Table);
break;
default:
@@ -534,52 +534,52 @@ CheckAcpiTableResource (
IN EFI_ACPI_DESCRIPTION_HEADER *Table
)
{
- EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt;
+ EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *Fadt;
if (Table == NULL) {
return EFI_INVALID_PARAMETER;
}
switch (Table->Signature) {
- case EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE:
- Fadt = (EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *)Table;
+ case EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE:
+ Fadt = (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *) Table;
CheckAcpiFadt (Fadt);
- if (Fadt->Header.Revision >=
EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION) {
+ if (Fadt->Header.Revision >=
EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_REVISION) {
if (Fadt->XFirmwareCtrl != 0) {
- // CheckAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE
*)(UINTN)Fadt->XFirmwareCtrl);
+ // CheckAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE
*)(UINTN) Fadt->XFirmwareCtrl);
} else {
- // CheckAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE
*)(UINTN)Fadt->FirmwareCtrl);
+ // CheckAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE
*)(UINTN) Fadt->FirmwareCtrl);
}
if (Fadt->XDsdt != 0) {
- // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->XDsdt);
+ // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Fadt->XDsdt);
} else {
- // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->Dsdt);
+ // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Fadt->Dsdt);
}
} else {
- // CheckAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE
*)(UINTN)Fadt->FirmwareCtrl);
+ // CheckAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE
*)(UINTN) Fadt->FirmwareCtrl);
// CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->Dsdt);
}
break;
- case EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE:
- return CheckAcpiMadt ((EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER
*)Table);
+ case EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE:
+ return CheckAcpiMadt ((EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER
*) Table);
break;
- case EFI_ACPI_2_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SIGNATURE:
- return CheckAcpiMcfg
((EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_HEADER *)Table);
+ case
EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE:
+ return CheckAcpiMcfg
((EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_HEADER *) Table);
break;
- case EFI_ACPI_3_0_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE:
- return CheckAcpiHpet ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER
*)Table);
+ case EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE:
+ return CheckAcpiHpet ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *)
Table);
break;
- case EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE:
- return CheckAcpiDmar ((EFI_ACPI_DMAR_HEADER *)Table);
+ case EFI_ACPI_6_5_DMA_REMAPPING_TABLE_SIGNATURE:
+ return CheckAcpiDmar ((EFI_ACPI_DMAR_HEADER *) Table);
break;
case EFI_ACPI_WINDOWS_SMM_SECURITY_MITIGATION_TABLE_SIGNATURE:
// CheckAcpiWsmt ((EFI_ACPI_WSMT_TABLE *)Table);
break;
- case EFI_ACPI_5_0_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE:
- return CheckAcpiTpm2 ((EFI_TPM2_ACPI_TABLE *)Table);
+ case EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE:
+ return CheckAcpiTpm2 ((EFI_TPM2_ACPI_TABLE *) Table);
break;
- case
EFI_ACPI_3_0_TRUSTED_COMPUTING_PLATFORM_ALLIANCE_CAPABILITIES_TABLE_SIGNATURE:
- return CheckAcpiTcpa ((VOID *)Table);
+ case
EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_ALLIANCE_CAPABILITIES_TABLE_SIGNATURE:
+ return CheckAcpiTcpa ((VOID *) Table);
break;
default:
break;
@@ -701,7 +701,7 @@ DumpAcpiXsdt (
EFI_STATUS
DumpAcpiRsdp (
- IN EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER *Rsdp,
+ IN EFI_ACPI_6_5_ROOT_SYSTEM_DESCRIPTION_POINTER *Rsdp,
IN UINT32 *Signature, OPTIONAL
OUT VOID **Table,
IN BOOLEAN DumpPrint,
@@ -720,7 +720,7 @@ DumpAcpiRsdp (
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, " RSDT=0x%08x XSDT=0x%016lx\n", Rsdp->RsdtAddress,
Rsdp->XsdtAddress));
- if (Rsdp->Revision >=
EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION) {
+ if (Rsdp->Revision >=
EFI_ACPI_6_5_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION) {
DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Rsdp->XsdtAddress);
}
DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Rsdp->RsdtAddress);
@@ -729,7 +729,7 @@ DumpAcpiRsdp (
//
// Search XSDT
//
- if (Rsdp->Revision >= EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION)
{
+ if (Rsdp->Revision >= EFI_ACPI_6_5_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION)
{
Xsdt = (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Rsdp->XsdtAddress;
Status = DumpAcpiXsdt (Xsdt, Signature, Table, DumpPrint, CheckResource);
} else {
diff --git
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c
index b743bad6dd..7e29b47a0b 100644
---
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c
+++
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c
@@ -69,22 +69,22 @@ ShortNameOfMadtType(
VOID
DumpAcpiMadt (
- IN EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt
+ IN EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt
)
{
APIC_STRUCT_HEADER *ApicStructHeader;
INTN MadtLen;
- EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE *ProcessorLocalApic;
- EFI_ACPI_4_0_IO_APIC_STRUCTURE *IOApic;
- EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE
*InterruptSourceOverride;
- EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE
*NonMaskableInterruptSource;
- EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI;
- EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE
*LocalApicAddressOverride;
- EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *IOSapic;
- EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE *ProcessorLocalSapic;
- EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE
*PlatformInterruptSource;
- EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE *ProcessorLocalX2Apic;
- EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi;
+ EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *ProcessorLocalApic;
+ EFI_ACPI_6_5_IO_APIC_STRUCTURE *IOApic;
+ EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE
*InterruptSourceOverride;
+ EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE
*NonMaskableInterruptSource;
+ EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI;
+ EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE
*LocalApicAddressOverride;
+ EFI_ACPI_6_5_IO_SAPIC_STRUCTURE *IOSapic;
+ EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTURE *ProcessorLocalSapic;
+ EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES_STRUCTURE
*PlatformInterruptSource;
+ EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *ProcessorLocalX2Apic;
+ EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi;
DumpAcpiTableHeader (&Madt->Header);
DEBUG ((DEBUG_INFO, " "));
@@ -93,25 +93,25 @@ DumpAcpiMadt (
//
// Sub table
//
- MadtLen = Madt->Header.Length -
sizeof(EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER);
+ MadtLen = Madt->Header.Length -
sizeof(EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER);
ApicStructHeader = (APIC_STRUCT_HEADER *)(Madt + 1);
while (MadtLen > 0) {
switch (ApicStructHeader->Type) {
- case EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC:
- ProcessorLocalApic = (EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE
*)ApicStructHeader;
+ case EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC:
+ ProcessorLocalApic = (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *)
ApicStructHeader;
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));
DEBUG ((DEBUG_INFO, ": [0x%02x]", ApicStructHeader->Type));
- DEBUG ((DEBUG_INFO, " ID=0x%02x", ProcessorLocalApic->AcpiProcessorId));
+ DEBUG ((DEBUG_INFO, " ID=0x%02x", ProcessorLocalApic->AcpiProcessorUid));
DEBUG ((DEBUG_INFO, " ApicId=0x%02x", ProcessorLocalApic->ApicId));
- if ((ProcessorLocalApic->Flags & EFI_ACPI_4_0_LOCAL_APIC_ENABLED) != 0) {
+ if ((ProcessorLocalApic->Flags & EFI_ACPI_6_5_LOCAL_APIC_ENABLED) != 0) {
DEBUG ((DEBUG_INFO, " (Enabled)"));
}
DEBUG ((DEBUG_INFO, "\n"));
break;
- case EFI_ACPI_4_0_IO_APIC:
- IOApic = (EFI_ACPI_4_0_IO_APIC_STRUCTURE *)ApicStructHeader;
+ case EFI_ACPI_6_5_IO_APIC:
+ IOApic = (EFI_ACPI_6_5_IO_APIC_STRUCTURE *) ApicStructHeader;
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));
@@ -121,8 +121,8 @@ DumpAcpiMadt (
DEBUG ((DEBUG_INFO, " InterruptBase=0x%08x",
IOApic->GlobalSystemInterruptBase));
DEBUG ((DEBUG_INFO, "\n"));
break;
- case EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE:
- InterruptSourceOverride =
(EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *)ApicStructHeader;
+ case EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE:
+ InterruptSourceOverride =
(EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *) ApicStructHeader;
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));
@@ -133,8 +133,8 @@ DumpAcpiMadt (
DEBUG ((DEBUG_INFO, " Flags=0x%04x", InterruptSourceOverride->Flags));
DEBUG ((DEBUG_INFO, "\n"));
break;
- case EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE:
- NonMaskableInterruptSource =
(EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *)ApicStructHeader;
+ case EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE:
+ NonMaskableInterruptSource =
(EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *) ApicStructHeader;
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));
@@ -143,19 +143,19 @@ DumpAcpiMadt (
DEBUG ((DEBUG_INFO, " Flags=0x%04x", NonMaskableInterruptSource->Flags));
DEBUG ((DEBUG_INFO, "\n"));
break;
- case EFI_ACPI_4_0_LOCAL_APIC_NMI:
- LocalApicNMI = (EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *)ApicStructHeader;
+ case EFI_ACPI_6_5_LOCAL_APIC_NMI:
+ LocalApicNMI = (EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE *)
ApicStructHeader;
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));
DEBUG ((DEBUG_INFO, ": [0x%02x]", ApicStructHeader->Type));
- DEBUG ((DEBUG_INFO, " ID=0x%02x", LocalApicNMI->AcpiProcessorId));
+ DEBUG ((DEBUG_INFO, " ID=0x%02x", LocalApicNMI->AcpiProcessorUid));
DEBUG ((DEBUG_INFO, " Lint=0x%02x", LocalApicNMI->LocalApicLint));
DEBUG ((DEBUG_INFO, " Flags=0x%04x", LocalApicNMI->Flags));
DEBUG ((DEBUG_INFO, "\n"));
break;
- case EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE:
- LocalApicAddressOverride =
(EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE *)ApicStructHeader;
+ case EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE:
+ LocalApicAddressOverride =
(EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE *) ApicStructHeader;
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));
@@ -163,8 +163,8 @@ DumpAcpiMadt (
DEBUG ((DEBUG_INFO, " LocalApicAddress=0x%016lx",
LocalApicAddressOverride->LocalApicAddress));
DEBUG ((DEBUG_INFO, "\n"));
break;
- case EFI_ACPI_4_0_IO_SAPIC:
- IOSapic = (EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *)ApicStructHeader;
+ case EFI_ACPI_6_5_IO_SAPIC:
+ IOSapic = (EFI_ACPI_6_5_IO_SAPIC_STRUCTURE *) ApicStructHeader;
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));
@@ -174,8 +174,8 @@ DumpAcpiMadt (
DEBUG ((DEBUG_INFO, " IoSapicAddress=0x%016lx",
IOSapic->IoSapicAddress));
DEBUG ((DEBUG_INFO, "\n"));
break;
- case EFI_ACPI_4_0_LOCAL_SAPIC:
- ProcessorLocalSapic = (EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE
*)ApicStructHeader;
+ case EFI_ACPI_6_5_LOCAL_SAPIC:
+ ProcessorLocalSapic = (EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTURE *)
ApicStructHeader;
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));
@@ -184,13 +184,13 @@ DumpAcpiMadt (
DEBUG ((DEBUG_INFO, " LocalSapicId=0x%02x",
ProcessorLocalSapic->LocalSapicId));
DEBUG ((DEBUG_INFO, " LocalSapicEid=0x%02x",
ProcessorLocalSapic->LocalSapicEid));
DEBUG ((DEBUG_INFO, " UID=0x%08x",
ProcessorLocalSapic->ACPIProcessorUIDValue));
- if ((ProcessorLocalSapic->Flags & EFI_ACPI_5_0_LOCAL_APIC_ENABLED) != 0)
{
+ if ((ProcessorLocalSapic->Flags & EFI_ACPI_6_5_LOCAL_APIC_ENABLED) != 0)
{
DEBUG ((DEBUG_INFO, " (Enabled)"));
}
DEBUG ((DEBUG_INFO, "\n"));
break;
- case EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES:
- PlatformInterruptSource =
(EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE *)ApicStructHeader;
+ case EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES:
+ PlatformInterruptSource =
(EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES_STRUCTURE *) ApicStructHeader;
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));
@@ -204,21 +204,21 @@ DumpAcpiMadt (
DEBUG ((DEBUG_INFO, " Flags=0x%04x", PlatformInterruptSource->Flags));
DEBUG ((DEBUG_INFO, "\n"));
break;
- case EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC:
- ProcessorLocalX2Apic = (EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE
*)ApicStructHeader;
+ case EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC:
+ ProcessorLocalX2Apic = (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *)
ApicStructHeader;
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));
DEBUG ((DEBUG_INFO, ": [0x%02x]", ApicStructHeader->Type));
DEBUG ((DEBUG_INFO, " X2ApicId=0x%08x", ProcessorLocalX2Apic->X2ApicId));
DEBUG ((DEBUG_INFO, " UID=0x%08x",
ProcessorLocalX2Apic->AcpiProcessorUid));
- if ((ProcessorLocalX2Apic->Flags & EFI_ACPI_5_0_LOCAL_APIC_ENABLED) !=
0) {
+ if ((ProcessorLocalX2Apic->Flags & EFI_ACPI_6_5_LOCAL_APIC_ENABLED) !=
0) {
DEBUG ((DEBUG_INFO, " (Enabled)"));
}
DEBUG ((DEBUG_INFO, "\n"));
break;
- case EFI_ACPI_4_0_LOCAL_X2APIC_NMI:
- LocalX2ApicNmi = (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE
*)ApicStructHeader;
+ case EFI_ACPI_6_5_LOCAL_X2APIC_NMI:
+ LocalX2ApicNmi = (EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE *)
ApicStructHeader;
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, " "));
DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type)));
@@ -242,24 +242,24 @@ DumpAcpiMadt (
EFI_STATUS
CheckAcpiMadt (
- IN EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt
+ IN EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt
)
{
APIC_STRUCT_HEADER *ApicStructHeader;
INTN MadtLen;
- EFI_ACPI_4_0_IO_APIC_STRUCTURE *IOApic;
- EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE
*LocalApicAddressOverride;
- EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *IOSapic;
+ EFI_ACPI_6_5_IO_APIC_STRUCTURE *IOApic;
+ EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE
*LocalApicAddressOverride;
+ EFI_ACPI_6_5_IO_SAPIC_STRUCTURE *IOSapic;
#if 0
- EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE *ProcessorLocalApic;
- EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE
*InterruptSourceOverride;
- EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE
*NonMaskableInterruptSource;
- EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI;
- EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE *ProcessorLocalSapic;
- EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE
*PlatformInterruptSource;
- EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE *ProcessorLocalX2Apic;
- EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi;
+ EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *ProcessorLocalApic;
+ EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE
*InterruptSourceOverride;
+ EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE
*NonMaskableInterruptSource;
+ EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI;
+ EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTURE *ProcessorLocalSapic;
+ EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES_STRUCTURE
*PlatformInterruptSource;
+ EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *ProcessorLocalX2Apic;
+ EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi;
#endif
if (!IsMmioExit (Madt->LocalApicAddress, SIZE_4KB, TRUE)) {
@@ -270,55 +270,55 @@ CheckAcpiMadt (
//
// Sub table
//
- MadtLen = Madt->Header.Length -
sizeof(EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER);
+ MadtLen = Madt->Header.Length -
sizeof(EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER);
ApicStructHeader = (APIC_STRUCT_HEADER *)(Madt + 1);
while (MadtLen > 0) {
switch (ApicStructHeader->Type) {
- case EFI_ACPI_4_0_IO_APIC:
- IOApic = (EFI_ACPI_4_0_IO_APIC_STRUCTURE *)ApicStructHeader;
+ case EFI_ACPI_6_5_IO_APIC:
+ IOApic = (EFI_ACPI_6_5_IO_APIC_STRUCTURE *) ApicStructHeader;
if (!IsMmioExit (IOApic->IoApicAddress, SIZE_4KB, TRUE)) {
DEBUG ((DEBUG_ERROR, "MADT.IOAPIC resource (0x%x) is not reported
correctly.\n", IOApic->IoApicAddress));
return EFI_NOT_STARTED;
}
break;
- case EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE:
- LocalApicAddressOverride =
(EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE *)ApicStructHeader;
+ case EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE:
+ LocalApicAddressOverride =
(EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE *) ApicStructHeader;
if (!IsMmioExit (LocalApicAddressOverride->LocalApicAddress, SIZE_4KB,
TRUE)) {
DEBUG ((DEBUG_ERROR, "MADT.LocalApicOverride resource (0x%x) is not
reported correctly.\n", LocalApicAddressOverride->LocalApicAddress));
return EFI_NOT_STARTED;
}
break;
- case EFI_ACPI_4_0_IO_SAPIC:
- IOSapic = (EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *)ApicStructHeader;
+ case EFI_ACPI_6_5_IO_SAPIC:
+ IOSapic = (EFI_ACPI_6_5_IO_SAPIC_STRUCTURE *) ApicStructHeader;
if (!IsMmioExit (IOSapic->IoSapicAddress, SIZE_4KB, TRUE)) {
DEBUG ((DEBUG_ERROR, "MADT.IOSAPIC resource (0x%x) is not reported
correctly.\n", IOSapic->IoSapicAddress));
return EFI_NOT_STARTED;
}
break;
#if 0
- case EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC:
- ProcessorLocalApic = (EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE
*)ApicStructHeader;
+ case EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC:
+ ProcessorLocalApic = (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *)
ApicStructHeader;
break;
- case EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE:
- InterruptSourceOverride =
(EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *)ApicStructHeader;
+ case EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE:
+ InterruptSourceOverride =
(EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *) ApicStructHeader;
break;
- case EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE:
- NonMaskableInterruptSource =
(EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *)ApicStructHeader;
+ case EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE:
+ NonMaskableInterruptSource =
(EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *) ApicStructHeader;
break;
- case EFI_ACPI_4_0_LOCAL_APIC_NMI:
- LocalApicNMI = (EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *)ApicStructHeader;
+ case EFI_ACPI_6_5_LOCAL_APIC_NMI:
+ LocalApicNMI = (EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE *)
ApicStructHeader;
break;
- case EFI_ACPI_4_0_LOCAL_SAPIC:
- ProcessorLocalSapic = (EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE
*)ApicStructHeader;
+ case EFI_ACPI_6_5_LOCAL_SAPIC:
+ ProcessorLocalSapic = (EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTURE *)
ApicStructHeader;
break;
- case EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES:
- PlatformInterruptSource =
(EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE *)ApicStructHeader;
+ case EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES:
+ PlatformInterruptSource =
(EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES_STRUCTURE *) ApicStructHeader;
break;
- case EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC:
- ProcessorLocalX2Apic = (EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE
*)ApicStructHeader;
+ case EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC:
+ ProcessorLocalX2Apic = (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *)
ApicStructHeader;
break;
- case EFI_ACPI_4_0_LOCAL_X2APIC_NMI:
- LocalX2ApicNmi = (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE
*)ApicStructHeader;
+ case EFI_ACPI_6_5_LOCAL_X2APIC_NMI:
+ LocalX2ApicNmi = (EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE *)
ApicStructHeader;
break;
#endif
default:
diff --git
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaProtection.c
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaProtection.c
index aba0985956..285de67c93 100644
---
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaProtection.c
+++
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaProtection.c
@@ -32,7 +32,7 @@ CheckDrhd (
INTN DmarLen;
EFI_ACPI_DMAR_DRHD_HEADER *Drhd;
UINT32 Reg32;
-
+
//
// Sub table
//
@@ -73,7 +73,7 @@ TestPointVtdEngine (
Status = EFI_SUCCESS;
- Dmar = TestPointGetAcpi (EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE);
+ Dmar = TestPointGetAcpi (EFI_ACPI_6_5_DMA_REMAPPING_TABLE_SIGNATURE);
if (Dmar == NULL) {
DEBUG ((DEBUG_ERROR, "No DMAR table\n"));
Status = EFI_INVALID_PARAMETER;
diff --git
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c
index 5ec32fd2e8..eb81ba93c4 100644
---
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c
+++
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c
@@ -70,7 +70,7 @@ TestPointCheckTcgTrustedBoot (
Status = EFI_NOT_FOUND;
}
- Acpi = TestPointGetAcpi
(EFI_ACPI_5_0_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE);
+ Acpi = TestPointGetAcpi
(EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE);
if (Acpi == NULL) {
DEBUG ((DEBUG_ERROR, "Tcg2 TPM2 table not found\n"));
Status = EFI_NOT_FOUND;
diff --git
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c
index e5efbd0599..8e4030798e 100644
---
a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c
+++
b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c
@@ -281,7 +281,7 @@ TestPointEndOfDxeDmaAcpiTableFunctional (
DEBUG ((DEBUG_INFO, "======== TestPointEndOfDxeDmaAcpiTableFunctional -
Enter\n"));
- Acpi = TestPointGetAcpi (EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE);
+ Acpi = TestPointGetAcpi (EFI_ACPI_6_5_DMA_REMAPPING_TABLE_SIGNATURE);
if (Acpi == NULL) {
DEBUG ((DEBUG_ERROR, "No DMAR table\n"));
TestPointLibAppendErrorString (
--
2.34.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#104114): https://edk2.groups.io/g/devel/message/104114
Mute This Topic: https://groups.io/mt/98703821/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
