From nobody Mon Apr 29 09:08:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104664+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104664+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1683777496; cv=none; d=zohomail.com; s=zohoarc; b=cRXRgMhWGJwIgC3SP11l828n3jWNWwOsL+yXRGY17l2LlXh0AV04mH3qvbBbm/kg0Q9vg/gf6y+UGd+YYvWv8A8Gip9r8ODwgvRHFlekQ07UGJKkxYUO6ckvJW0gH9SGYHAKHerdzQcv+Cr2yDMUxDX2CeWf53jBwa1wyDj1NB8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683777496; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=sZgoVYZFFGXaPALrlTn+F2Syc7herjCRzsR4yCDJtQQ=; b=QNzblqm/SY8jal6FxO8Vp0YbXm9zWMCb5FuIfJGo4MbBFuLDBoB2rKCsxPCcYwg/3szzyfXxZRrEsb4PU9gV5fvZEPilx6dWyOLxXLJ3lkQctfRuQ/oPR11PI7iBuX34Mb4WowJv7b2ijhiDPywwurCZIz2RD94B0nXPsOJFSCs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104664+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 168377749611025.369381599847088; Wed, 10 May 2023 20:58:16 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id L7E1YY1788612x4wtIFWcAIm; Wed, 10 May 2023 20:58:15 -0700 X-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 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" X-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" X-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: [edk2-devel] [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> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,aryeh.chen@intel.com X-Gm-Message-State: kijerY0JdFP0dIg84sBodDJhx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683777495; bh=5GFd5Ldm+dwFi+o1dEHzC7CwZup7h9GyxDU1GO4Brjs=; h=Cc:Date:From:Reply-To:Subject:To; b=YKvo7/i36eRaljB8yXcXG9McC5dFW4BH0Ewx4sJ8epBCYD+OI1hEnEQyxij14QcbWwl Rw0AgyunP13g+bEzJu8NrQDRMTpZj4A4DUjAYFnJm1PAXljAFcaB1IVunbSmVxXCRVn/D d8pwXK9obTtsyIb7r7Ljf9AD3R75ZAzgKDw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683777496866100001 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Ankit Sinha --- 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; // 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 { =20 #pragma pack() =20 -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; =20 @@ -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; =20 Status =3D EFI_SUCCESS; Type =3D ((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiApicCommon.Type; - LocalApicPtr =3D (EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE *)(&((ACPI= _APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalApic); - LocalX2ApicPtr =3D (EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE *)(&((= ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalx2Apic); + LocalApicPtr =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *)(&((ACPI= _APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalApic); + LocalX2ApicPtr =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *)(&((= ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalx2Apic); =20 - if(Type =3D=3D EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC) { + if(Type =3D=3D EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC) { if(!mX2ApicEnabled) { LocalApicPtr->Flags =3D (UINT8)CpuApicIdOrderTable[LocalA= picCounter].Flags; LocalApicPtr->ApicId =3D (UINT8)CpuApicIdOrderTable[LocalA= picCounter].ApicId; @@ -112,7 +112,7 @@ AppendCpuMapTableEntry ( LocalApicPtr->AcpiProcessorUid =3D (UINT8)0xFF; Status =3D EFI_UNSUPPORTED; } - } else if(Type =3D=3D EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC) { + } else if(Type =3D=3D EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC) { if(mX2ApicEnabled) { LocalX2ApicPtr->Flags =3D (UINT8)CpuApicIdOrderTable[Loca= lApicCounter].Flags; LocalX2ApicPtr->X2ApicId =3D CpuApicIdOrderTable[LocalApicCo= unter].ApicId; @@ -215,17 +215,17 @@ typedef struct { } STRUCTURE_HEADER; =20 STRUCTURE_HEADER mMadtStructureTable[] =3D { - {EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC, sizeof (EFI_ACPI_6_3_PROCES= SOR_LOCAL_APIC_STRUCTURE)}, - {EFI_ACPI_6_3_IO_APIC, sizeof (EFI_ACPI_6_3_IO_API= C_STRUCTURE)}, - {EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE, sizeof (EFI_ACPI_6_3_INTERR= UPT_SOURCE_OVERRIDE_STRUCTURE)}, - {EFI_ACPI_6_3_NON_MASKABLE_INTERRUPT_SOURCE, sizeof (EFI_ACPI_6_3_NON_MA= SKABLE_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_SAP= IC_STRUCTURE)}, - {EFI_ACPI_6_3_LOCAL_SAPIC, sizeof (EFI_ACPI_6_3_PROCES= SOR_LOCAL_SAPIC_STRUCTURE)}, - {EFI_ACPI_6_3_PLATFORM_INTERRUPT_SOURCES, sizeof (EFI_ACPI_6_3_PLATFO= RM_INTERRUPT_SOURCES_STRUCTURE)}, - {EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC, sizeof (EFI_ACPI_6_3_PROCES= SOR_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_PROCES= SOR_LOCAL_APIC_STRUCTURE)}, + {EFI_ACPI_6_5_IO_APIC, sizeof (EFI_ACPI_6_5_IO_API= C_STRUCTURE)}, + {EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE, sizeof (EFI_ACPI_6_5_INTERR= UPT_SOURCE_OVERRIDE_STRUCTURE)}, + {EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE, sizeof (EFI_ACPI_6_5_NON_MA= SKABLE_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_SAP= IC_STRUCTURE)}, + {EFI_ACPI_6_5_LOCAL_SAPIC, sizeof (EFI_ACPI_6_5_PROCES= SOR_LOCAL_SAPIC_STRUCTURE)}, + {EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES, sizeof (EFI_ACPI_6_5_PLATFO= RM_INTERRUPT_SOURCES_STRUCTURE)}, + {EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC, sizeof (EFI_ACPI_6_5_PROCES= SOR_LOCAL_X2APIC_STRUCTURE)}, + {EFI_ACPI_6_5_LOCAL_X2APIC_NMI, sizeof (EFI_ACPI_6_5_LOCAL_= X2APIC_NMI_STRUCTURE)} }; =20 /** @@ -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 ( =20 Status =3D 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 ( } =20 MadtHeader->LocalApicAddress =3D PcdGet32(PcdLocalApicAddress); - MadtHeader->Flags =3D EFI_ACPI_6_3_PCAT_COMPAT; + MadtHeader->Flags =3D EFI_ACPI_6_5_PCAT_COMPAT; =20 return EFI_SUCCESS; } @@ -442,7 +442,7 @@ CopyStructure ( // // Initialize the number of table entries and the table based on the tab= le header passed in. // - if (Header->Signature =3D=3D EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABL= E_SIGNATURE) { + if (Header->Signature =3D=3D EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABL= E_SIGNATURE) { TableNumEntries =3D sizeof (mMadtStructureTable) / sizeof (STRUCTURE_H= EADER); StructureTable =3D mMadtStructureTable; } else { @@ -552,7 +552,7 @@ BuildAcpiTable ( return EFI_INVALID_PARAMETER; } =20 - if (AcpiHeader->Signature !=3D EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TA= BLE_SIGNATURE) { + if (AcpiHeader->Signature !=3D EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TA= BLE_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 ProcLocalX2ApicStruc= t; - 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 ProcLocalX2ApicStruc= t; + 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 Stru= ctures // - ProcLocalApicStruct.Type =3D EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC; - ProcLocalApicStruct.Length =3D sizeof (EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC= _STRUCTURE); + ProcLocalApicStruct.Type =3D EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC; + ProcLocalApicStruct.Length =3D sizeof (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC= _STRUCTURE); =20 - ProcLocalX2ApicStruct.Type =3D EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC; - ProcLocalX2ApicStruct.Length =3D sizeof (EFI_ACPI_6_3_PROCESSOR_LOCAL_X2= APIC_STRUCTURE); + ProcLocalX2ApicStruct.Type =3D EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC; + ProcLocalX2ApicStruct.Length =3D sizeof (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2= APIC_STRUCTURE); ProcLocalX2ApicStruct.Reserved[0] =3D 0; ProcLocalX2ApicStruct.Reserved[1] =3D 0; =20 @@ -760,8 +760,8 @@ InstallMadtFromScratch ( // // Build I/O APIC Structures // - IoApicStruct.Type =3D EFI_ACPI_6_3_IO_APIC; - IoApicStruct.Length =3D sizeof (EFI_ACPI_6_3_IO_APIC_STRUCTURE); + IoApicStruct.Type =3D EFI_ACPI_6_5_IO_APIC; + IoApicStruct.Length =3D sizeof (EFI_ACPI_6_5_IO_APIC_STRUCTURE); IoApicStruct.Reserved =3D 0; =20 PcIoApicEnable =3D PcdGet32 (PcdPcIoApicEnable); @@ -807,8 +807,8 @@ InstallMadtFromScratch ( // // Build Interrupt Source Override Structures // - IntSrcOverrideStruct.Type =3D EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE; - IntSrcOverrideStruct.Length =3D sizeof (EFI_ACPI_6_3_INTERRUPT_SOURCE_OV= ERRIDE_STRUCTURE); + IntSrcOverrideStruct.Type =3D EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE; + IntSrcOverrideStruct.Length =3D sizeof (EFI_ACPI_6_5_INTERRUPT_SOURCE_OV= ERRIDE_STRUCTURE); =20 // // IRQ0=3D>IRQ2 Interrupt Source Override Structure @@ -852,8 +852,8 @@ InstallMadtFromScratch ( // Build Local APIC NMI Structures // if (!mX2ApicEnabled) { - LocalApciNmiStruct.Type =3D EFI_ACPI_6_3_LOCAL_APIC_NMI; - LocalApciNmiStruct.Length =3D sizeof (EFI_ACPI_6_3_LOCAL_APIC_NMI_STRU= CTURE); + LocalApciNmiStruct.Type =3D EFI_ACPI_6_5_LOCAL_APIC_NMI; + LocalApciNmiStruct.Length =3D sizeof (EFI_ACPI_6_5_LOCAL_APIC_NMI_STRU= CTURE); LocalApciNmiStruct.AcpiProcessorUid =3D 0xFF; // Applies to all p= rocessors LocalApciNmiStruct.Flags =3D 0x0005; // Flags - Edge-tig= gered, Active High LocalApciNmiStruct.LocalApicLint =3D 0x1; @@ -874,8 +874,8 @@ InstallMadtFromScratch ( // Build Local x2APIC NMI Structure // if (mX2ApicEnabled) { - LocalX2ApicNmiStruct.Type =3D EFI_ACPI_6_3_LOCAL_X2APIC_NMI; - LocalX2ApicNmiStruct.Length =3D sizeof (EFI_ACPI_6_3_LOCAL_X2APIC_NMI_= STRUCTURE); + LocalX2ApicNmiStruct.Type =3D EFI_ACPI_6_5_LOCAL_X2APIC_NMI; + LocalX2ApicNmiStruct.Length =3D sizeof (EFI_ACPI_6_5_LOCAL_X2APIC_NMI_= STRUCTURE); LocalX2ApicNmiStruct.Flags =3D 0x000D; // Flags - Leve= l-tiggered, Active High LocalX2ApicNmiStruct.AcpiProcessorUid =3D 0xFFFFFFFF; // Applies to a= ll processors LocalX2ApicNmiStruct.LocalX2ApicLint =3D 0x01; @@ -900,7 +900,7 @@ InstallMadtFromScratch ( // Status =3D 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 ( =20 Status =3D InitializeHeader ( &McfgTable->Header, - EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BA= SE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE, + EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BA= SE_ADDRESS_DESCRIPTION_TABLE_SIGNATURE, EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_REVIS= ION, 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 !=3D EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_S= IGNATURE) { + if (Table->Signature !=3D EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE_S= IGNATURE) { TempOemId =3D (UINT8 *)PcdGetPtr(PcdAcpiDefaultOemId); CopyMem (&TableHeader->OemId, TempOemId, 6); =20 @@ -1053,9 +1053,9 @@ PlatformUpdateTables ( // Skip OEM table ID and creator information for DSDT, SSDT and PSDT t= ables, since these are // created by an ASL compiler and the creator information is useful. // - if (Table->Signature !=3D EFI_ACPI_1_0_DIFFERENTIATED_SYSTEM_DESCRIPTI= ON_TABLE_SIGNATURE && - Table->Signature !=3D EFI_ACPI_1_0_SECONDARY_SYSTEM_DESCRIPTION_TA= BLE_SIGNATURE && - Table->Signature !=3D EFI_ACPI_1_0_PERSISTENT_SYSTEM_DESCRIPTION_T= ABLE_SIGNATURE + if (Table->Signature !=3D EFI_ACPI_6_5_DIFFERENTIATED_SYSTEM_DESCRIPTI= ON_TABLE_SIGNATURE && + Table->Signature !=3D EFI_ACPI_6_5_SECONDARY_SYSTEM_DESCRIPTION_TA= BLE_SIGNATURE && + Table->Signature !=3D EFI_ACPI_6_5_PERSISTENT_SYSTEM_DESCRIPTION_T= ABLE_SIGNATURE ) { TempOemTableId =3D PcdGet64(PcdAcpiDefaultOemTableId); CopyMem (&TableHeader->OemTableId, &TempOemTableId, 8); @@ -1089,12 +1089,12 @@ PlatformUpdateTables ( // switch (Table->Signature) { =20 - case EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE: + case EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE: ASSERT(FALSE); break; =20 - case EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE: - FadtHeader =3D (EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE *) Table; + case EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE: + FadtHeader =3D (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *) Table; =20 FadtHeader->Header.Revision =3D PcdGet8 (PcdFadtMajo= rVersion); FadtHeader->PreferredPmProfile =3D PcdGet8 (PcdFadtPref= erredPmProfile); @@ -1159,7 +1159,7 @@ PlatformUpdateTables ( DEBUG ((DEBUG_INFO, " Flags 0x%x\n", FadtHeader->Flags)); break; =20 - case EFI_ACPI_6_3_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE: + case EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE: HpetTable =3D (EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *)Tabl= e; HpetBaseAddress =3D PcdGet32 (PcdHpetBaseAddress); HpetTable->BaseAddressLower32Bit.Address =3D HpetBaseAddress; @@ -1180,7 +1180,7 @@ PlatformUpdateTables ( DEBUG ((DEBUG_INFO, " HPET base 0x%x\n", PcdGet32 (PcdHpetBaseAddress= ))); break; =20 - case EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADD= RESS_DESCRIPTION_TABLE_SIGNATURE: + case EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADD= RESS_DESCRIPTION_TABLE_SIGNATURE: ASSERT (FALSE); break; =20 @@ -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; =20 HandleCount =3D 0; HandleBuffer =3D NULL; @@ -1258,7 +1258,7 @@ IsHardwareChange ( // Handle =3D 0; Status =3D 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 =3D (EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)pFADT= ->FirmwareCtrl; + FacsPtr =3D (EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN) pFAD= T->FirmwareCtrl; FacsPtr->HardwareSignature =3D CRC; FreePool (HWChange); } 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. // =20 -EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs =3D { - 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 =3D { + EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE, + sizeof (EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE), =20 // // Hardware Signature will be updated at runtime @@ -49,7 +49,7 @@ EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs =3D { 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/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 // // 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. // =20 -EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { +EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { { - 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, =20 // // Checksum will be updated at runtime @@ -245,13 +245,13 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { 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, =20 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, =20 // // These addresses will be updated at runtime @@ -266,7 +266,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { 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 =3D { 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 =3D { 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 =3D { 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 =3D { 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 =3D { 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 =3D { 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 =3D { 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/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 // // Event Timer Block Base Address Information // -#define EFI_ACPI_EVENT_TIMER_BLOCK_ADDRESS_SPACE_ID EFI_ACPI_3_0_SYSTEM_ME= MORY +#define EFI_ACPI_EVENT_TIMER_BLOCK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_ME= MORY #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 =20 EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER Hpet =3D { { - 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, =20 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 ( /// Handle =3D 0; Status =3D LocateAcpiTableBySignature ( - EFI_ACPI_3_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATUR= E, + EFI_ACPI_6_5_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATUR= E, (EFI_ACPI_DESCRIPTION_HEADER **) &Table, &Handle ); 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 gMinPlatformPkgTokenSpaceGuid.PcdFadtFlags|0x000086A5|UINT32|0x90000027 gMinPlatformPkgTokenSpaceGuid.PcdFadtMajorVersion|0x06|UINT8|0x90000030 - gMinPlatformPkgTokenSpaceGuid.PcdFadtMinorVersion|0x03|UINT8|0x90000031 + gMinPlatformPkgTokenSpaceGuid.PcdFadtMinorVersion|0x05|UINT8|0x90000031 =20 [PcdsFixedAtBuild] =20 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 =20 VOID DumpAcpiMadt ( - IN EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt + IN EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt ); =20 VOID @@ -63,7 +63,7 @@ DumpAcpiTcpa ( =20 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 ); =20 EFI_STATUS @@ -187,7 +187,7 @@ DumpAcpiTableHeader ( =20 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 ( =20 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 !=3D 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 !=3D 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.RegisterBi= tWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.ResetReg resource (0x%x) is not repor= ted 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.RegisterBitW= idth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.ResetReg resource (0x%x) is not repor= ted 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 !=3D 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.Regi= sterBitWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XPm1aEvtBlk resource (0x%x) is not re= ported 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.Regist= erBitWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XPm1aEvtBlk resource (0x%x) is not re= ported 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 !=3D 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.Regi= sterBitWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XPm1bEvtBlk resource (0x%x) is not re= ported 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.Regist= erBitWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XPm1bEvtBlk resource (0x%x) is not re= ported 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 !=3D 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.Regi= sterBitWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XPm1aCntBlk resource (0x%x) is not re= ported 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.Regist= erBitWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XPm1aCntBlk resource (0x%x) is not re= ported 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 !=3D 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.Regi= sterBitWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XPm1bCntBlk resource (0x%x) is not re= ported 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.Regist= erBitWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XPm1bCntBlk resource (0x%x) is not re= ported 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 !=3D 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.Regist= erBitWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XPm2CntBlk resource (0x%x) is not rep= orted 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.Register= BitWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XPm2CntBlk resource (0x%x) is not rep= orted 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 !=3D 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.Register= BitWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XPmTmrBlk resource (0x%x) is not repo= rted 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.RegisterBi= tWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XPmTmrBlk resource (0x%x) is not repo= rted 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 !=3D 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.RegisterBi= tWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XGpe0Blk resource (0x%x) is not repor= ted 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.RegisterBitW= idth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XGpe0Blk resource (0x%x) is not repor= ted 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 !=3D 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.RegisterBi= tWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XGpe1Blk resource (0x%x) is not repor= ted 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.RegisterBitW= idth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.XGpe1Blk resource (0x%x) is not repor= ted 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 !=3D 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->SleepControl= Reg.RegisterBitWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.SleepControlReg resource (0x%x) is no= t 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->SleepControlRe= g.RegisterBitWidth/8, TRUE)) { DEBUG ((DEBUG_ERROR, "FADT.SleepControlReg resource (0x%x) is no= t 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 !=3D 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->SleepStatusRe= g.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 ( =20 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; =20 if (Table =3D=3D NULL) { return ; } =20 switch (Table->Signature) { - case EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE: - Fadt =3D (EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *)Table; + case EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE: + Fadt =3D (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *) Table; DumpAcpiFadt (Fadt); - if (Fadt->Header.Revision >=3D EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TAB= LE_REVISION) { + if (Fadt->Header.Revision >=3D EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TAB= LE_REVISION) { if (Fadt->XFirmwareCtrl !=3D 0) { - DumpAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UIN= TN)Fadt->XFirmwareCtrl); + DumpAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UIN= TN) Fadt->XFirmwareCtrl); } else { - DumpAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UIN= TN)Fadt->FirmwareCtrl); + DumpAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UIN= TN) Fadt->FirmwareCtrl); } if (Fadt->XDsdt !=3D 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 *)T= able); + 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_SIGNATU= RE: + case EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADD= RESS_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 *)Tabl= e); + case EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE: + DumpAcpiHpet ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *) Tab= le); 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; =20 if (Table =3D=3D NULL) { return EFI_INVALID_PARAMETER; } =20 switch (Table->Signature) { - case EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE: - Fadt =3D (EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *)Table; + case EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE: + Fadt =3D (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *) Table; CheckAcpiFadt (Fadt); - if (Fadt->Header.Revision >=3D EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TAB= LE_REVISION) { + if (Fadt->Header.Revision >=3D EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TAB= LE_REVISION) { if (Fadt->XFirmwareCtrl !=3D 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 !=3D 0) { - // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->XDsd= t); + // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Fadt->XDs= dt); } else { - // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->Dsdt= ); + // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Fadt->Dsd= t); } } else { - // CheckAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(U= INTN)Fadt->FirmwareCtrl); + // CheckAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(U= INTN) 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_HE= ADER *)Table); + case EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE: + return CheckAcpiMadt ((EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HE= ADER *) Table); break; - case EFI_ACPI_2_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SIGNATU= RE: - return CheckAcpiMcfg ((EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRE= SS_TABLE_HEADER *)Table); + case EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BASE_ADD= RESS_DESCRIPTION_TABLE_SIGNATURE: + return CheckAcpiMcfg ((EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRE= SS_TABLE_HEADER *) Table); break; - case EFI_ACPI_3_0_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE: - return CheckAcpiHpet ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADE= R *)Table); + case EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE: + return CheckAcpiHpet ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADE= R *) 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 ( =20 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=3D0x%08x XSDT=3D0x%016lx\n", Rsdp->RsdtAddr= ess, Rsdp->XsdtAddress)); =20 - if (Rsdp->Revision >=3D EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_R= EVISION) { + if (Rsdp->Revision >=3D EFI_ACPI_6_5_ROOT_SYSTEM_DESCRIPTION_POINTER_R= EVISION) { DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Rsdp->XsdtAddre= ss); } DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Rsdp->RsdtAddress= ); @@ -729,7 +729,7 @@ DumpAcpiRsdp ( // // Search XSDT // - if (Rsdp->Revision >=3D EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REV= ISION) { + if (Rsdp->Revision >=3D EFI_ACPI_6_5_ROOT_SYSTEM_DESCRIPTION_POINTER_REV= ISION) { Xsdt =3D (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Rsdp->XsdtAddress; Status =3D DumpAcpiXsdt (Xsdt, Signature, Table, DumpPrint, CheckResou= rce); } else { 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( =20 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 *ProcessorLocalApi= c; - EFI_ACPI_4_0_IO_APIC_STRUCTURE *IOApic; - EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *InterruptSourceOv= erride; - EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *NonMaskableInterr= uptSource; - EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI; - EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE *LocalApicAddressO= verride; - EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *IOSapic; - EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE *ProcessorLocalSap= ic; - EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE *PlatformInterrupt= Source; - EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE *ProcessorLocalX2A= pic; - EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi; + EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *ProcessorLocalApi= c; + EFI_ACPI_6_5_IO_APIC_STRUCTURE *IOApic; + EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *InterruptSourceOv= erride; + EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *NonMaskableInterr= uptSource; + EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI; + EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE *LocalApicAddressO= verride; + EFI_ACPI_6_5_IO_SAPIC_STRUCTURE *IOSapic; + EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTURE *ProcessorLocalSap= ic; + EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES_STRUCTURE *PlatformInterrupt= Source; + EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *ProcessorLocalX2A= pic; + EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi; =20 DumpAcpiTableHeader (&Madt->Header); DEBUG ((DEBUG_INFO, " ")); @@ -93,25 +93,25 @@ DumpAcpiMadt ( // // Sub table // - MadtLen =3D Madt->Header.Length - sizeof(EFI_ACPI_4_0_MULTIPLE_APIC_DES= CRIPTION_TABLE_HEADER); + MadtLen =3D Madt->Header.Length - sizeof(EFI_ACPI_6_5_MULTIPLE_APIC_DES= CRIPTION_TABLE_HEADER); ApicStructHeader =3D (APIC_STRUCT_HEADER *)(Madt + 1); while (MadtLen > 0) { switch (ApicStructHeader->Type) { - case EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC: - ProcessorLocalApic =3D (EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE = *)ApicStructHeader; + case EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC: + ProcessorLocalApic =3D (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=3D0x%02x", ProcessorLocalApic->AcpiProcesso= rId)); + DEBUG ((DEBUG_INFO, " ID=3D0x%02x", ProcessorLocalApic->AcpiProcesso= rUid)); DEBUG ((DEBUG_INFO, " ApicId=3D0x%02x", ProcessorLocalApic->ApicId)); - if ((ProcessorLocalApic->Flags & EFI_ACPI_4_0_LOCAL_APIC_ENABLED) != =3D 0) { + if ((ProcessorLocalApic->Flags & EFI_ACPI_6_5_LOCAL_APIC_ENABLED) != =3D 0) { DEBUG ((DEBUG_INFO, " (Enabled)")); } DEBUG ((DEBUG_INFO, "\n")); break; - case EFI_ACPI_4_0_IO_APIC: - IOApic =3D (EFI_ACPI_4_0_IO_APIC_STRUCTURE *)ApicStructHeader; + case EFI_ACPI_6_5_IO_APIC: + IOApic =3D (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=3D0x%08x", IOApic->GlobalSystemI= nterruptBase)); DEBUG ((DEBUG_INFO, "\n")); break; - case EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE: - InterruptSourceOverride =3D (EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_= STRUCTURE *)ApicStructHeader; + case EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE: + InterruptSourceOverride =3D (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=3D0x%04x", InterruptSourceOverride->Flag= s)); DEBUG ((DEBUG_INFO, "\n")); break; - case EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE: - NonMaskableInterruptSource =3D (EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_= SOURCE_STRUCTURE *)ApicStructHeader; + case EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE: + NonMaskableInterruptSource =3D (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=3D0x%04x", NonMaskableInterruptSource->F= lags)); DEBUG ((DEBUG_INFO, "\n")); break; - case EFI_ACPI_4_0_LOCAL_APIC_NMI: - LocalApicNMI =3D (EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *)ApicStruct= Header; + case EFI_ACPI_6_5_LOCAL_APIC_NMI: + LocalApicNMI =3D (EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE *) ApicStruc= tHeader; DEBUG ((DEBUG_INFO, " ")); DEBUG ((DEBUG_INFO, " ")); DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); DEBUG ((DEBUG_INFO, ": [0x%02x]", ApicStructHeader->Type)); - DEBUG ((DEBUG_INFO, " ID=3D0x%02x", LocalApicNMI->AcpiProcessorId)); + DEBUG ((DEBUG_INFO, " ID=3D0x%02x", LocalApicNMI->AcpiProcessorUid)); DEBUG ((DEBUG_INFO, " Lint=3D0x%02x", LocalApicNMI->LocalApicLint)); DEBUG ((DEBUG_INFO, " Flags=3D0x%04x", LocalApicNMI->Flags)); DEBUG ((DEBUG_INFO, "\n")); break; - case EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE: - LocalApicAddressOverride =3D (EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRI= DE_STRUCTURE *)ApicStructHeader; + case EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE: + LocalApicAddressOverride =3D (EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRI= DE_STRUCTURE *) ApicStructHeader; DEBUG ((DEBUG_INFO, " ")); DEBUG ((DEBUG_INFO, " ")); DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); @@ -163,8 +163,8 @@ DumpAcpiMadt ( DEBUG ((DEBUG_INFO, " LocalApicAddress=3D0x%016lx", LocalApicAddress= Override->LocalApicAddress)); DEBUG ((DEBUG_INFO, "\n")); break; - case EFI_ACPI_4_0_IO_SAPIC: - IOSapic =3D (EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *)ApicStructHeader; + case EFI_ACPI_6_5_IO_SAPIC: + IOSapic =3D (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=3D0x%016lx", IOSapic->IoSapicAd= dress)); DEBUG ((DEBUG_INFO, "\n")); break; - case EFI_ACPI_4_0_LOCAL_SAPIC: - ProcessorLocalSapic =3D (EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTUR= E *)ApicStructHeader; + case EFI_ACPI_6_5_LOCAL_SAPIC: + ProcessorLocalSapic =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTUR= E *) ApicStructHeader; DEBUG ((DEBUG_INFO, " ")); DEBUG ((DEBUG_INFO, " ")); DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); @@ -184,13 +184,13 @@ DumpAcpiMadt ( DEBUG ((DEBUG_INFO, " LocalSapicId=3D0x%02x", ProcessorLocalSapic->L= ocalSapicId)); DEBUG ((DEBUG_INFO, " LocalSapicEid=3D0x%02x", ProcessorLocalSapic->= LocalSapicEid)); DEBUG ((DEBUG_INFO, " UID=3D0x%08x", ProcessorLocalSapic->ACPIProces= sorUIDValue)); - if ((ProcessorLocalSapic->Flags & EFI_ACPI_5_0_LOCAL_APIC_ENABLED) != =3D 0) { + if ((ProcessorLocalSapic->Flags & EFI_ACPI_6_5_LOCAL_APIC_ENABLED) != =3D 0) { DEBUG ((DEBUG_INFO, " (Enabled)")); } DEBUG ((DEBUG_INFO, "\n")); break; - case EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES: - PlatformInterruptSource =3D (EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES= _STRUCTURE *)ApicStructHeader; + case EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES: + PlatformInterruptSource =3D (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=3D0x%04x", PlatformInterruptSource->Flag= s)); DEBUG ((DEBUG_INFO, "\n")); break; - case EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC: - ProcessorLocalX2Apic =3D (EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCT= URE *)ApicStructHeader; + case EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC: + ProcessorLocalX2Apic =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCT= URE *) ApicStructHeader; DEBUG ((DEBUG_INFO, " ")); DEBUG ((DEBUG_INFO, " ")); DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); DEBUG ((DEBUG_INFO, ": [0x%02x]", ApicStructHeader->Type)); DEBUG ((DEBUG_INFO, " X2ApicId=3D0x%08x", ProcessorLocalX2Apic->X2Ap= icId)); DEBUG ((DEBUG_INFO, " UID=3D0x%08x", ProcessorLocalX2Apic->AcpiProce= ssorUid)); - if ((ProcessorLocalX2Apic->Flags & EFI_ACPI_5_0_LOCAL_APIC_ENABLED) = !=3D 0) { + if ((ProcessorLocalX2Apic->Flags & EFI_ACPI_6_5_LOCAL_APIC_ENABLED) = !=3D 0) { DEBUG ((DEBUG_INFO, " (Enabled)")); } DEBUG ((DEBUG_INFO, "\n")); break; - case EFI_ACPI_4_0_LOCAL_X2APIC_NMI: - LocalX2ApicNmi =3D (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE *)ApicSt= ructHeader; + case EFI_ACPI_6_5_LOCAL_X2APIC_NMI: + LocalX2ApicNmi =3D (EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE *) ApicS= tructHeader; DEBUG ((DEBUG_INFO, " ")); DEBUG ((DEBUG_INFO, " ")); DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); @@ -242,24 +242,24 @@ DumpAcpiMadt ( =20 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 ) { =20 APIC_STRUCT_HEADER *ApicStructHeader; INTN MadtLen; - EFI_ACPI_4_0_IO_APIC_STRUCTURE *IOApic; - EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE *LocalApicAddressO= verride; - 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 *LocalApicAddressO= verride; + EFI_ACPI_6_5_IO_SAPIC_STRUCTURE *IOSapic; #if 0 - EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE *ProcessorLocalApi= c; - EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *InterruptSourceOv= erride; - EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *NonMaskableInterr= uptSource; - EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI; - EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE *ProcessorLocalSap= ic; - EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE *PlatformInterrupt= Source; - EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE *ProcessorLocalX2A= pic; - EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi; + EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *ProcessorLocalApi= c; + EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE *InterruptSourceOv= erride; + EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE *NonMaskableInterr= uptSource; + EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI; + EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTURE *ProcessorLocalSap= ic; + EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES_STRUCTURE *PlatformInterrupt= Source; + EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *ProcessorLocalX2A= pic; + EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi; #endif =20 if (!IsMmioExit (Madt->LocalApicAddress, SIZE_4KB, TRUE)) { @@ -270,55 +270,55 @@ CheckAcpiMadt ( // // Sub table // - MadtLen =3D Madt->Header.Length - sizeof(EFI_ACPI_4_0_MULTIPLE_APIC_DES= CRIPTION_TABLE_HEADER); + MadtLen =3D Madt->Header.Length - sizeof(EFI_ACPI_6_5_MULTIPLE_APIC_DES= CRIPTION_TABLE_HEADER); ApicStructHeader =3D (APIC_STRUCT_HEADER *)(Madt + 1); while (MadtLen > 0) { switch (ApicStructHeader->Type) { - case EFI_ACPI_4_0_IO_APIC: - IOApic =3D (EFI_ACPI_4_0_IO_APIC_STRUCTURE *)ApicStructHeader; + case EFI_ACPI_6_5_IO_APIC: + IOApic =3D (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 =3D (EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRI= DE_STRUCTURE *)ApicStructHeader; + case EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE: + LocalApicAddressOverride =3D (EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRI= DE_STRUCTURE *) ApicStructHeader; if (!IsMmioExit (LocalApicAddressOverride->LocalApicAddress, SIZE_4K= B, TRUE)) { DEBUG ((DEBUG_ERROR, "MADT.LocalApicOverride resource (0x%x) is no= t reported correctly.\n", LocalApicAddressOverride->LocalApicAddress)); return EFI_NOT_STARTED; } break; - case EFI_ACPI_4_0_IO_SAPIC: - IOSapic =3D (EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *)ApicStructHeader; + case EFI_ACPI_6_5_IO_SAPIC: + IOSapic =3D (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 =3D (EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE = *)ApicStructHeader; + case EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC: + ProcessorLocalApic =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE = *) ApicStructHeader; break; - case EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE: - InterruptSourceOverride =3D (EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_= STRUCTURE *)ApicStructHeader; + case EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE: + InterruptSourceOverride =3D (EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_= STRUCTURE *) ApicStructHeader; break; - case EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE: - NonMaskableInterruptSource =3D (EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_= SOURCE_STRUCTURE *)ApicStructHeader; + case EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE: + NonMaskableInterruptSource =3D (EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_= SOURCE_STRUCTURE *) ApicStructHeader; break; - case EFI_ACPI_4_0_LOCAL_APIC_NMI: - LocalApicNMI =3D (EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *)ApicStruct= Header; + case EFI_ACPI_6_5_LOCAL_APIC_NMI: + LocalApicNMI =3D (EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE *) ApicStruc= tHeader; break; - case EFI_ACPI_4_0_LOCAL_SAPIC: - ProcessorLocalSapic =3D (EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTUR= E *)ApicStructHeader; + case EFI_ACPI_6_5_LOCAL_SAPIC: + ProcessorLocalSapic =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTUR= E *) ApicStructHeader; break; - case EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES: - PlatformInterruptSource =3D (EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES= _STRUCTURE *)ApicStructHeader; + case EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES: + PlatformInterruptSource =3D (EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES= _STRUCTURE *) ApicStructHeader; break; - case EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC: - ProcessorLocalX2Apic =3D (EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCT= URE *)ApicStructHeader; + case EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC: + ProcessorLocalX2Apic =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCT= URE *) ApicStructHeader; break; - case EFI_ACPI_4_0_LOCAL_X2APIC_NMI: - LocalX2ApicNmi =3D (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE *)ApicSt= ructHeader; + case EFI_ACPI_6_5_LOCAL_X2APIC_NMI: + LocalX2ApicNmi =3D (EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE *) ApicS= tructHeader; break; #endif default: 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; EFI_ACPI_DMAR_DRHD_HEADER *Drhd; UINT32 Reg32; - =20 + // // Sub table // @@ -73,7 +73,7 @@ TestPointVtdEngine ( =20 Status =3D EFI_SUCCESS; =20 - Dmar =3D TestPointGetAcpi (EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE); + Dmar =3D TestPointGetAcpi (EFI_ACPI_6_5_DMA_REMAPPING_TABLE_SIGNATURE); if (Dmar =3D=3D NULL) { DEBUG ((DEBUG_ERROR, "No DMAR table\n")); Status =3D EFI_INVALID_PARAMETER; 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; } =20 - Acpi =3D TestPointGetAcpi (EFI_ACPI_5_0_TRUSTED_COMPUTING_PLATFORM_2_TAB= LE_SIGNATURE); + Acpi =3D TestPointGetAcpi (EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_2_TAB= LE_SIGNATURE); if (Acpi =3D=3D NULL) { DEBUG ((DEBUG_ERROR, "Tcg2 TPM2 table not found\n")); Status =3D EFI_NOT_FOUND; 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 ( =20 DEBUG ((DEBUG_INFO, "=3D=3D=3D=3D=3D=3D=3D=3D TestPointEndOfDxeDmaAcpiTa= bleFunctional - Enter\n")); =20 - Acpi =3D TestPointGetAcpi (EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE); + Acpi =3D TestPointGetAcpi (EFI_ACPI_6_5_DMA_REMAPPING_TABLE_SIGNATURE); if (Acpi =3D=3D NULL) { DEBUG ((DEBUG_ERROR, "No DMAR table\n")); TestPointLibAppendErrorString ( --=20 2.34.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104664): https://edk2.groups.io/g/devel/message/104664 Mute This Topic: https://groups.io/mt/98821097/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-