From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.16080.1683246017351796986 for ; Thu, 04 May 2023 17:20:17 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=l8u5ezn8; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: chasel.chiu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683246017; x=1714782017; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=qjMkI6vCcD0XgYbMMfAlFLHctqJs90E2i6gmUSpf0FU=; b=l8u5ezn8kTgAlHYbFI3/w3mBn2y8NOF3Cs1yN1vE0TxlXD96Wa7hk//S qn2sp11PqRD6/+gg/YLtG4wY2pPOhxTz9ZhXGZrjuGeYKKWG3tFxE7QYo Qt5uWaR7+cmCiQDLs+ag5awRplqh6R8hgA6wYP8kgJweRwJopdJWh2AR7 hcMlrs0uAK8ElXRl3CgIVHOoT5j9kLqkUz5TctHIBf2aT4ymH4NcGHCk2 VClaoUQun+GS6Qbm5leGovIECvsoXincO2hCUSxbxy/fWBEkYurPTS2Kd EP8XX0gpz25omb+SOSGwiJTYWQsg6Esz3q7piqXPoXzrGTGI4xF9jTtaS Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10700"; a="338270524" X-IronPort-AV: E=Sophos;i="5.99,250,1677571200"; d="scan'208";a="338270524" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2023 17:20:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10700"; a="647578989" X-IronPort-AV: E=Sophos;i="5.99,250,1677571200"; d="scan'208";a="647578989" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga003.jf.intel.com with ESMTP; 04 May 2023 17:20:16 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 4 May 2023 17:20:16 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 4 May 2023 17:20:15 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Thu, 4 May 2023 17:20:15 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.105) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Thu, 4 May 2023 17:20:15 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NtAv3mqOXJKaPXYKlwZj59Uy/zRUHmTEb1ImiE1xBf9w0ftLB+1nV1OThfHXO/aGNXkEV1llhTUDBItXaU1rur8SGeEpe7gFDmQalqPgL6PHcI9Z067cxA69RvkndCpga3fpyiDxET8r+cCC1gEvtnXWUVdwDPl11En7r1aOGKr2SneVlcIpg2va5sxbnsWenV4L6+7u+3sR+ETJB2a/HV7+cQLDKanxEbiAhuEpdA+BU/R4pX5XRG6noAIujHPxzQkG0MnvTO22/3gkJPnrHlf6EPD5b2ih6sBqXAuRZBmDVwYkNhjLbpWduP2tNyXxWcF5T7gtm7DMmJrivEE76w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=40n9sOs0iAMdGEH/jRgtShbXgmI0nAvFpSKWZqHI1bQ=; b=AjAJqt2lw4sJJx35108fxmoYVqz5hlh7ZtLb4dCrftvdPTOjAKjmXsH/ZRMQaQhNCIXV/kHqbknT+jrc1JLjtJfVwHdrnv3EOBxX7dJZvsOTRE6Ss4Vtja4WHtf237z+NnJCSXLPkbUZvF7MVsLSRT1/MR6UagBWRRG38lKoXsAoCTbK2J29+zGbqWtTarvefJPi1q2O4MnoUgPatg8EUxhXjScD3cnFiXcGaLa3T1yl50El7xg37o5fl0ELXCVCmczShW3wKFcK31t4o5imkUH0pioKG9MOXiUMVg+AclhbJMljhe8a2jryswghZBYrX7Ld/u6HvgiTnDew17u/KQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BN9PR11MB5483.namprd11.prod.outlook.com (2603:10b6:408:104::10) by DS0PR11MB6375.namprd11.prod.outlook.com (2603:10b6:8:c9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.22; Fri, 5 May 2023 00:20:12 +0000 Received: from BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::1eb1:2222:1823:8e7a]) by BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::1eb1:2222:1823:8e7a%7]) with mapi id 15.20.6363.026; Fri, 5 May 2023 00:20:12 +0000 From: "Chiu, Chasel" To: "Chen, Aryeh" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" , "Oram, Isaac W" , "Gao, Liming" , "Dong, Eric" , "Yao, Jiewen" Subject: Re: [PATCH v1] MinPlatformPkg: Update ACPI 6.5 definition Thread-Topic: [PATCH v1] MinPlatformPkg: Update ACPI 6.5 definition Thread-Index: AQHZfqtu3qfgLWuKIEKu6V5Xn4srU69K0Tow Date: Fri, 5 May 2023 00:20:12 +0000 Message-ID: References: <20230504171102.1036-1-aryeh.chen@intel.com> In-Reply-To: <20230504171102.1036-1-aryeh.chen@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BN9PR11MB5483:EE_|DS0PR11MB6375:EE_ x-ms-office365-filtering-correlation-id: 898b889b-99b3-48a3-0b41-08db4cfe7df4 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: j4r4HVFZKAHq66NSRCn14H4yaHnPXRo83wwT84CQvLLYlbz5edT4n04yyjgBGC8M9GW3Xrhs2yihJFitT96mzYB5+ik5EZc3wzqw+NFK5cAhF+hZ0YIA3uCkRPpbRhO4vzNpvI8d9l0wAiFFMfjtd9nmBbSKFPBTAmW51vv6OHLHrysmLvEulINPWfA79SJ7nUv5rNsz/M2fgkfDtcvl9D8iqOxt7M4uGEE5pkRXBuTqVvS4fmftfa70IN4fCmdd8cZP2HozS8usaWZqUwCA7wwRwO/LbtD2NNbQonlFpzDsuUy3Hhv+x5Uhyi6vjygUBaQF/obtppiqok+vgXe7eH+19jZJ5m9gI4/udsZyd6L2sK8L7S7Jskzn2bn9xVzpkE9Fyvh3eIzXxLpY8UP1C5+Zk37s2CudrHrFHuipJkCzC0b8hT6P/lC+YMyo/d3slUkPIHwZZjK4bwe1HFzk8DJ+rm1+vCVeyk0B9nY8SliTvaP4WAP3zwP1uiKZzFk4R/bEdXLaeckII76GYMbzpHxDg4Q2zLAVZX+nOeXeFWjYLtRCqWpGNDut3yQfgFTPmbfOiTfUIYixSggHbbjERu8Hf8NR843LgXC+dcU1vmU= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN9PR11MB5483.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(366004)(346002)(136003)(376002)(39860400002)(451199021)(66946007)(8676002)(8936002)(966005)(38070700005)(41300700001)(82960400001)(4326008)(66446008)(66476007)(64756008)(66556008)(33656002)(76116006)(55016003)(316002)(38100700002)(122000001)(478600001)(71200400001)(110136005)(54906003)(19627235002)(7696005)(2906002)(30864003)(15650500001)(52536014)(5660300002)(53546011)(9686003)(86362001)(26005)(186003)(107886003)(83380400001)(6506007)(559001)(579004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?A3oXqJD2rcWkQGjAMhmJbOPfjFEebmo40cRVh1Y7zpNsiFf78e01ZV/xnHhN?= =?us-ascii?Q?hi31PxPdMPgCpXKEbMCu5VI/r97t/FdiSCD7KdVpVTXojzrHzaerij5sf2+h?= =?us-ascii?Q?BMBjSa59ytktIe0LF7dAhjF4yzlFOgZ3lQfECM/iL2s0CPZfra/no42cYKsZ?= =?us-ascii?Q?7Zsz/QoitGQL3VHrQrFX0XwGWuB8RGTuzF8ZRFHOXg7X6mFMLlPa3G5+c0dt?= =?us-ascii?Q?hU8o/rrWT3RFw2B1CDZcGhGa1LavR7VxYMVNy+e6U9BIfvv7UAsTiZQPSbmY?= =?us-ascii?Q?bokuxMTsGYRl9wwHt3dD3bvGVdcFqAZq5J3s9sHjTmsf8XYe40l5RgwM49lB?= =?us-ascii?Q?8WGyexueRQZNh3DvdIIZHjT3zOEQ0R9ryQZ1bYxNaYa2Wpo6dzHKuANeNTum?= =?us-ascii?Q?/1ousoIfv0Vq3KeRT9nQIiMJZAPs9lTyrHaz0zVlJRiiIUMgwXxdP2vj73SO?= =?us-ascii?Q?F7OcpyQQy/xxbqsVSg8fEQeViM6xSrgUane2GfpghYqKL1IAb0SIdBg9T8LB?= =?us-ascii?Q?U8nmfj0ch5LSuMBN4s8UUIGAVyC8/7bocINoTcj9t+oUOLlA8MRQEmvOmTa/?= =?us-ascii?Q?hpFiYy4dg+b4fII9+8w3A5oJxEtCxt1Mavqm0TP2o/wNuFel/VetnDiLIVTQ?= =?us-ascii?Q?kFKICwupEnYXjKi1BseIo8mICCefm8nfNk5ytQimQu+vbFV2Zjk91w65QMKB?= =?us-ascii?Q?ZdHT5FVWVJ2LjnEdj9BF8htAjDGCYKv522zw4IbCm4TLQvqQZ/fghZMuG557?= =?us-ascii?Q?O6uCAtC29X0LEl+1GKJ5amtkNanprd/4l+2EV7azf8MWG475sLYfodxVd3z6?= =?us-ascii?Q?xmAiq98wcOClUoq/3G066MtgggfMcGNVagdOjFc76FOC9v2CU3c8nmRYodaa?= =?us-ascii?Q?Vfdw59FC+BmZcf4xmUZkyNNdtFC6jbdclCPswLE2RfZ9rRyIFO6xXTkbtEcQ?= =?us-ascii?Q?fwA02dvKGUkOOMAPMvKT1e1f7crDgvgfUxj8KlwmsRUsAAzrHaHWuy7clCXB?= =?us-ascii?Q?HbziDhkAVtRyI81luWgaxsBfwUeVGH+19nT4Z9G7xexqp3C4qmtA4MxyqLgm?= =?us-ascii?Q?h93s/YNH+//eyUnI5gGkUexS54p5NQJc080ifBO+rRtUiGQzAC0xS4viFIIu?= =?us-ascii?Q?4yRSW8gl92xoUvF2q+zXhuc1+gGYedDTQahjPmTW0Dwr9M+t3HOyeY2Tu+pT?= =?us-ascii?Q?fG2GRt9JHdyIPuv1YytgjD8mT9MaUUuNCQdbiWkEtUyZ04r8c8RnTHKWTpkY?= =?us-ascii?Q?iX3ZnPF0Yb1BZQyiyQvf1SS2cmctZE74oIX1/RwfkOOQR2fK6j5/QWo2hNb5?= =?us-ascii?Q?QqW8845cYH/bF3oVsN+saBGNdXto789whwIrMH/C1R5V3LZ9a4jHT6TblBRm?= =?us-ascii?Q?8u17KRe6y+r6qTQR/cDYKGcvG3xthBdsOI5u6//i4xP7f34Jj0pBErJ54fxl?= =?us-ascii?Q?2qg1za0H9oP74P97LZ/9pjCkKcycClzbvVqPA+uy0DUfVsHZxz6sy+WOunSi?= =?us-ascii?Q?94y9t3K5kD/0vQKI4H/bB/inVtMX75VP3o7dLeQhntqKNIiagYdg/zcbXZDf?= =?us-ascii?Q?yJxWm2ht96AjDvZpjzO8xzQLg5dA3r7WTWhzbxp9?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5483.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 898b889b-99b3-48a3-0b41-08db4cfe7df4 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 May 2023 00:20:12.1601 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 443QDGne+nGozNrFcVxbcxlwc1+DPqQyAMYBIuTD37UhmLFD2lCyy/s3+7OY9NjF8JxYvwgSnYmYLn3uUh0a7Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB6375 Return-Path: chasel.chiu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Chasel Chiu Thanks, Chasel > -----Original Message----- > From: Chen, Aryeh > Sent: Thursday, May 4, 2023 10:11 AM > To: devel@edk2.groups.io > Cc: Chen, Aryeh ; Chiu, Chasel > ; Desimone, Nathaniel L > ; Oram, Isaac W ; > Gao, Liming ; Dong, Eric ; > Yao, Jiewen > Subject: [PATCH v1] MinPlatformPkg: Update ACPI 6.5 definition >=20 > From: Aryeh Chen >=20 > https://bugzilla.tianocore.org/show_bug.cgi?id=3D4442 >=20 > Update ACPI 6.5 definition on MinPlatformPkg >=20 > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Isaac Oram > Cc: Liming Gao > Cc: Eric Dong > Cc: Jiewen Yao >=20 > Signed-off-by: Aryeh Chen > --- > Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c = | > 128 ++++++++--------- > 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 +- >=20 > Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLi= b > .c | 2 +- >=20 > Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi= .c > | 138 +++++++++--------- >=20 > Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi > Madt.c | 146 ++++++++++---------- >=20 > Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDmaP > rotection.c | 4 +- >=20 > Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgT= r > ustedBoot.c | 2 +- >=20 > Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPoint= Ch > eckLib.c | 2 +- > 10 files changed, 240 insertions(+), 240 deletions(-) >=20 > diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c > b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c > index e967031a3b..d3e8f8f154 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; >=20 > // >=20 > typedef union { >=20 > - EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE AcpiLocalApic; >=20 > - EFI_ACPI_6_3_IO_APIC_STRUCTURE AcpiIoApic; >=20 > - EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE AcpiLocalx2Apic; >=20 > + EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE AcpiLocalApic; >=20 > + EFI_ACPI_6_5_IO_APIC_STRUCTURE AcpiIoApic; >=20 > + EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE AcpiLocalx2Apic; >=20 > struct { >=20 > UINT8 Type; >=20 > UINT8 Length; >=20 > @@ -38,8 +38,8 @@ typedef union { >=20 >=20 > #pragma pack() >=20 >=20 >=20 > -extern EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs; >=20 > -extern EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt; >=20 > +extern EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs; >=20 > +extern EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE Fadt; >=20 > extern EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER Hpet; >=20 > extern EFI_ACPI_WSMT_TABLE Wsmt; >=20 >=20 >=20 > @@ -92,16 +92,16 @@ AppendCpuMapTableEntry ( > ) >=20 > { >=20 > EFI_STATUS Status; >=20 > - EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE *LocalApicPtr; >=20 > - EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE *LocalX2ApicPtr; >=20 > + EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *LocalApicPtr; >=20 > + EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *LocalX2ApicPtr; >=20 > UINT8 Type; >=20 >=20 >=20 > Status =3D EFI_SUCCESS; >=20 > Type =3D ((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiApicCommon.Type; >=20 > - LocalApicPtr =3D (EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE > *)(&((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalApic); >=20 > - LocalX2ApicPtr =3D (EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE > *)(&((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalx2Apic); >=20 > + LocalApicPtr =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE > *)(&((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalApic); >=20 > + LocalX2ApicPtr =3D (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE > *)(&((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalx2Apic); >=20 >=20 >=20 > - if(Type =3D=3D EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC) { >=20 > + if(Type =3D=3D EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC) { >=20 > if(!mX2ApicEnabled) { >=20 > LocalApicPtr->Flags =3D > (UINT8)CpuApicIdOrderTable[LocalApicCounter].Flags; >=20 > LocalApicPtr->ApicId =3D > (UINT8)CpuApicIdOrderTable[LocalApicCounter].ApicId; >=20 > @@ -112,7 +112,7 @@ AppendCpuMapTableEntry ( > LocalApicPtr->AcpiProcessorUid =3D (UINT8)0xFF; >=20 > Status =3D EFI_UNSUPPORTED; >=20 > } >=20 > - } else if(Type =3D=3D EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC) { >=20 > + } else if(Type =3D=3D EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC) { >=20 > if(mX2ApicEnabled) { >=20 > LocalX2ApicPtr->Flags =3D > (UINT8)CpuApicIdOrderTable[LocalApicCounter].Flags; >=20 > LocalX2ApicPtr->X2ApicId =3D > CpuApicIdOrderTable[LocalApicCounter].ApicId; >=20 > @@ -215,17 +215,17 @@ typedef struct { > } STRUCTURE_HEADER; >=20 >=20 >=20 > STRUCTURE_HEADER mMadtStructureTable[] =3D { >=20 > - {EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC, sizeof > (EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE)}, >=20 > - {EFI_ACPI_6_3_IO_APIC, sizeof > (EFI_ACPI_6_3_IO_APIC_STRUCTURE)}, >=20 > - {EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE, sizeof > (EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE)}, >=20 > - {EFI_ACPI_6_3_NON_MASKABLE_INTERRUPT_SOURCE, sizeof > (EFI_ACPI_6_3_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE)}, >=20 > - {EFI_ACPI_6_3_LOCAL_APIC_NMI, sizeof > (EFI_ACPI_6_3_LOCAL_APIC_NMI_STRUCTURE)}, >=20 > - {EFI_ACPI_6_3_LOCAL_APIC_ADDRESS_OVERRIDE, sizeof > (EFI_ACPI_6_3_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE)}, >=20 > - {EFI_ACPI_6_3_IO_SAPIC, sizeof > (EFI_ACPI_6_3_IO_SAPIC_STRUCTURE)}, >=20 > - {EFI_ACPI_6_3_LOCAL_SAPIC, sizeof > (EFI_ACPI_6_3_PROCESSOR_LOCAL_SAPIC_STRUCTURE)}, >=20 > - {EFI_ACPI_6_3_PLATFORM_INTERRUPT_SOURCES, sizeof > (EFI_ACPI_6_3_PLATFORM_INTERRUPT_SOURCES_STRUCTURE)}, >=20 > - {EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC, sizeof > (EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE)}, >=20 > - {EFI_ACPI_6_3_LOCAL_X2APIC_NMI, sizeof > (EFI_ACPI_6_3_LOCAL_X2APIC_NMI_STRUCTURE)} >=20 > + {EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC, sizeof > (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE)}, >=20 > + {EFI_ACPI_6_5_IO_APIC, sizeof > (EFI_ACPI_6_5_IO_APIC_STRUCTURE)}, >=20 > + {EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE, sizeof > (EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE)}, >=20 > + {EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE, sizeof > (EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE)}, >=20 > + {EFI_ACPI_6_5_LOCAL_APIC_NMI, sizeof > (EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE)}, >=20 > + {EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE, sizeof > (EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE)}, >=20 > + {EFI_ACPI_6_5_IO_SAPIC, sizeof > (EFI_ACPI_6_5_IO_SAPIC_STRUCTURE)}, >=20 > + {EFI_ACPI_6_5_LOCAL_SAPIC, sizeof > (EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTURE)}, >=20 > + {EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES, sizeof > (EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES_STRUCTURE)}, >=20 > + {EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC, sizeof > (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE)}, >=20 > + {EFI_ACPI_6_5_LOCAL_X2APIC_NMI, sizeof > (EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE)} >=20 > }; >=20 >=20 >=20 > /** >=20 > @@ -384,7 +384,7 @@ InitializeHeader ( > **/ >=20 > EFI_STATUS >=20 > InitializeMadtHeader ( >=20 > - IN OUT EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER > *MadtHeader >=20 > + IN OUT EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER > *MadtHeader >=20 > ) >=20 > { >=20 > EFI_STATUS Status; >=20 > @@ -396,8 +396,8 @@ InitializeMadtHeader ( >=20 >=20 > Status =3D InitializeHeader ( >=20 > &MadtHeader->Header, >=20 > - EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, >=20 > - EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION, >=20 > + EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, >=20 > + EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION, >=20 > 0 >=20 > ); >=20 > if (EFI_ERROR (Status)) { >=20 > @@ -405,7 +405,7 @@ InitializeMadtHeader ( > } >=20 >=20 >=20 > MadtHeader->LocalApicAddress =3D PcdGet32(PcdLocalApicAddress); >=20 > - MadtHeader->Flags =3D EFI_ACPI_6_3_PCAT_COMPAT; >=20 > + MadtHeader->Flags =3D EFI_ACPI_6_5_PCAT_COMPAT; >=20 >=20 >=20 > return EFI_SUCCESS; >=20 > } >=20 > @@ -442,7 +442,7 @@ CopyStructure ( > // >=20 > // Initialize the number of table entries and the table based on the t= able header > passed in. >=20 > // >=20 > - if (Header->Signature =3D=3D > EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE) { >=20 > + if (Header->Signature =3D=3D > EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE) { >=20 > TableNumEntries =3D sizeof (mMadtStructureTable) / sizeof > (STRUCTURE_HEADER); >=20 > StructureTable =3D mMadtStructureTable; >=20 > } else { >=20 > @@ -552,7 +552,7 @@ BuildAcpiTable ( > return EFI_INVALID_PARAMETER; >=20 > } >=20 >=20 >=20 > - if (AcpiHeader->Signature !=3D > EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE) { >=20 > + if (AcpiHeader->Signature !=3D > EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE) { >=20 > DEBUG (( >=20 > DEBUG_ERROR, >=20 > "MADT header signature is expected, actually 0x%08x\n", >=20 > @@ -643,15 +643,15 @@ InstallMadtFromScratch ( > { >=20 > EFI_STATUS Status; >=20 > UINTN Index; >=20 > - EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER > *NewMadtTable; >=20 > + EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER > *NewMadtTable; >=20 > UINTN TableHandle; >=20 > - EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER > MadtTableHeader; >=20 > - EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE > ProcLocalApicStruct; >=20 > - EFI_ACPI_6_3_IO_APIC_STRUCTURE IoApicStruct; >=20 > - EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE > IntSrcOverrideStruct; >=20 > - EFI_ACPI_6_3_LOCAL_APIC_NMI_STRUCTURE LocalApciNmiStruct= ; >=20 > - EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE > ProcLocalX2ApicStruct; >=20 > - EFI_ACPI_6_3_LOCAL_X2APIC_NMI_STRUCTURE LocalX2ApicNmiStru= ct; >=20 > + EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER > MadtTableHeader; >=20 > + EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE > ProcLocalApicStruct; >=20 > + EFI_ACPI_6_5_IO_APIC_STRUCTURE IoApicStruct; >=20 > + EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE > IntSrcOverrideStruct; >=20 > + EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE LocalApciNmiStruct= ; >=20 > + EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE > ProcLocalX2ApicStruct; >=20 > + EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE LocalX2ApicNmiStru= ct; >=20 > EFI_CPU_ID_ORDER_MAP *CpuApicIdOrderTab= le; >=20 > STRUCTURE_HEADER **MadtStructs; >=20 > UINTN MaxMadtStructCount= ; >=20 > @@ -714,11 +714,11 @@ InstallMadtFromScratch ( > // >=20 > // Build Processor Local APIC Structures and Processor Local X2APIC St= ructures >=20 > // >=20 > - ProcLocalApicStruct.Type =3D EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC; >=20 > - ProcLocalApicStruct.Length =3D sizeof > (EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE); >=20 > + ProcLocalApicStruct.Type =3D EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC; >=20 > + ProcLocalApicStruct.Length =3D sizeof > (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE); >=20 >=20 >=20 > - ProcLocalX2ApicStruct.Type =3D EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC; >=20 > - ProcLocalX2ApicStruct.Length =3D sizeof > (EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE); >=20 > + ProcLocalX2ApicStruct.Type =3D EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC; >=20 > + ProcLocalX2ApicStruct.Length =3D sizeof > (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE); >=20 > ProcLocalX2ApicStruct.Reserved[0] =3D 0; >=20 > ProcLocalX2ApicStruct.Reserved[1] =3D 0; >=20 >=20 >=20 > @@ -760,8 +760,8 @@ InstallMadtFromScratch ( > // >=20 > // Build I/O APIC Structures >=20 > // >=20 > - IoApicStruct.Type =3D EFI_ACPI_6_3_IO_APIC; >=20 > - IoApicStruct.Length =3D sizeof (EFI_ACPI_6_3_IO_APIC_STRUCTURE); >=20 > + IoApicStruct.Type =3D EFI_ACPI_6_5_IO_APIC; >=20 > + IoApicStruct.Length =3D sizeof (EFI_ACPI_6_5_IO_APIC_STRUCTURE); >=20 > IoApicStruct.Reserved =3D 0; >=20 >=20 >=20 > PcIoApicEnable =3D PcdGet32 (PcdPcIoApicEnable); >=20 > @@ -807,8 +807,8 @@ InstallMadtFromScratch ( > // >=20 > // Build Interrupt Source Override Structures >=20 > // >=20 > - IntSrcOverrideStruct.Type =3D EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE; >=20 > - IntSrcOverrideStruct.Length =3D sizeof > (EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE); >=20 > + IntSrcOverrideStruct.Type =3D EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE; >=20 > + IntSrcOverrideStruct.Length =3D sizeof > (EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE); >=20 >=20 >=20 > // >=20 > // IRQ0=3D>IRQ2 Interrupt Source Override Structure >=20 > @@ -852,8 +852,8 @@ InstallMadtFromScratch ( > // Build Local APIC NMI Structures >=20 > // >=20 > if (!mX2ApicEnabled) { >=20 > - LocalApciNmiStruct.Type =3D EFI_ACPI_6_3_LOCAL_APIC_NMI; >=20 > - LocalApciNmiStruct.Length =3D sizeof > (EFI_ACPI_6_3_LOCAL_APIC_NMI_STRUCTURE); >=20 > + LocalApciNmiStruct.Type =3D EFI_ACPI_6_5_LOCAL_APIC_NMI; >=20 > + LocalApciNmiStruct.Length =3D sizeof > (EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE); >=20 > LocalApciNmiStruct.AcpiProcessorUid =3D 0xFF; // Applies to all= processors >=20 > LocalApciNmiStruct.Flags =3D 0x0005; // Flags - Edge-t= iggered, Active > High >=20 > LocalApciNmiStruct.LocalApicLint =3D 0x1; >=20 > @@ -874,8 +874,8 @@ InstallMadtFromScratch ( > // Build Local x2APIC NMI Structure >=20 > // >=20 > if (mX2ApicEnabled) { >=20 > - LocalX2ApicNmiStruct.Type =3D EFI_ACPI_6_3_LOCAL_X2APIC_NMI; >=20 > - LocalX2ApicNmiStruct.Length =3D sizeof > (EFI_ACPI_6_3_LOCAL_X2APIC_NMI_STRUCTURE); >=20 > + LocalX2ApicNmiStruct.Type =3D EFI_ACPI_6_5_LOCAL_X2APIC_NMI; >=20 > + LocalX2ApicNmiStruct.Length =3D sizeof > (EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE); >=20 > LocalX2ApicNmiStruct.Flags =3D 0x000D; // Flags - Le= vel-tiggered, > Active High >=20 > LocalX2ApicNmiStruct.AcpiProcessorUid =3D 0xFFFFFFFF; // Applies to= all > processors >=20 > LocalX2ApicNmiStruct.LocalX2ApicLint =3D 0x01; >=20 > @@ -900,7 +900,7 @@ InstallMadtFromScratch ( > // >=20 > Status =3D BuildAcpiTable ( >=20 > (EFI_ACPI_DESCRIPTION_HEADER *) &MadtTableHeader, >=20 > - sizeof (EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER)= , >=20 > + sizeof (EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER)= , >=20 > MadtStructs, >=20 > MadtStructsIndex, >=20 > (UINT8 **)&NewMadtTable >=20 > @@ -970,7 +970,7 @@ InstallMcfgFromScratch ( >=20 >=20 > Status =3D InitializeHeader ( >=20 > &McfgTable->Header, >=20 > - > EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BAS > E_ADDRESS_DESCRIPTION_TABLE_SIGNATURE, >=20 > + > EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BAS > E_ADDRESS_DESCRIPTION_TABLE_SIGNATURE, >=20 >=20 > EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_SPACE_ACCESS_TABLE_REVISI > ON, >=20 > FixedPcdGet32 (PcdAcpiDefaultOemRevision) >=20 > ); >=20 > @@ -1027,7 +1027,7 @@ PlatformUpdateTables ( > EFI_ACPI_DESCRIPTION_HEADER *TableHeader; >=20 > UINT8 *TempOemId; >=20 > UINT64 TempOemTableId; >=20 > - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE *FadtHeader; >=20 > + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *FadtHeader; >=20 > EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *HpetTable; >=20 > UINT32 HpetBaseAddress; >=20 > EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_BLOCK_ID HpetBlockId; >=20 > @@ -1045,7 +1045,7 @@ PlatformUpdateTables ( > // >=20 > // Update the OEM and creator information for every table except FACS. >=20 > // >=20 > - if (Table->Signature !=3D > EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) { >=20 > + if (Table->Signature !=3D > EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) { >=20 > TempOemId =3D (UINT8 *)PcdGetPtr(PcdAcpiDefaultOemId); >=20 > CopyMem (&TableHeader->OemId, TempOemId, 6); >=20 >=20 >=20 > @@ -1053,9 +1053,9 @@ PlatformUpdateTables ( > // Skip OEM table ID and creator information for DSDT, SSDT and PSDT= tables, > since these are >=20 > // created by an ASL compiler and the creator information is useful. >=20 > // >=20 > - if (Table->Signature !=3D > EFI_ACPI_1_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE > && >=20 > - Table->Signature !=3D > EFI_ACPI_1_0_SECONDARY_SYSTEM_DESCRIPTION_TABLE_SIGNATURE && >=20 > - Table->Signature !=3D > EFI_ACPI_1_0_PERSISTENT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE >=20 > + if (Table->Signature !=3D > EFI_ACPI_6_5_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE > && >=20 > + Table->Signature !=3D > EFI_ACPI_6_5_SECONDARY_SYSTEM_DESCRIPTION_TABLE_SIGNATURE && >=20 > + Table->Signature !=3D > EFI_ACPI_6_5_PERSISTENT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE >=20 > ) { >=20 > TempOemTableId =3D PcdGet64(PcdAcpiDefaultOemTableId); >=20 > CopyMem (&TableHeader->OemTableId, &TempOemTableId, 8); >=20 > @@ -1089,12 +1089,12 @@ PlatformUpdateTables ( > // >=20 > switch (Table->Signature) { >=20 >=20 >=20 > - case EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE: >=20 > + case EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE: >=20 > ASSERT(FALSE); >=20 > break; >=20 >=20 >=20 > - case EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE: >=20 > - FadtHeader =3D (EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE *) Table; >=20 > + case EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE: >=20 > + FadtHeader =3D (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *) Table; >=20 >=20 >=20 > FadtHeader->Header.Revision =3D PcdGet8 (PcdFadtMa= jorVersion); >=20 > FadtHeader->PreferredPmProfile =3D PcdGet8 > (PcdFadtPreferredPmProfile); >=20 > @@ -1159,7 +1159,7 @@ PlatformUpdateTables ( > DEBUG ((DEBUG_INFO, " Flags 0x%x\n", FadtHeader->Flags)); >=20 > break; >=20 >=20 >=20 > - case EFI_ACPI_6_3_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE: >=20 > + case EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE: >=20 > HpetTable =3D (EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER > *)Table; >=20 > HpetBaseAddress =3D PcdGet32 (PcdHpetBaseAddress); >=20 > HpetTable->BaseAddressLower32Bit.Address =3D HpetBaseAddress; >=20 > @@ -1180,7 +1180,7 @@ PlatformUpdateTables ( > DEBUG ((DEBUG_INFO, " HPET base 0x%x\n", PcdGet32 > (PcdHpetBaseAddress))); >=20 > break; >=20 >=20 >=20 > - case > EFI_ACPI_3_0_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BAS > E_ADDRESS_DESCRIPTION_TABLE_SIGNATURE: >=20 > + case > EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BAS > E_ADDRESS_DESCRIPTION_TABLE_SIGNATURE: >=20 > ASSERT (FALSE); >=20 > break; >=20 >=20 >=20 > @@ -1211,8 +1211,8 @@ IsHardwareChange ( > UINTN HWChangeSize; >=20 > UINT32 PciId; >=20 > UINTN Handle; >=20 > - EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE *FacsPtr; >=20 > - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE *pFADT; >=20 > + EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *FacsPtr; >=20 > + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *pFADT; >=20 >=20 >=20 > HandleCount =3D 0; >=20 > HandleBuffer =3D NULL; >=20 > @@ -1258,7 +1258,7 @@ IsHardwareChange ( > // >=20 > Handle =3D 0; >=20 > Status =3D LocateAcpiTableBySignature ( >=20 > - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, >=20 > + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, >=20 > (EFI_ACPI_DESCRIPTION_HEADER **) &pFADT, >=20 > &Handle >=20 > ); >=20 > @@ -1280,7 +1280,7 @@ IsHardwareChange ( > // >=20 > // Set HardwareSignature value based on CRC value. >=20 > // >=20 > - FacsPtr =3D (EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE > *)(UINTN)pFADT->FirmwareCtrl; >=20 > + FacsPtr =3D (EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE > *)(UINTN)pFADT->FirmwareCtrl; >=20 > FacsPtr->HardwareSignature =3D CRC; >=20 > FreePool (HWChange); >=20 > } >=20 > 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. >=20 > // >=20 >=20 >=20 > -EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs =3D { >=20 > - EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE, >=20 > - sizeof (EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE), >=20 > +EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs =3D { >=20 > + EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE, >=20 > + sizeof (EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE), >=20 >=20 >=20 > // >=20 > // Hardware Signature will be updated at runtime >=20 > @@ -49,7 +49,7 @@ EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE > Facs =3D { > EFI_ACPI_GLOBAL_LOCK, >=20 > EFI_ACPI_FIRMWARE_CONTROL_STRUCTURE_FLAGS, >=20 > EFI_ACPI_X_FIRMWARE_WAKING_VECTOR, >=20 > - EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION, >=20 > + EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION, >=20 > { >=20 > EFI_ACPI_RESERVED_BYTE, >=20 > EFI_ACPI_RESERVED_BYTE, >=20 > 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 > // >=20 > // PM1A Event Register Block Generic Address Information >=20 > // >=20 > -#define EFI_ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO >=20 > +#define EFI_ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_5_SYSTEM_IO >=20 > #define EFI_ACPI_PM1A_EVT_BLK_BIT_WIDTH 0x20 >=20 > #define EFI_ACPI_PM1A_EVT_BLK_BIT_OFFSET 0x00 >=20 > #define EFI_ACPI_PM1A_EVT_BLK_ADDRESS 0 // To be fixed >=20 > @@ -68,7 +68,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > // >=20 > // PM1B Event Register Block Generic Address Information >=20 > // >=20 > -#define EFI_ACPI_PM1B_EVT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO >=20 > +#define EFI_ACPI_PM1B_EVT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_5_SYSTEM_IO >=20 > #define EFI_ACPI_PM1B_EVT_BLK_BIT_WIDTH 0x00 >=20 > #define EFI_ACPI_PM1B_EVT_BLK_BIT_OFFSET 0x00 >=20 > #define EFI_ACPI_PM1B_EVT_BLK_ADDRESS 0 // To be fixed >=20 > @@ -76,7 +76,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > // >=20 > // PM1A Control Register Block Generic Address Information >=20 > // >=20 > -#define EFI_ACPI_PM1A_CNT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO >=20 > +#define EFI_ACPI_PM1A_CNT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_5_SYSTEM_IO >=20 > #define EFI_ACPI_PM1A_CNT_BLK_BIT_WIDTH 0x10 >=20 > #define EFI_ACPI_PM1A_CNT_BLK_BIT_OFFSET 0x00 >=20 > #define EFI_ACPI_PM1A_CNT_BLK_ADDRESS 0 // To be fixed >=20 > @@ -84,7 +84,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > // >=20 > // PM1B Control Register Block Generic Address Information >=20 > // >=20 > -#define EFI_ACPI_PM1B_CNT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO >=20 > +#define EFI_ACPI_PM1B_CNT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_5_SYSTEM_IO >=20 > #define EFI_ACPI_PM1B_CNT_BLK_BIT_WIDTH 0x00 >=20 > #define EFI_ACPI_PM1B_CNT_BLK_BIT_OFFSET 0x00 >=20 > #define EFI_ACPI_PM1B_CNT_BLK_ADDRESS 0 // To be fixed >=20 > @@ -92,7 +92,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > // >=20 > // PM2 Control Register Block Generic Address Information >=20 > // >=20 > -#define EFI_ACPI_PM2_CNT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO >=20 > +#define EFI_ACPI_PM2_CNT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_5_SYSTEM_IO >=20 > #define EFI_ACPI_PM2_CNT_BLK_BIT_WIDTH 0x08 >=20 > #define EFI_ACPI_PM2_CNT_BLK_BIT_OFFSET 0x00 >=20 > #define EFI_ACPI_PM2_CNT_BLK_ADDRESS 0 // To be fixed >=20 > @@ -101,7 +101,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > // Power Management Timer Control Register Block Generic Address >=20 > // Information >=20 > // >=20 > -#define EFI_ACPI_PM_TMR_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO >=20 > +#define EFI_ACPI_PM_TMR_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_5_SYSTEM_IO >=20 > #define EFI_ACPI_PM_TMR_BLK_BIT_WIDTH 0x20 >=20 > #define EFI_ACPI_PM_TMR_BLK_BIT_OFFSET 0x00 >=20 > #define EFI_ACPI_PM_TMR_BLK_ADDRESS 0 // To be fixed >=20 > @@ -110,7 +110,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > // General Purpose Event 0 Register Block Generic Address >=20 > // Information >=20 > // >=20 > -#define EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO >=20 > +#define EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO >=20 > #define EFI_ACPI_GPE0_BLK_BIT_WIDTH 0 // size of > R_PCH_ACPI_GPE0_STS_127_96 + R_PCH_ACPI_GPE0_EN_127_96 >=20 > #define EFI_ACPI_GPE0_BLK_BIT_OFFSET 0x00 >=20 > #define EFI_ACPI_GPE0_BLK_ADDRESS 0 // To be fixed >=20 > @@ -119,14 +119,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > // General Purpose Event 1 Register Block Generic Address >=20 > // Information >=20 > // >=20 > -#define EFI_ACPI_GPE1_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO >=20 > +#define EFI_ACPI_GPE1_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO >=20 > #define EFI_ACPI_GPE1_BLK_BIT_WIDTH 0x0 >=20 > #define EFI_ACPI_GPE1_BLK_BIT_OFFSET 0x0 >=20 > #define EFI_ACPI_GPE1_BLK_ADDRESS 0 // To be fixed >=20 > // >=20 > // Reset Register Generic Address Information >=20 > // >=20 > -#define EFI_ACPI_RESET_REG_ADDRESS_SPACE_ID EFI_ACPI_6_3_SYSTEM_IO >=20 > +#define EFI_ACPI_RESET_REG_ADDRESS_SPACE_ID EFI_ACPI_6_5_SYSTEM_IO >=20 > #define EFI_ACPI_RESET_REG_BIT_WIDTH 0x08 >=20 > #define EFI_ACPI_RESET_REG_BIT_OFFSET 0x00 >=20 > #define EFI_ACPI_RESET_REG_ADDRESS 0x00000CF9 >=20 > @@ -167,11 +167,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > // Please modify all values in Fadt.h only. >=20 > // >=20 >=20 >=20 > -EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { >=20 > +EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { >=20 > { >=20 > - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, >=20 > - sizeof (EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE), >=20 > - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_REVISION, >=20 > + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, >=20 > + sizeof (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE), >=20 > + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_REVISION, >=20 >=20 >=20 > // >=20 > // Checksum will be updated at runtime >=20 > @@ -245,13 +245,13 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE > Fadt =3D { > EFI_ACPI_RESET_REG_ADDRESS_SPACE_ID, >=20 > EFI_ACPI_RESET_REG_BIT_WIDTH, >=20 > EFI_ACPI_RESET_REG_BIT_OFFSET, >=20 > - EFI_ACPI_6_3_BYTE, >=20 > + EFI_ACPI_6_5_BYTE, >=20 > EFI_ACPI_RESET_REG_ADDRESS >=20 > }, >=20 > EFI_ACPI_RESET_VALUE, >=20 >=20 >=20 > EFI_ACPI_ARM_BOOT_ARCH, >=20 > - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_MINOR_REVISION, >=20 > + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_MINOR_REVISION, >=20 >=20 >=20 > // >=20 > // These addresses will be updated at runtime >=20 > @@ -266,7 +266,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D > { > EFI_ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID, >=20 > EFI_ACPI_PM1A_EVT_BLK_BIT_WIDTH, >=20 > EFI_ACPI_PM1A_EVT_BLK_BIT_OFFSET, >=20 > - EFI_ACPI_6_3_WORD, >=20 > + EFI_ACPI_6_5_WORD, >=20 > EFI_ACPI_PM1A_EVT_BLK_ADDRESS >=20 > }, >=20 > { >=20 > @@ -276,7 +276,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D > { > EFI_ACPI_PM1B_EVT_BLK_ADDRESS_SPACE_ID, >=20 > EFI_ACPI_PM1B_EVT_BLK_BIT_WIDTH, >=20 > EFI_ACPI_PM1B_EVT_BLK_BIT_OFFSET, >=20 > - EFI_ACPI_6_3_WORD, >=20 > + EFI_ACPI_6_5_WORD, >=20 > EFI_ACPI_PM1B_EVT_BLK_ADDRESS >=20 > }, >=20 > { >=20 > @@ -286,7 +286,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D > { > EFI_ACPI_PM1A_CNT_BLK_ADDRESS_SPACE_ID, >=20 > EFI_ACPI_PM1A_CNT_BLK_BIT_WIDTH, >=20 > EFI_ACPI_PM1A_CNT_BLK_BIT_OFFSET, >=20 > - EFI_ACPI_6_3_WORD, >=20 > + EFI_ACPI_6_5_WORD, >=20 > EFI_ACPI_PM1A_CNT_BLK_ADDRESS >=20 > }, >=20 > { >=20 > @@ -296,7 +296,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D > { > EFI_ACPI_PM1B_CNT_BLK_ADDRESS_SPACE_ID, >=20 > EFI_ACPI_PM1B_CNT_BLK_BIT_WIDTH, >=20 > EFI_ACPI_PM1B_CNT_BLK_BIT_OFFSET, >=20 > - EFI_ACPI_6_3_WORD, >=20 > + EFI_ACPI_6_5_WORD, >=20 > EFI_ACPI_PM1B_CNT_BLK_ADDRESS >=20 > }, >=20 > { >=20 > @@ -306,7 +306,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D > { > EFI_ACPI_PM2_CNT_BLK_ADDRESS_SPACE_ID, >=20 > EFI_ACPI_PM2_CNT_BLK_BIT_WIDTH, >=20 > EFI_ACPI_PM2_CNT_BLK_BIT_OFFSET, >=20 > - EFI_ACPI_6_3_BYTE, >=20 > + EFI_ACPI_6_5_BYTE, >=20 > EFI_ACPI_PM2_CNT_BLK_ADDRESS >=20 > }, >=20 > { >=20 > @@ -316,7 +316,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D > { > EFI_ACPI_PM_TMR_BLK_ADDRESS_SPACE_ID, >=20 > EFI_ACPI_PM_TMR_BLK_BIT_WIDTH, >=20 > EFI_ACPI_PM_TMR_BLK_BIT_OFFSET, >=20 > - EFI_ACPI_6_3_DWORD, >=20 > + EFI_ACPI_6_5_DWORD, >=20 > EFI_ACPI_PM_TMR_BLK_ADDRESS >=20 > }, >=20 > { >=20 > @@ -326,7 +326,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D > { > EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID, >=20 > EFI_ACPI_GPE0_BLK_BIT_WIDTH, >=20 > EFI_ACPI_GPE0_BLK_BIT_OFFSET, >=20 > - EFI_ACPI_6_3_BYTE, >=20 > + EFI_ACPI_6_5_BYTE, >=20 > EFI_ACPI_GPE0_BLK_ADDRESS >=20 > }, >=20 > { >=20 > @@ -336,7 +336,7 @@ EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D > { > EFI_ACPI_GPE1_BLK_ADDRESS_SPACE_ID, >=20 > EFI_ACPI_GPE1_BLK_BIT_WIDTH, >=20 > EFI_ACPI_GPE1_BLK_BIT_OFFSET, >=20 > - EFI_ACPI_6_3_BYTE, >=20 > + EFI_ACPI_6_5_BYTE, >=20 > EFI_ACPI_GPE1_BLK_ADDRESS >=20 > }, >=20 > { >=20 > 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 > // >=20 > // Event Timer Block Base Address Information >=20 > // >=20 > -#define EFI_ACPI_EVENT_TIMER_BLOCK_ADDRESS_SPACE_ID > EFI_ACPI_3_0_SYSTEM_MEMORY >=20 > +#define EFI_ACPI_EVENT_TIMER_BLOCK_ADDRESS_SPACE_ID > EFI_ACPI_6_5_SYSTEM_MEMORY >=20 > #define EFI_ACPI_EVENT_TIMER_BLOCK_BIT_WIDTH 0x40 >=20 > #define EFI_ACPI_EVENT_TIMER_BLOCK_BIT_OFFSET 0x00 >=20 > #define EFI_ACPI_EVENT_TIMER_ACCESS_SIZE 0x00 >=20 > @@ -44,7 +44,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >=20 >=20 > EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER Hpet =3D { >=20 > { >=20 > - EFI_ACPI_3_0_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE, >=20 > + EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE, >=20 > sizeof (EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER), >=20 > EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_REVISION, >=20 >=20 >=20 > diff --git > a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdate > Lib.c > b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdate > Lib.c > index 78efc8c0a7..12d19a7b7b 100644 > --- > a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdate > Lib.c > +++ > b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdate > Lib.c > @@ -146,7 +146,7 @@ UpdateNameAslCode ( > /// >=20 > Handle =3D 0; >=20 > Status =3D LocateAcpiTableBySignature ( >=20 > - > EFI_ACPI_3_0_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE, >=20 > + > EFI_ACPI_6_5_DIFFERENTIATED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE, >=20 > (EFI_ACPI_DESCRIPTION_HEADER **) &Table, >=20 > &Handle >=20 > ); >=20 > diff --git > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc= p > i.c > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc= p > i.c > index 3d75e5012a..e33caad1e8 100644 > --- > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc= p > i.c > +++ > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc= p > i.c > @@ -28,7 +28,7 @@ UINTN > mAcpiGcdIoMapNumberOfDescrip >=20 >=20 > VOID >=20 > DumpAcpiMadt ( >=20 > - IN EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt >=20 > + IN EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt >=20 > ); >=20 >=20 >=20 > VOID >=20 > @@ -63,7 +63,7 @@ DumpAcpiTcpa ( >=20 >=20 > EFI_STATUS >=20 > CheckAcpiMadt ( >=20 > - IN EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt >=20 > + IN EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt >=20 > ); >=20 >=20 >=20 > EFI_STATUS >=20 > @@ -187,7 +187,7 @@ DumpAcpiTableHeader ( >=20 >=20 > VOID >=20 > DumpAcpiFadt ( >=20 > - IN EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt >=20 > + IN EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *Fadt >=20 > ) >=20 > { >=20 > DumpAcpiTableHeader (&Fadt->Header); >=20 > @@ -201,7 +201,7 @@ DumpAcpiFadt ( >=20 >=20 > EFI_STATUS >=20 > CheckAcpiFadt ( >=20 > - IN EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt >=20 > + IN EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *Fadt >=20 > ) >=20 > { >=20 > if (Fadt->SmiCmd !=3D 0) { >=20 > @@ -258,16 +258,16 @@ CheckAcpiFadt ( > return EFI_NOT_STARTED; >=20 > } >=20 > } >=20 > - if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, ResetReg)) { >=20 > + if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, ResetReg)) { >=20 > if (Fadt->ResetReg.Address !=3D 0) { >=20 > switch (Fadt->ResetReg.AddressSpaceId) { >=20 > - case EFI_ACPI_5_0_SYSTEM_MEMORY: >=20 > + case EFI_ACPI_6_5_SYSTEM_MEMORY: >=20 > if (!IsMmioExit (Fadt->ResetReg.Address, Fadt- > >ResetReg.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.ResetReg resource (0x%x) is not rep= orted > correctly.\n", Fadt->ResetReg.Address)); >=20 > return EFI_NOT_STARTED; >=20 > } >=20 > break; >=20 > - case EFI_ACPI_5_0_SYSTEM_IO: >=20 > + case EFI_ACPI_6_5_SYSTEM_IO: >=20 > if (!IsIoExit (Fadt->ResetReg.Address, Fadt->ResetReg.RegisterBi= tWidth/8, > TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.ResetReg resource (0x%x) is not rep= orted > correctly.\n", Fadt->ResetReg.Address)); >=20 > return EFI_NOT_STARTED; >=20 > @@ -276,16 +276,16 @@ CheckAcpiFadt ( > } >=20 > } >=20 > } >=20 > - if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XPm1aEvtBlk)) { >=20 > + if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XPm1aEvtBlk)) { >=20 > if (Fadt->XPm1aEvtBlk.Address !=3D 0) { >=20 > switch (Fadt->XPm1aEvtBlk.AddressSpaceId) { >=20 > - case EFI_ACPI_5_0_SYSTEM_MEMORY: >=20 > + case EFI_ACPI_6_5_SYSTEM_MEMORY: >=20 > if (!IsMmioExit (Fadt->XPm1aEvtBlk.Address, Fadt- > >XPm1aEvtBlk.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XPm1aEvtBlk resource (0x%x) is not > reported correctly.\n", Fadt->XPm1aEvtBlk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > } >=20 > break; >=20 > - case EFI_ACPI_5_0_SYSTEM_IO: >=20 > + case EFI_ACPI_6_5_SYSTEM_IO: >=20 > if (!IsIoExit (Fadt->XPm1aEvtBlk.Address, Fadt- > >XPm1aEvtBlk.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XPm1aEvtBlk resource (0x%x) is not > reported correctly.\n", Fadt->XPm1aEvtBlk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > @@ -294,16 +294,16 @@ CheckAcpiFadt ( > } >=20 > } >=20 > } >=20 > - if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XPm1bEvtBlk)) { >=20 > + if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XPm1bEvtBlk)) { >=20 > if (Fadt->XPm1bEvtBlk.Address !=3D 0) { >=20 > switch (Fadt->XPm1bEvtBlk.AddressSpaceId) { >=20 > - case EFI_ACPI_5_0_SYSTEM_MEMORY: >=20 > + case EFI_ACPI_6_5_SYSTEM_MEMORY: >=20 > if (!IsMmioExit (Fadt->XPm1bEvtBlk.Address, Fadt- > >XPm1bEvtBlk.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XPm1bEvtBlk resource (0x%x) is not > reported correctly.\n", Fadt->XPm1bEvtBlk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > } >=20 > break; >=20 > - case EFI_ACPI_5_0_SYSTEM_IO: >=20 > + case EFI_ACPI_6_5_SYSTEM_IO: >=20 > if (!IsIoExit (Fadt->XPm1bEvtBlk.Address, Fadt- > >XPm1bEvtBlk.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XPm1bEvtBlk resource (0x%x) is not > reported correctly.\n", Fadt->XPm1bEvtBlk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > @@ -312,16 +312,16 @@ CheckAcpiFadt ( > } >=20 > } >=20 > } >=20 > - if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XPm1aCntBlk)) { >=20 > + if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XPm1aCntBlk)) { >=20 > if (Fadt->XPm1aCntBlk.Address !=3D 0) { >=20 > switch (Fadt->XPm1aCntBlk.AddressSpaceId) { >=20 > - case EFI_ACPI_5_0_SYSTEM_MEMORY: >=20 > + case EFI_ACPI_6_5_SYSTEM_MEMORY: >=20 > if (!IsMmioExit (Fadt->XPm1aCntBlk.Address, Fadt- > >XPm1aCntBlk.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XPm1aCntBlk resource (0x%x) is not > reported correctly.\n", Fadt->XPm1aCntBlk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > } >=20 > break; >=20 > - case EFI_ACPI_5_0_SYSTEM_IO: >=20 > + case EFI_ACPI_6_5_SYSTEM_IO: >=20 > if (!IsIoExit (Fadt->XPm1aCntBlk.Address, Fadt- > >XPm1aCntBlk.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XPm1aCntBlk resource (0x%x) is not > reported correctly.\n", Fadt->XPm1aCntBlk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > @@ -330,16 +330,16 @@ CheckAcpiFadt ( > } >=20 > } >=20 > } >=20 > - if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XPm1bCntBlk)) { >=20 > + if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XPm1bCntBlk)) { >=20 > if (Fadt->XPm1bCntBlk.Address !=3D 0) { >=20 > switch (Fadt->XPm1bCntBlk.AddressSpaceId) { >=20 > - case EFI_ACPI_5_0_SYSTEM_MEMORY: >=20 > + case EFI_ACPI_6_5_SYSTEM_MEMORY: >=20 > if (!IsMmioExit (Fadt->XPm1bCntBlk.Address, Fadt- > >XPm1bCntBlk.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XPm1bCntBlk resource (0x%x) is not > reported correctly.\n", Fadt->XPm1bCntBlk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > } >=20 > break; >=20 > - case EFI_ACPI_5_0_SYSTEM_IO: >=20 > + case EFI_ACPI_6_5_SYSTEM_IO: >=20 > if (!IsIoExit (Fadt->XPm1bCntBlk.Address, Fadt- > >XPm1bCntBlk.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XPm1bCntBlk resource (0x%x) is not > reported correctly.\n", Fadt->XPm1bCntBlk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > @@ -348,16 +348,16 @@ CheckAcpiFadt ( > } >=20 > } >=20 > } >=20 > - if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XPm2CntBlk)) { >=20 > + if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XPm2CntBlk)) { >=20 > if (Fadt->XPm2CntBlk.Address !=3D 0) { >=20 > switch (Fadt->XPm2CntBlk.AddressSpaceId) { >=20 > - case EFI_ACPI_5_0_SYSTEM_MEMORY: >=20 > + case EFI_ACPI_6_5_SYSTEM_MEMORY: >=20 > if (!IsMmioExit (Fadt->XPm2CntBlk.Address, Fadt- > >XPm2CntBlk.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XPm2CntBlk resource (0x%x) is not > reported correctly.\n", Fadt->XPm2CntBlk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > } >=20 > break; >=20 > - case EFI_ACPI_5_0_SYSTEM_IO: >=20 > + case EFI_ACPI_6_5_SYSTEM_IO: >=20 > if (!IsIoExit (Fadt->XPm2CntBlk.Address, Fadt- > >XPm2CntBlk.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XPm2CntBlk resource (0x%x) is not > reported correctly.\n", Fadt->XPm2CntBlk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > @@ -366,16 +366,16 @@ CheckAcpiFadt ( > } >=20 > } >=20 > } >=20 > - if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XPmTmrBlk)) { >=20 > + if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XPmTmrBlk)) { >=20 > if (Fadt->XPmTmrBlk.Address !=3D 0) { >=20 > switch (Fadt->XPmTmrBlk.AddressSpaceId) { >=20 > - case EFI_ACPI_5_0_SYSTEM_MEMORY: >=20 > + case EFI_ACPI_6_5_SYSTEM_MEMORY: >=20 > if (!IsMmioExit (Fadt->XPmTmrBlk.Address, Fadt- > >XPmTmrBlk.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XPmTmrBlk resource (0x%x) is not > reported correctly.\n", Fadt->XPmTmrBlk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > } >=20 > break; >=20 > - case EFI_ACPI_5_0_SYSTEM_IO: >=20 > + case EFI_ACPI_6_5_SYSTEM_IO: >=20 > if (!IsIoExit (Fadt->XPmTmrBlk.Address, Fadt- > >XPmTmrBlk.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XPmTmrBlk resource (0x%x) is not > reported correctly.\n", Fadt->XPmTmrBlk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > @@ -384,16 +384,16 @@ CheckAcpiFadt ( > } >=20 > } >=20 > } >=20 > - if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XGpe0Blk)) { >=20 > + if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XGpe0Blk)) { >=20 > if (Fadt->XGpe0Blk.Address !=3D 0) { >=20 > switch (Fadt->XGpe0Blk.AddressSpaceId) { >=20 > - case EFI_ACPI_5_0_SYSTEM_MEMORY: >=20 > + case EFI_ACPI_6_5_SYSTEM_MEMORY: >=20 > if (!IsMmioExit (Fadt->XGpe0Blk.Address, Fadt- > >XGpe0Blk.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XGpe0Blk resource (0x%x) is not rep= orted > correctly.\n", Fadt->XGpe0Blk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > } >=20 > break; >=20 > - case EFI_ACPI_5_0_SYSTEM_IO: >=20 > + case EFI_ACPI_6_5_SYSTEM_IO: >=20 > if (!IsIoExit (Fadt->XGpe0Blk.Address, Fadt->XGpe0Blk.RegisterBi= tWidth/8, > TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XGpe0Blk resource (0x%x) is not rep= orted > correctly.\n", Fadt->XGpe0Blk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > @@ -402,16 +402,16 @@ CheckAcpiFadt ( > } >=20 > } >=20 > } >=20 > - if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, XGpe1Blk)) { >=20 > + if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, XGpe1Blk)) { >=20 > if (Fadt->XGpe1Blk.Address !=3D 0) { >=20 > switch (Fadt->XGpe1Blk.AddressSpaceId) { >=20 > - case EFI_ACPI_5_0_SYSTEM_MEMORY: >=20 > + case EFI_ACPI_6_5_SYSTEM_MEMORY: >=20 > if (!IsMmioExit (Fadt->XGpe1Blk.Address, Fadt- > >XGpe1Blk.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XGpe1Blk resource (0x%x) is not rep= orted > correctly.\n", Fadt->XGpe1Blk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > } >=20 > break; >=20 > - case EFI_ACPI_5_0_SYSTEM_IO: >=20 > + case EFI_ACPI_6_5_SYSTEM_IO: >=20 > if (!IsIoExit (Fadt->XGpe1Blk.Address, Fadt->XGpe1Blk.RegisterBi= tWidth/8, > TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.XGpe1Blk resource (0x%x) is not rep= orted > correctly.\n", Fadt->XGpe1Blk.Address)); >=20 > return EFI_NOT_STARTED; >=20 > @@ -420,16 +420,16 @@ CheckAcpiFadt ( > } >=20 > } >=20 > } >=20 > - if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, SleepControlReg)) > { >=20 > + if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, SleepControlReg)) > { >=20 > if (Fadt->SleepControlReg.Address !=3D 0) { >=20 > switch (Fadt->SleepControlReg.AddressSpaceId) { >=20 > - case EFI_ACPI_5_0_SYSTEM_MEMORY: >=20 > + case EFI_ACPI_6_5_SYSTEM_MEMORY: >=20 > if (!IsMmioExit (Fadt->SleepControlReg.Address, Fadt- > >SleepControlReg.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.SleepControlReg resource (0x%x) is = not > reported correctly.\n", Fadt->SleepControlReg.Address)); >=20 > return EFI_NOT_STARTED; >=20 > } >=20 > break; >=20 > - case EFI_ACPI_5_0_SYSTEM_IO: >=20 > + case EFI_ACPI_6_5_SYSTEM_IO: >=20 > if (!IsIoExit (Fadt->SleepControlReg.Address, Fadt- > >SleepControlReg.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.SleepControlReg resource (0x%x) is = not > reported correctly.\n", Fadt->SleepControlReg.Address)); >=20 > return EFI_NOT_STARTED; >=20 > @@ -438,16 +438,16 @@ CheckAcpiFadt ( > } >=20 > } >=20 > } >=20 > - if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE, SleepStatusReg)) { >=20 > + if (Fadt->Header.Length > > OFFSET_OF(EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE, SleepStatusReg)) { >=20 > if (Fadt->SleepStatusReg.Address !=3D 0) { >=20 > switch (Fadt->SleepStatusReg.AddressSpaceId) { >=20 > - case EFI_ACPI_5_0_SYSTEM_MEMORY: >=20 > + case EFI_ACPI_6_5_SYSTEM_MEMORY: >=20 > if (!IsMmioExit (Fadt->SleepStatusReg.Address, Fadt- > >SleepStatusReg.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.SleepStatusReg resource (0x%x) is n= ot > reported correctly.\n", Fadt->SleepStatusReg.Address)); >=20 > return EFI_NOT_STARTED; >=20 > } >=20 > break; >=20 > - case EFI_ACPI_5_0_SYSTEM_IO: >=20 > + case EFI_ACPI_6_5_SYSTEM_IO: >=20 > if (!IsIoExit (Fadt->SleepStatusReg.Address, Fadt- > >SleepStatusReg.RegisterBitWidth/8, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "FADT.SleepStatusReg resource (0x%x) is n= ot > reported correctly.\n", Fadt->SleepStatusReg.Address)); >=20 > return EFI_NOT_STARTED; >=20 > @@ -461,7 +461,7 @@ CheckAcpiFadt ( >=20 >=20 > VOID >=20 > DumpAcpiFacs ( >=20 > - IN EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *Facs >=20 > + IN EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *Facs >=20 > ) >=20 > { >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > @@ -476,21 +476,21 @@ DumpAcpiTable ( > IN EFI_ACPI_DESCRIPTION_HEADER *Table >=20 > ) >=20 > { >=20 > - EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt; >=20 > + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *Fadt; >=20 >=20 >=20 > if (Table =3D=3D NULL) { >=20 > return ; >=20 > } >=20 >=20 >=20 > switch (Table->Signature) { >=20 > - case EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE: >=20 > - Fadt =3D (EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *)Table; >=20 > + case EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE: >=20 > + Fadt =3D (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *)Table; >=20 > DumpAcpiFadt (Fadt); >=20 > - if (Fadt->Header.Revision >=3D > EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION) { >=20 > + if (Fadt->Header.Revision >=3D > EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_REVISION) { >=20 > if (Fadt->XFirmwareCtrl !=3D 0) { >=20 > - DumpAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE > *)(UINTN)Fadt->XFirmwareCtrl); >=20 > + DumpAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE > *)(UINTN)Fadt->XFirmwareCtrl); >=20 > } else { >=20 > - DumpAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE > *)(UINTN)Fadt->FirmwareCtrl); >=20 > + DumpAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE > *)(UINTN)Fadt->FirmwareCtrl); >=20 > } >=20 > if (Fadt->XDsdt !=3D 0) { >=20 > DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->XDsdt= ); >=20 > @@ -498,29 +498,29 @@ DumpAcpiTable ( > DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->Dsdt)= ; >=20 > } >=20 > } else { >=20 > - DumpAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE > *)(UINTN)Fadt->FirmwareCtrl); >=20 > + DumpAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE > *)(UINTN)Fadt->FirmwareCtrl); >=20 > DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->Dsdt); >=20 > } >=20 > break; >=20 > - case EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE: >=20 > - DumpAcpiMadt > ((EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *)Table); >=20 > + case EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE: >=20 > + DumpAcpiMadt > ((EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *)Table); >=20 > break; >=20 > - case > EFI_ACPI_2_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SI > GNATURE: >=20 > + case > EFI_ACPI_6_5_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SI > GNATURE: >=20 > DumpAcpiMcfg > ((EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_HEA > DER *)Table); >=20 > break; >=20 > - case EFI_ACPI_3_0_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE: >=20 > + case EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE: >=20 > DumpAcpiHpet ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER > *)Table); >=20 > break; >=20 > - case EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE: >=20 > + case EFI_ACPI_6_5_DMA_REMAPPING_TABLE_SIGNATURE: >=20 > DumpAcpiDmar ((EFI_ACPI_DMAR_HEADER *)Table); >=20 > break; >=20 > case EFI_ACPI_WINDOWS_SMM_SECURITY_MITIGATION_TABLE_SIGNATURE: >=20 > DumpAcpiWsmt ((EFI_ACPI_WSMT_TABLE *)Table); >=20 > break; >=20 > - case > EFI_ACPI_5_0_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE: >=20 > + case > EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE: >=20 > DumpAcpiTpm2 ((EFI_TPM2_ACPI_TABLE *)Table); >=20 > break; >=20 > - case > EFI_ACPI_3_0_TRUSTED_COMPUTING_PLATFORM_ALLIANCE_CAPABILITIES_TA > BLE_SIGNATURE: >=20 > + case > EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_ALLIANCE_CAPABILITIES_TA > BLE_SIGNATURE: >=20 > DumpAcpiTcpa ((VOID *)Table); >=20 > break; >=20 > default: >=20 > @@ -534,21 +534,21 @@ CheckAcpiTableResource ( > IN EFI_ACPI_DESCRIPTION_HEADER *Table >=20 > ) >=20 > { >=20 > - EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *Fadt; >=20 > + EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *Fadt; >=20 >=20 >=20 > if (Table =3D=3D NULL) { >=20 > return EFI_INVALID_PARAMETER; >=20 > } >=20 >=20 >=20 > switch (Table->Signature) { >=20 > - case EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE: >=20 > - Fadt =3D (EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *)Table; >=20 > + case EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE: >=20 > + Fadt =3D (EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE *)Table; >=20 > CheckAcpiFadt (Fadt); >=20 > - if (Fadt->Header.Revision >=3D > EFI_ACPI_2_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION) { >=20 > + if (Fadt->Header.Revision >=3D > EFI_ACPI_6_5_FIXED_ACPI_DESCRIPTION_TABLE_REVISION) { >=20 > if (Fadt->XFirmwareCtrl !=3D 0) { >=20 > - // CheckAcpiFacs > ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)Fadt- > >XFirmwareCtrl); >=20 > + // CheckAcpiFacs > ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)Fadt- > >XFirmwareCtrl); >=20 > } else { >=20 > - // CheckAcpiFacs > ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)Fadt- > >FirmwareCtrl); >=20 > + // CheckAcpiFacs > ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)Fadt- > >FirmwareCtrl); >=20 > } >=20 > if (Fadt->XDsdt !=3D 0) { >=20 > // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt- > >XDsdt); >=20 > @@ -556,29 +556,29 @@ CheckAcpiTableResource ( > // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->Ds= dt); >=20 > } >=20 > } else { >=20 > - // CheckAcpiFacs ((EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE > *)(UINTN)Fadt->FirmwareCtrl); >=20 > + // CheckAcpiFacs ((EFI_ACPI_6_5_FIRMWARE_ACPI_CONTROL_STRUCTURE > *)(UINTN)Fadt->FirmwareCtrl); >=20 > // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->Dsdt= ); >=20 > } >=20 > break; >=20 > - case EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE: >=20 > - return CheckAcpiMadt > ((EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *)Table); >=20 > + case EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE: >=20 > + return CheckAcpiMadt > ((EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *)Table); >=20 > break; >=20 > - case > EFI_ACPI_2_0_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SI > GNATURE: >=20 > + case > EFI_ACPI_6_5_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_SI > GNATURE: >=20 > return CheckAcpiMcfg > ((EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_HEA > DER *)Table); >=20 > break; >=20 > - case EFI_ACPI_3_0_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE: >=20 > + case EFI_ACPI_6_5_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE: >=20 > return CheckAcpiHpet > ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *)Table); >=20 > break; >=20 > - case EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE: >=20 > + case EFI_ACPI_6_5_DMA_REMAPPING_TABLE_SIGNATURE: >=20 > return CheckAcpiDmar ((EFI_ACPI_DMAR_HEADER *)Table); >=20 > break; >=20 > case EFI_ACPI_WINDOWS_SMM_SECURITY_MITIGATION_TABLE_SIGNATURE: >=20 > // CheckAcpiWsmt ((EFI_ACPI_WSMT_TABLE *)Table); >=20 > break; >=20 > - case > EFI_ACPI_5_0_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE: >=20 > + case > EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE: >=20 > return CheckAcpiTpm2 ((EFI_TPM2_ACPI_TABLE *)Table); >=20 > break; >=20 > - case > EFI_ACPI_3_0_TRUSTED_COMPUTING_PLATFORM_ALLIANCE_CAPABILITIES_TA > BLE_SIGNATURE: >=20 > + case > EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_ALLIANCE_CAPABILITIES_TA > BLE_SIGNATURE: >=20 > return CheckAcpiTcpa ((VOID *)Table); >=20 > break; >=20 > default: >=20 > @@ -701,7 +701,7 @@ DumpAcpiXsdt ( >=20 >=20 > EFI_STATUS >=20 > DumpAcpiRsdp ( >=20 > - IN EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER *Rsdp, >=20 > + IN EFI_ACPI_6_5_ROOT_SYSTEM_DESCRIPTION_POINTER *Rsdp, >=20 > IN UINT32 *Signature, OPTIONAL >=20 > OUT VOID **Table, >=20 > IN BOOLEAN DumpPrint, >=20 > @@ -720,7 +720,7 @@ DumpAcpiRsdp ( > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, " RSDT=3D0x%08x XSDT=3D0x%016lx\n", Rsdp- > >RsdtAddress, Rsdp->XsdtAddress)); >=20 >=20 >=20 > - if (Rsdp->Revision >=3D > EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION) { >=20 > + if (Rsdp->Revision >=3D > EFI_ACPI_6_5_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION) { >=20 > DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Rsdp- > >XsdtAddress); >=20 > } >=20 > DumpAcpiTable ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Rsdp- > >RsdtAddress); >=20 > @@ -729,7 +729,7 @@ DumpAcpiRsdp ( > // >=20 > // Search XSDT >=20 > // >=20 > - if (Rsdp->Revision >=3D > EFI_ACPI_2_0_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION) { >=20 > + if (Rsdp->Revision >=3D > EFI_ACPI_6_5_ROOT_SYSTEM_DESCRIPTION_POINTER_REVISION) { >=20 > Xsdt =3D (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Rsdp->XsdtAddress; >=20 > Status =3D DumpAcpiXsdt (Xsdt, Signature, Table, DumpPrint, CheckRes= ource); >=20 > } else { >=20 > diff --git > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc= p > iMadt.c > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc= p > iMadt.c > index b743bad6dd..b315a200ea 100644 > --- > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc= p > iMadt.c > +++ > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAc= p > iMadt.c > @@ -69,22 +69,22 @@ ShortNameOfMadtType( >=20 >=20 > VOID >=20 > DumpAcpiMadt ( >=20 > - IN EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt >=20 > + IN EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt >=20 > ) >=20 > { >=20 > APIC_STRUCT_HEADER *ApicStructHeade= r; >=20 > INTN MadtLen; >=20 > - EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE > *ProcessorLocalApic; >=20 > - EFI_ACPI_4_0_IO_APIC_STRUCTURE *IOApic; >=20 > - EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE > *InterruptSourceOverride; >=20 > - EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE > *NonMaskableInterruptSource; >=20 > - EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI; >=20 > - EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE > *LocalApicAddressOverride; >=20 > - EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *IOSapic; >=20 > - EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE > *ProcessorLocalSapic; >=20 > - EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE > *PlatformInterruptSource; >=20 > - EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE > *ProcessorLocalX2Apic; >=20 > - EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi; >=20 > + EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE > *ProcessorLocalApic; >=20 > + EFI_ACPI_6_5_IO_APIC_STRUCTURE *IOApic; >=20 > + EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE > *InterruptSourceOverride; >=20 > + EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE > *NonMaskableInterruptSource; >=20 > + EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI; >=20 > + EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE > *LocalApicAddressOverride; >=20 > + EFI_ACPI_6_5_IO_SAPIC_STRUCTURE *IOSapic; >=20 > + EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTURE > *ProcessorLocalSapic; >=20 > + EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES_STRUCTURE > *PlatformInterruptSource; >=20 > + EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE > *ProcessorLocalX2Apic; >=20 > + EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi; >=20 >=20 >=20 > DumpAcpiTableHeader (&Madt->Header); >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > @@ -93,25 +93,25 @@ DumpAcpiMadt ( > // >=20 > // Sub table >=20 > // >=20 > - MadtLen =3D Madt->Header.Length - > sizeof(EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER); >=20 > + MadtLen =3D Madt->Header.Length - > sizeof(EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER); >=20 > ApicStructHeader =3D (APIC_STRUCT_HEADER *)(Madt + 1); >=20 > while (MadtLen > 0) { >=20 > switch (ApicStructHeader->Type) { >=20 > - case EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC: >=20 > - ProcessorLocalApic =3D > (EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC: >=20 > + ProcessorLocalApic =3D > (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *)ApicStructHeader; >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); >=20 > DEBUG ((DEBUG_INFO, ": [0x%02x]", ApicStructHeader->Type)); >=20 > DEBUG ((DEBUG_INFO, " ID=3D0x%02x", ProcessorLocalApic- > >AcpiProcessorId)); >=20 > DEBUG ((DEBUG_INFO, " ApicId=3D0x%02x", ProcessorLocalApic->ApicId= )); >=20 > - if ((ProcessorLocalApic->Flags & EFI_ACPI_4_0_LOCAL_APIC_ENABLED) = !=3D 0) > { >=20 > + if ((ProcessorLocalApic->Flags & EFI_ACPI_6_5_LOCAL_APIC_ENABLED) = !=3D 0) > { >=20 > DEBUG ((DEBUG_INFO, " (Enabled)")); >=20 > } >=20 > DEBUG ((DEBUG_INFO, "\n")); >=20 > break; >=20 > - case EFI_ACPI_4_0_IO_APIC: >=20 > - IOApic =3D (EFI_ACPI_4_0_IO_APIC_STRUCTURE *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_IO_APIC: >=20 > + IOApic =3D (EFI_ACPI_6_5_IO_APIC_STRUCTURE *)ApicStructHeader; >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); >=20 > @@ -121,8 +121,8 @@ DumpAcpiMadt ( > DEBUG ((DEBUG_INFO, " InterruptBase=3D0x%08x", IOApic- > >GlobalSystemInterruptBase)); >=20 > DEBUG ((DEBUG_INFO, "\n")); >=20 > break; >=20 > - case EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE: >=20 > - InterruptSourceOverride =3D > (EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE > *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE: >=20 > + InterruptSourceOverride =3D > (EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE > *)ApicStructHeader; >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); >=20 > @@ -133,8 +133,8 @@ DumpAcpiMadt ( > DEBUG ((DEBUG_INFO, " Flags=3D0x%04x", InterruptSourceOverride->Fl= ags)); >=20 > DEBUG ((DEBUG_INFO, "\n")); >=20 > break; >=20 > - case EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE: >=20 > - NonMaskableInterruptSource =3D > (EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE > *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE: >=20 > + NonMaskableInterruptSource =3D > (EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE > *)ApicStructHeader; >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); >=20 > @@ -143,8 +143,8 @@ DumpAcpiMadt ( > DEBUG ((DEBUG_INFO, " Flags=3D0x%04x", NonMaskableInterruptSource- > >Flags)); >=20 > DEBUG ((DEBUG_INFO, "\n")); >=20 > break; >=20 > - case EFI_ACPI_4_0_LOCAL_APIC_NMI: >=20 > - LocalApicNMI =3D (EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE > *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_LOCAL_APIC_NMI: >=20 > + LocalApicNMI =3D (EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE > *)ApicStructHeader; >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); >=20 > @@ -154,8 +154,8 @@ DumpAcpiMadt ( > DEBUG ((DEBUG_INFO, " Flags=3D0x%04x", LocalApicNMI->Flags)); >=20 > DEBUG ((DEBUG_INFO, "\n")); >=20 > break; >=20 > - case EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE: >=20 > - LocalApicAddressOverride =3D > (EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE > *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE: >=20 > + LocalApicAddressOverride =3D > (EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE > *)ApicStructHeader; >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); >=20 > @@ -163,8 +163,8 @@ DumpAcpiMadt ( > DEBUG ((DEBUG_INFO, " LocalApicAddress=3D0x%016lx", > LocalApicAddressOverride->LocalApicAddress)); >=20 > DEBUG ((DEBUG_INFO, "\n")); >=20 > break; >=20 > - case EFI_ACPI_4_0_IO_SAPIC: >=20 > - IOSapic =3D (EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_IO_SAPIC: >=20 > + IOSapic =3D (EFI_ACPI_6_5_IO_SAPIC_STRUCTURE *)ApicStructHeader; >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); >=20 > @@ -174,8 +174,8 @@ DumpAcpiMadt ( > DEBUG ((DEBUG_INFO, " IoSapicAddress=3D0x%016lx", IOSapic- > >IoSapicAddress)); >=20 > DEBUG ((DEBUG_INFO, "\n")); >=20 > break; >=20 > - case EFI_ACPI_4_0_LOCAL_SAPIC: >=20 > - ProcessorLocalSapic =3D > (EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_LOCAL_SAPIC: >=20 > + ProcessorLocalSapic =3D > (EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTURE *)ApicStructHeader; >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); >=20 > @@ -184,13 +184,13 @@ DumpAcpiMadt ( > DEBUG ((DEBUG_INFO, " LocalSapicId=3D0x%02x", ProcessorLocalSapic- > >LocalSapicId)); >=20 > DEBUG ((DEBUG_INFO, " LocalSapicEid=3D0x%02x", ProcessorLocalSapic= - > >LocalSapicEid)); >=20 > DEBUG ((DEBUG_INFO, " UID=3D0x%08x", ProcessorLocalSapic- > >ACPIProcessorUIDValue)); >=20 > - if ((ProcessorLocalSapic->Flags & EFI_ACPI_5_0_LOCAL_APIC_ENABLED)= !=3D > 0) { >=20 > + if ((ProcessorLocalSapic->Flags & EFI_ACPI_6_5_LOCAL_APIC_ENABLED)= !=3D > 0) { >=20 > DEBUG ((DEBUG_INFO, " (Enabled)")); >=20 > } >=20 > DEBUG ((DEBUG_INFO, "\n")); >=20 > break; >=20 > - case EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES: >=20 > - PlatformInterruptSource =3D > (EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE > *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES: >=20 > + PlatformInterruptSource =3D > (EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES_STRUCTURE > *)ApicStructHeader; >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); >=20 > @@ -204,21 +204,21 @@ DumpAcpiMadt ( > DEBUG ((DEBUG_INFO, " Flags=3D0x%04x", PlatformInterruptSource->Fl= ags)); >=20 > DEBUG ((DEBUG_INFO, "\n")); >=20 > break; >=20 > - case EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC: >=20 > - ProcessorLocalX2Apic =3D > (EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC: >=20 > + ProcessorLocalX2Apic =3D > (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *)ApicStructHeader; >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); >=20 > DEBUG ((DEBUG_INFO, ": [0x%02x]", ApicStructHeader->Type)); >=20 > DEBUG ((DEBUG_INFO, " X2ApicId=3D0x%08x", ProcessorLocalX2Apic- > >X2ApicId)); >=20 > DEBUG ((DEBUG_INFO, " UID=3D0x%08x", ProcessorLocalX2Apic- > >AcpiProcessorUid)); >=20 > - if ((ProcessorLocalX2Apic->Flags & > EFI_ACPI_5_0_LOCAL_APIC_ENABLED) !=3D 0) { >=20 > + if ((ProcessorLocalX2Apic->Flags & > EFI_ACPI_6_5_LOCAL_APIC_ENABLED) !=3D 0) { >=20 > DEBUG ((DEBUG_INFO, " (Enabled)")); >=20 > } >=20 > DEBUG ((DEBUG_INFO, "\n")); >=20 > break; >=20 > - case EFI_ACPI_4_0_LOCAL_X2APIC_NMI: >=20 > - LocalX2ApicNmi =3D (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE > *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_LOCAL_X2APIC_NMI: >=20 > + LocalX2ApicNmi =3D (EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE > *)ApicStructHeader; >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, " ")); >=20 > DEBUG ((DEBUG_INFO, ShortNameOfMadtType(ApicStructHeader->Type))); >=20 > @@ -242,24 +242,24 @@ DumpAcpiMadt ( >=20 >=20 > EFI_STATUS >=20 > CheckAcpiMadt ( >=20 > - IN EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt >=20 > + IN EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt >=20 > ) >=20 > { >=20 >=20 >=20 > APIC_STRUCT_HEADER *ApicStructHeade= r; >=20 > INTN MadtLen; >=20 > - EFI_ACPI_4_0_IO_APIC_STRUCTURE *IOApic; >=20 > - EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE > *LocalApicAddressOverride; >=20 > - EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *IOSapic; >=20 > + EFI_ACPI_6_5_IO_APIC_STRUCTURE *IOApic; >=20 > + EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE > *LocalApicAddressOverride; >=20 > + EFI_ACPI_6_5_IO_SAPIC_STRUCTURE *IOSapic; >=20 > #if 0 >=20 > - EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE > *ProcessorLocalApic; >=20 > - EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE > *InterruptSourceOverride; >=20 > - EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE > *NonMaskableInterruptSource; >=20 > - EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI; >=20 > - EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE > *ProcessorLocalSapic; >=20 > - EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE > *PlatformInterruptSource; >=20 > - EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE > *ProcessorLocalX2Apic; >=20 > - EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi; >=20 > + EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE > *ProcessorLocalApic; >=20 > + EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE > *InterruptSourceOverride; >=20 > + EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE > *NonMaskableInterruptSource; >=20 > + EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE *LocalApicNMI; >=20 > + EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTURE > *ProcessorLocalSapic; >=20 > + EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES_STRUCTURE > *PlatformInterruptSource; >=20 > + EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE > *ProcessorLocalX2Apic; >=20 > + EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE *LocalX2ApicNmi; >=20 > #endif >=20 >=20 >=20 > if (!IsMmioExit (Madt->LocalApicAddress, SIZE_4KB, TRUE)) { >=20 > @@ -270,55 +270,55 @@ CheckAcpiMadt ( > // >=20 > // Sub table >=20 > // >=20 > - MadtLen =3D Madt->Header.Length - > sizeof(EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER); >=20 > + MadtLen =3D Madt->Header.Length - > sizeof(EFI_ACPI_6_5_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER); >=20 > ApicStructHeader =3D (APIC_STRUCT_HEADER *)(Madt + 1); >=20 > while (MadtLen > 0) { >=20 > switch (ApicStructHeader->Type) { >=20 > - case EFI_ACPI_4_0_IO_APIC: >=20 > - IOApic =3D (EFI_ACPI_4_0_IO_APIC_STRUCTURE *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_IO_APIC: >=20 > + IOApic =3D (EFI_ACPI_6_5_IO_APIC_STRUCTURE *)ApicStructHeader; >=20 > if (!IsMmioExit (IOApic->IoApicAddress, SIZE_4KB, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "MADT.IOAPIC resource (0x%x) is not reporte= d > correctly.\n", IOApic->IoApicAddress)); >=20 > return EFI_NOT_STARTED; >=20 > } >=20 > break; >=20 > - case EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE: >=20 > - LocalApicAddressOverride =3D > (EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE > *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE: >=20 > + LocalApicAddressOverride =3D > (EFI_ACPI_6_5_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE > *)ApicStructHeader; >=20 > if (!IsMmioExit (LocalApicAddressOverride->LocalApicAddress, SIZE_= 4KB, > TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "MADT.LocalApicOverride resource (0x%x) is = not > reported correctly.\n", LocalApicAddressOverride->LocalApicAddress)); >=20 > return EFI_NOT_STARTED; >=20 > } >=20 > break; >=20 > - case EFI_ACPI_4_0_IO_SAPIC: >=20 > - IOSapic =3D (EFI_ACPI_4_0_IO_SAPIC_STRUCTURE *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_IO_SAPIC: >=20 > + IOSapic =3D (EFI_ACPI_6_5_IO_SAPIC_STRUCTURE *)ApicStructHeader; >=20 > if (!IsMmioExit (IOSapic->IoSapicAddress, SIZE_4KB, TRUE)) { >=20 > DEBUG ((DEBUG_ERROR, "MADT.IOSAPIC resource (0x%x) is not report= ed > correctly.\n", IOSapic->IoSapicAddress)); >=20 > return EFI_NOT_STARTED; >=20 > } >=20 > break; >=20 > #if 0 >=20 > - case EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC: >=20 > - ProcessorLocalApic =3D > (EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC: >=20 > + ProcessorLocalApic =3D > (EFI_ACPI_6_5_PROCESSOR_LOCAL_APIC_STRUCTURE *)ApicStructHeader; >=20 > break; >=20 > - case EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE: >=20 > - InterruptSourceOverride =3D > (EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE > *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE: >=20 > + InterruptSourceOverride =3D > (EFI_ACPI_6_5_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE > *)ApicStructHeader; >=20 > break; >=20 > - case EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE: >=20 > - NonMaskableInterruptSource =3D > (EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE > *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE: >=20 > + NonMaskableInterruptSource =3D > (EFI_ACPI_6_5_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE > *)ApicStructHeader; >=20 > break; >=20 > - case EFI_ACPI_4_0_LOCAL_APIC_NMI: >=20 > - LocalApicNMI =3D (EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE > *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_LOCAL_APIC_NMI: >=20 > + LocalApicNMI =3D (EFI_ACPI_6_5_LOCAL_APIC_NMI_STRUCTURE > *)ApicStructHeader; >=20 > break; >=20 > - case EFI_ACPI_4_0_LOCAL_SAPIC: >=20 > - ProcessorLocalSapic =3D > (EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_LOCAL_SAPIC: >=20 > + ProcessorLocalSapic =3D > (EFI_ACPI_6_5_PROCESSOR_LOCAL_SAPIC_STRUCTURE *)ApicStructHeader; >=20 > break; >=20 > - case EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES: >=20 > - PlatformInterruptSource =3D > (EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE > *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES: >=20 > + PlatformInterruptSource =3D > (EFI_ACPI_6_5_PLATFORM_INTERRUPT_SOURCES_STRUCTURE > *)ApicStructHeader; >=20 > break; >=20 > - case EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC: >=20 > - ProcessorLocalX2Apic =3D > (EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC: >=20 > + ProcessorLocalX2Apic =3D > (EFI_ACPI_6_5_PROCESSOR_LOCAL_X2APIC_STRUCTURE *)ApicStructHeader; >=20 > break; >=20 > - case EFI_ACPI_4_0_LOCAL_X2APIC_NMI: >=20 > - LocalX2ApicNmi =3D (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE > *)ApicStructHeader; >=20 > + case EFI_ACPI_6_5_LOCAL_X2APIC_NMI: >=20 > + LocalX2ApicNmi =3D (EFI_ACPI_6_5_LOCAL_X2APIC_NMI_STRUCTURE > *)ApicStructHeader; >=20 > break; >=20 > #endif >=20 > default: >=20 > diff --git > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDm > aProtection.c > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDm > aProtection.c > index aba0985956..285de67c93 100644 > --- > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDm > aProtection.c > +++ > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckDm > aProtection.c > @@ -32,7 +32,7 @@ CheckDrhd ( > INTN DmarLen; >=20 > EFI_ACPI_DMAR_DRHD_HEADER *Drhd; >=20 > UINT32 Reg32; >=20 > - >=20 > + >=20 > // >=20 > // Sub table >=20 > // >=20 > @@ -73,7 +73,7 @@ TestPointVtdEngine ( >=20 >=20 > Status =3D EFI_SUCCESS; >=20 >=20 >=20 > - Dmar =3D TestPointGetAcpi > (EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE); >=20 > + Dmar =3D TestPointGetAcpi > (EFI_ACPI_6_5_DMA_REMAPPING_TABLE_SIGNATURE); >=20 > if (Dmar =3D=3D NULL) { >=20 > DEBUG ((DEBUG_ERROR, "No DMAR table\n")); >=20 > Status =3D EFI_INVALID_PARAMETER; >=20 > diff --git > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTc= g > TrustedBoot.c > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTc= g > TrustedBoot.c > index 5ec32fd2e8..eb81ba93c4 100644 > --- > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTc= g > TrustedBoot.c > +++ > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTc= g > TrustedBoot.c > @@ -70,7 +70,7 @@ TestPointCheckTcgTrustedBoot ( > Status =3D EFI_NOT_FOUND; >=20 > } >=20 >=20 >=20 > - Acpi =3D TestPointGetAcpi > (EFI_ACPI_5_0_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE); >=20 > + Acpi =3D TestPointGetAcpi > (EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_2_TABLE_SIGNATURE); >=20 > if (Acpi =3D=3D NULL) { >=20 > DEBUG ((DEBUG_ERROR, "Tcg2 TPM2 table not found\n")); >=20 > Status =3D EFI_NOT_FOUND; >=20 > diff --git > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPoi= nt > CheckLib.c > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPoi= nt > CheckLib.c > index e5efbd0599..8e4030798e 100644 > --- > a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPoi= nt > CheckLib.c > +++ > b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPoi= nt > CheckLib.c > @@ -281,7 +281,7 @@ TestPointEndOfDxeDmaAcpiTableFunctional ( >=20 >=20 > DEBUG ((DEBUG_INFO, "=3D=3D=3D=3D=3D=3D=3D=3D > TestPointEndOfDxeDmaAcpiTableFunctional - Enter\n")); >=20 >=20 >=20 > - Acpi =3D TestPointGetAcpi > (EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE); >=20 > + Acpi =3D TestPointGetAcpi > (EFI_ACPI_6_5_DMA_REMAPPING_TABLE_SIGNATURE); >=20 > if (Acpi =3D=3D NULL) { >=20 > DEBUG ((DEBUG_ERROR, "No DMAR table\n")); >=20 > TestPointLibAppendErrorString ( >=20 > -- > 2.34.0.windows.1