From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web11.27981.1684257669677011511 for ; Tue, 16 May 2023 10:21:10 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=jXLlJsRY; spf=pass (domain: intel.com, ip: 192.55.52.88, 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=1684257669; x=1715793669; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=1HwdV/H2908VToUiKHhtnTmLjcX19WYWlzkxTK+D640=; b=jXLlJsRYV/sXZAPex6XKYl0wPvxtYjKBdhe2H/CeS4wn0gOdSMtL8vu1 35NtoyDMp84KtwCPSBk2YDabHJs4sn8GWDVNOIs1Ko+BILy4Z6btOiGDu i9HKr3EPSYA+mgGnnokPEg9e8isae1Wk7/TnOSIw1NmwWBWB/9ozuWNM8 Q/lun2mmvNVgs4qrUfHIxFP3VZetDZYRKr1vyhccCd5GsbyrcGOew48SS 2ffbNOzgQkpyovs9UUhLbvTjYOioMzbAC8J+5vX4GV+y+Zksc5OrikAen W72Yvd2FkxNNCeWR/2pP4kazmeZ+ROX9gCVImRdHwaNQTc1CemlHZ97gY w==; X-IronPort-AV: E=McAfee;i="6600,9927,10712"; a="379725411" X-IronPort-AV: E=Sophos;i="5.99,278,1677571200"; d="scan'208";a="379725411" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2023 10:21:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10712"; a="704485783" X-IronPort-AV: E=Sophos;i="5.99,278,1677571200"; d="scan'208";a="704485783" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga007.fm.intel.com with ESMTP; 16 May 2023 10:21:01 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 16 May 2023 10:21:00 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Tue, 16 May 2023 10:21:00 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.102) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Tue, 16 May 2023 10:21:00 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PX95FZm6ReYyA0boF3dRtVGx7IjswzAmxMW2uetdG+RckVS9RGMpSGvpiQhYVLvJ9aggGAawkZ5ecgnNKeP68d1gdgh1ySK8Dej/LrpralPQ6bXVOXv1sQ/K6U+/x4a9FhmxajAthdcoOxHJ+iHWZwdaRmqw3cjXldK1NrMA+Bwn2pFx1wU+e0q9At9ybEr7TD63Y+GbexTOYofcj3fOzxtg9lN0Sgj/fOL9ORg5LFD/O1CMD9MA21BYYYXEhMuErAaJFe9cMdzVhjrIVC5MFW15NzoN3LegyDQ8Lo1ocTxZCxzfVvbe5ZjlB3h8O5I9Uzahfq/UmXyqhNLs5q2YTg== 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=CkfJ1/cshi0u73jH8AIUV7rqxZju9dU57D7hXMZ0sK8=; b=j14JiF/lKNVtFULOJcnjodKEMr1Rxm30k9C29ND9AHB3Er0bm7lycguPPc7X9daszIkthnEA8uEtiWK4aGHABrUYh55j20E2SQn0x4diG5zLUYKJ6Z5+CVJqhs/IXgiky0XPBPdMNygbtSq92tTP/fSFaESccbFxkd3IT6MGu2NcmbZDFdnlIV64J3b5FathwAYefeMP5xqoe4ffWCwr5ncggttR8sEDFs5iYNMaHb5OTdqIiDQBm8v4d/pjIycxP4Y0t46CHnvyZmQyW1zaOMAIkhoSpdljJYz8SnjYb+NibO12oxcOXaEXX1HTYEgehaXq3g4Whudqx+bsHQKkeQ== 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 SA1PR11MB8376.namprd11.prod.outlook.com (2603:10b6:806:389::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.30; Tue, 16 May 2023 17:20:54 +0000 Received: from BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::1eb1:2222:1823:8e7a]) by BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::1eb1:2222:1823:8e7a%5]) with mapi id 15.20.6387.033; Tue, 16 May 2023 17:20:54 +0000 From: "Chiu, Chasel" To: "Chen, Aryeh" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" , "Oram, Isaac W" , "Gao, Liming" , "Dong, Eric" , "Yao, Jiewen" , "Sinha, Ankit" Subject: Re: [PATCH v3] MinPlatformPkg: Update ACPI 6.5 definition Thread-Topic: [PATCH v3] MinPlatformPkg: Update ACPI 6.5 definition Thread-Index: AQHZg7zUyppvOP/COki7rxZQlp3glK9dLVtw Date: Tue, 16 May 2023 17:20:54 +0000 Message-ID: References: <20230511035807.801-1-aryeh.chen@intel.com> In-Reply-To: <20230511035807.801-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_|SA1PR11MB8376:EE_ x-ms-office365-filtering-correlation-id: f83cf97c-49d6-431f-0733-08db5631e7ea 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: 9gKUT64/402Y5Xg2soFwgEOmwZOe4K/Uk+0c3OaQErxG98Uqjjt6J7fuxDt2D4Y1CRIYgay3nOTXzThbgCtIoKCTIg/5kLiqFGRUoC0FNR9KlOZUoP1JjTQXvbgkqrhl3iuM9lOT6S/zVIrhwFwfUc3RqIzZ9agWf/y6+loa1fr7Quc2U9F46CpX+3K7ogv+47vQjDN5c+jTSVF9qVAI8V5ZkGaFCVR1XhOdp5Xal8sAAYZG+qOXwD2HEWB17JoxxAhBvtkE3wQmxwKLb6GGLqdQUxruHU8zxsy7ZSx0WIHHtS1Kex/xM7sWziPQbH1PB8FSkMElYnOVh9EJtCMhyMx2G29WU7coNVbKOKuZgTaZfKIreNzoYf1jWM8OuQ/GOuNj90QAhGppsC1qzRfefSZcl2jLpjpmWilua+RQ3IvdzWTowP68HVtTqLnADfYtSBLVnwjVUPz8I3nzGccV/fFgQg6Kc5Jo26BHioY+Dfhbj+hXgLcbTaBfO8adE1JAWatD85S8d0bTmm9NPh+97wNCqJKKTcPSIP13sYtJF3URuQrv+ngtkcrPMiGs+F6dxQ8qJberSa2ZqjhevS57wj7OYJEVA14WA4JSl5ONWvD53T5PTJu32uctISQb/8kuAu83iZd0MNPR93byImT8tQ== 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)(136003)(346002)(376002)(396003)(366004)(39860400002)(451199021)(54906003)(19627235002)(110136005)(8676002)(8936002)(478600001)(38070700005)(316002)(66556008)(82960400001)(4326008)(41300700001)(76116006)(64756008)(66946007)(66476007)(66446008)(38100700002)(52536014)(122000001)(5660300002)(30864003)(2906002)(15650500001)(55016003)(9686003)(6506007)(53546011)(26005)(107886003)(186003)(33656002)(86362001)(83380400001)(7696005)(966005)(71200400001)(579004)(559001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?m76oqnV0GvnIjJ87nT+h/HmSVWlJgke7f2TBShU1E5plrbrs0o06VSlAVAdd?= =?us-ascii?Q?p8pGHefO8bS5JHXikggSoF8+ntcgpb0h/T6r25qYOL2DvsUL/weuU+oXWluM?= =?us-ascii?Q?GkrcjYvRGRc83VQeje1Rkikvj2J4gOZ/JzcLFyA9Ki6ZwwG+edK0K1LzBUGr?= =?us-ascii?Q?47i8DM8eWJaKI+V/jNCNDhOjPZNESYin5pShn0NmXyT3qj0jlTcU2O4zjcIe?= =?us-ascii?Q?464i5giFppHD0XbMXoIo5HErUlW4blnZeSaf1H/ZkueJgRQlFs13udDtTSBC?= =?us-ascii?Q?m8ukfZ4GZfCqgk6OXnMA8Jb1hSNTHTwZKqWMLBhM5SK8fYQu4vbnKY9Ngcmx?= =?us-ascii?Q?xwMnZKi0mrTiSnnsvXh9S3e/reXxeG6nF9CP52AGLmjObyTcSy58mcfagSmb?= =?us-ascii?Q?MCH6wv2ufpdBm0oH6gUWAhOMPO6PqZ2Uo5hMtaftoVFEtLIrMHmEaBlgZY41?= =?us-ascii?Q?+Dx9wsZCzTIET9Ls6p6ysN4cpI0FuckQRfs4Lb6T3XkhxnbH9nkEteGsHqFp?= =?us-ascii?Q?HPyVQCBY4dx8OjALnOnNb4Fn6EMGoh+vG2bXHZTzoZoOT06AbZoxW8BxLuBU?= =?us-ascii?Q?q1ERi37sDaB0U/uCzfQO0kNsYVuRn10+X1iiFWnEcdRnN7qJc1Wr+FkFMaHi?= =?us-ascii?Q?t6cQP+CAQWKpokEFS+PlVuyR8RteRQDrXXeCleOyv3YT7oCkcdIr6Hva5jZk?= =?us-ascii?Q?1UJlQKiHDc7G3c1OPuDqCtu5xkryb+EFmn6R/77rggUrmUvD9A0m/BChCnLT?= =?us-ascii?Q?TdKBB97Jk9+Wq6e2g3OnogPcbzoqMKDR/A8U8ncNiEY4VlowJwIAnORtuzDt?= =?us-ascii?Q?kOwRn3Ixw3ZEj+OEiYnp6MSnN71x84SjpvJSSAIohAhKGSbWVWpgN63L6fWj?= =?us-ascii?Q?GsEMnuwZs7v7ZT4ZCnpr0qR5AmUoAY+EkDxvCcIVeviQPtbISpAO3ObyOi3q?= =?us-ascii?Q?JzeQCc3v+voe025Lzgsy4CeElkEIom7IYEIZWfoD1es0PUSoXa1ezdSxPDJI?= =?us-ascii?Q?0iWyK0orAdVU0CFDo9LfP5o2PVOGGDQKXVYxLGjxB0BAL650KNoF7zoxlwMB?= =?us-ascii?Q?WdcqALc3L+kTISB7lhSTb+17E7hbbcexuKlt7VLTEIMsNbBEeMkeJWlMrOW2?= =?us-ascii?Q?gVlVfcPYDQaN5vfb1sdz6FGLjKNoyWuJ05x/Ook20mRydSsd+I361Hjw6cM1?= =?us-ascii?Q?9vHiNjQY5kgq2NJsyKBI2GKe5SaVV3qTNH+LBndZvEWcX4fu4Noc4RJLoXkJ?= =?us-ascii?Q?TZ/aB/4P5EyELC01Awmhr38rZawV3pe1ToGEIrqsfVtXep52uW7isZJLo4u/?= =?us-ascii?Q?jl/QTvBfXqYEYT5QTE6crRkYaCI1mcW0JiVo39sIhjEtTwAAfxn1ff7/AyL7?= =?us-ascii?Q?gmAYloOUfdDJomly/q4ghCQhHShF5KRsHrN3EXj4BCyMm1zs9afKOxflI9N5?= =?us-ascii?Q?/Sm9V16JIncefE6h/lsIMP/TB6htakFr9kbmI7WFcrMuyHrFVCGwbXFSnQML?= =?us-ascii?Q?n/bA61P2ZujWvOcdRz5FozqMwYAzR3StGwY2Ox9agOi5w8Uzujl+wBKITeDi?= =?us-ascii?Q?GMDWJS/DFjWdWndcT2sKvUjIPTYTLT5mHGJ/PNXs?= 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: f83cf97c-49d6-431f-0733-08db5631e7ea X-MS-Exchange-CrossTenant-originalarrivaltime: 16 May 2023 17:20:54.6923 (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: HbTH6vqDIbTpK5WfhEaXScDiqC3lBkkWPok6pTaH2iblCgE6WYe+HDOOPbxCPTvYviW98sJ8HQttW2v26VUO0g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB8376 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 Patch merged: https://github.com/tianocore/edk2-platforms/commit/3c8ea51b1285c983fa81806d= 75a924d87cc7e732 Thanks, Chasel > -----Original Message----- > From: Chen, Aryeh > Sent: Wednesday, May 10, 2023 8:58 PM > To: devel@edk2.groups.io > Cc: Chen, Aryeh ; Chiu, Chasel > ; Desimone, Nathaniel L > ; Oram, Isaac W ; > Gao, Liming ; Dong, Eric ; > Yao, Jiewen ; Sinha, Ankit > Subject: [PATCH v3] 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 > Cc: Ankit Sinha >=20 > Signed-off-by: Aryeh Chen > --- > Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c = | > 154 ++++++++++---------- > Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c = | > 8 +- > Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c = | > 46 +++--- > Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c = | > 4 +- >=20 > Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLi= b > .c | 2 +- > Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec = | 2 > +- >=20 > Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi= .c > | 154 ++++++++++---------- >=20 > Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi > Madt.c | 150 +++++++++---------- >=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 +- > 11 files changed, 264 insertions(+), 264 deletions(-) >=20 > 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; >=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 > @@ -1024,10 +1024,10 @@ PlatformUpdateTables ( > IN OUT EFI_ACPI_TABLE_VERSION *Version >=20 > ) >=20 > { >=20 > - EFI_ACPI_DESCRIPTION_HEADER *TableHeader; >=20 > - UINT8 *TempOemId; >=20 > - UINT64 TempOemTableId; >=20 > - EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE *FadtHeader; >=20 > + EFI_ACPI_DESCRIPTION_HEADER *TableHeader; >=20 > + UINT8 *TempOemId; >=20 > + UINT64 TempOemTableId; >=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 > @@ -1201,18 +1201,18 @@ IsHardwareChange ( > VOID >=20 > ) >=20 > { >=20 > - EFI_STATUS Status; >=20 > - UINTN Index; >=20 > - UINTN HandleCount; >=20 > - EFI_HANDLE *HandleBuffer; >=20 > - EFI_PCI_IO_PROTOCOL *PciIo; >=20 > - UINT32 CRC; >=20 > - UINT32 *HWChange; >=20 > - 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_STATUS Status; >=20 > + UINTN Index; >=20 > + UINTN HandleCount; >=20 > + EFI_HANDLE *HandleBuffer; >=20 > + EFI_PCI_IO_PROTOCOL *PciIo; >=20 > + UINT32 CRC; >=20 > + UINT32 *HWChange; >=20 > + UINTN HWChangeSize; >=20 > + UINT32 PciId; >=20 > + UINTN Handle; >=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/MinPlatformPkg.dec > b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > index 784abb828e..635384b851 100644 > --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > @@ -347,7 +347,7 @@ >=20 > gMinPlatformPkgTokenSpaceGuid.PcdFadtIaPcBootArch|0x0001|UINT16|0x900 > 00026 >=20 >=20 > gMinPlatformPkgTokenSpaceGuid.PcdFadtFlags|0x000086A5|UINT32|0x90000 > 027 >=20 >=20 > gMinPlatformPkgTokenSpaceGuid.PcdFadtMajorVersion|0x06|UINT8|0x900000 > 30 >=20 > - > gMinPlatformPkgTokenSpaceGuid.PcdFadtMinorVersion|0x03|UINT8|0x900000 > 31 >=20 > + > gMinPlatformPkgTokenSpaceGuid.PcdFadtMinorVersion|0x05|UINT8|0x900000 > 31 >=20 >=20 >=20 > [PcdsFixedAtBuild] >=20 >=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..f0c0aaf7d2 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_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BAS > E_ADDRESS_DESCRIPTION_TABLE_SIGNATURE: >=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 > - DumpAcpiHpet ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER > *)Table); >=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,52 +534,52 @@ 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 > + // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Fadt- > >XDsdt); >=20 > } else { >=20 > - // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)Fadt->Ds= dt); >=20 > + // CheckAcpiDsdt ((EFI_ACPI_DESCRIPTION_HEADER *)(UINTN) Fadt- > >Dsdt); >=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 > - return CheckAcpiMcfg > ((EFI_ACPI_MEMORY_MAPPED_CONFIGURATION_BASE_ADDRESS_TABLE_HEA > DER *)Table); >=20 > + case > EFI_ACPI_6_5_PCI_EXPRESS_MEMORY_MAPPED_CONFIGURATION_SPACE_BAS > E_ADDRESS_DESCRIPTION_TABLE_SIGNATURE: >=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 > - return CheckAcpiHpet > ((EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *)Table); >=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 > - return CheckAcpiDmar ((EFI_ACPI_DMAR_HEADER *)Table); >=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 > - return CheckAcpiTpm2 ((EFI_TPM2_ACPI_TABLE *)Table); >=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 > - return CheckAcpiTcpa ((VOID *)Table); >=20 > + case > EFI_ACPI_6_5_TRUSTED_COMPUTING_PLATFORM_ALLIANCE_CAPABILITIES_TA > BLE_SIGNATURE: >=20 > + return CheckAcpiTcpa ((VOID *) Table); >=20 > break; >=20 > default: >=20 > break; >=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..7e29b47a0b 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, " ID=3D0x%02x", ProcessorLocalApic- > >AcpiProcessorUid)); >=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,19 +143,19 @@ 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 > DEBUG ((DEBUG_INFO, ": [0x%02x]", ApicStructHeader->Type)); >=20 > - DEBUG ((DEBUG_INFO, " ID=3D0x%02x", LocalApicNMI->AcpiProcessorId)= ); >=20 > + DEBUG ((DEBUG_INFO, " ID=3D0x%02x", LocalApicNMI->AcpiProcessorUid= )); >=20 > DEBUG ((DEBUG_INFO, " Lint=3D0x%02x", LocalApicNMI->LocalApicLint)= ); >=20 > 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