From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web11.5872.1633137267047397524 for ; Fri, 01 Oct 2021 18:14:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=Z4EB3Hbu; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: nathaniel.l.desimone@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10124"; a="223733032" X-IronPort-AV: E=Sophos;i="5.85,340,1624345200"; d="scan'208";a="223733032" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2021 18:14:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,340,1624345200"; d="scan'208";a="709145829" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga006.fm.intel.com with ESMTP; 01 Oct 2021 18:14:26 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Fri, 1 Oct 2021 18:14:26 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Fri, 1 Oct 2021 18:14:26 -0700 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (104.47.73.170) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Fri, 1 Oct 2021 18:14:26 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NZJ/32uvQuprjC/wxCGmnsCxh4tULGaQrJs9sh5CjvPZpXwuocalnXZ0rtoSU8Qziex/TmjikcxrFizNKp/RI1Gab8iXa1R0X8Jh8pCkdAUo1NUWKSWOwmNKmxqnZ7RYdOk1TUW//tGqT7XLupy6qTzJGTtD8F7BAwSWueNWajJNwqHsl/tppc0gAmU2v2x6yD/B7k1KxChCjW5oXi4rOlCngwhscvmKqaDlXci+9Rdo65q/vZ12v8J0t6357oJGTc7NaNW66v3n6eB05uZbtN8+900hjrIWxpGq2hmb3WomUiNh0Db9OoNKMtyYMq1zofBqo+i9SIcSfNzwWeiicQ== 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=bUh46mDg9OGJOkvzlRI0bh6woYZbUnv20hOOLQoYPtA=; b=kwvdXWJpgY02WD8FTpU+Pq0lpEuzuajOMBmo2+XIdw0eHqZli5wjhvrYReklyFc2aq/iF/+Eck7vTqy8ALVn7WpdOZDG7JEyk09NFmcc8TDRB2c074RBEHKFQ9dsbQ/qH+iiMFhUxImxFQRT3pkWSQRhk9yWivp1RoZ2oR9i4F16cl4dqjbFTH6eplcY7W83/XKLcmILijRS1iVk0jaAXE1XBw/lKh9O04tJ8p4zfaaeZA1Kz+kIsDz7j5ZXJBUGUHExGFTLder6SLQVWAs3Kd8EsM5fLOzuRXhjUh2GTdRfu9jsWN+pf+rA6qwwihCmaw6IdSspXf9tM9bLQeOw6g== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bUh46mDg9OGJOkvzlRI0bh6woYZbUnv20hOOLQoYPtA=; b=Z4EB3Hbu97aqriz55UWE6hgX/jm9P44pfwZM9I9hZPjGo9w6Ep370etk+wRsV0/KKF6huXX8UPxXxBxCWnYaWurMta9AK0zN5Klu3tCkq35Fcj8NfUZsVZ9aayu8gGk5o70wXBwnhXeHQBjyxhiobU2bRBD4cnFMqIzB7tDsfLI= Received: from BN6PR1101MB2147.namprd11.prod.outlook.com (2603:10b6:405:57::23) by BN6PR11MB0050.namprd11.prod.outlook.com (2603:10b6:405:68::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13; Sat, 2 Oct 2021 01:14:24 +0000 Received: from BN6PR1101MB2147.namprd11.prod.outlook.com ([fe80::8cc2:2c77:7283:b88b]) by BN6PR1101MB2147.namprd11.prod.outlook.com ([fe80::8cc2:2c77:7283:b88b%2]) with mapi id 15.20.4566.017; Sat, 2 Oct 2021 01:14:24 +0000 From: "Nate DeSimone" To: "mikuback@linux.microsoft.com" , "devel@edk2.groups.io" CC: "Chiu, Chasel" , Liming Gao , "Dong, Eric" , "Maddy, Daniel" , Michael Kubacki Subject: Re: [edk2-platforms][PATCH v2 1/1] MinPlatformPkg/AcpiTables: Update structures for ACPI 6.3 Thread-Topic: [edk2-platforms][PATCH v2 1/1] MinPlatformPkg/AcpiTables: Update structures for ACPI 6.3 Thread-Index: AQHXsXFDj/y3Bpl6/0avkkuGEcs3yKu+8m4A Date: Sat, 2 Oct 2021 01:14:23 +0000 Message-ID: References: <20210924182244.2295-1-mikuback@linux.microsoft.com> In-Reply-To: <20210924182244.2295-1-mikuback@linux.microsoft.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.6.200.16 dlp-product: dlpe-windows authentication-results: linux.microsoft.com; dkim=none (message not signed) header.d=none;linux.microsoft.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b391f629-4b90-4f42-bf78-08d98541f8a7 x-ms-traffictypediagnostic: BN6PR11MB0050: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3276; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: nbNib0+NFKJ8S3usKgF8RxLS/xHadTN7XW1vPANomPe+k4CDzYJZldYDdvmWfV1K1Q0taxIRPup0pBNw8UMkaId7Q55ShsdTSFSTnWhKGgDrl5osg97GEVjXZyOsEDCFXe38Dg1V71lve+hqBYCfaLy4/whWyQW2Kh3hkq4whRruyMz3vI8egCYqC0VVUCdPBzIdduSMafh0hpC8fAoGPnZNIhsVSuQegYvDxgtxYTNujHqqT6Pd0MwE2rUWAnM5cl5JyxGE+8xLndrRX3txoF4o0U9MMGEgkaG2W5kcj4p4wpdrfjlc4iualqnW6MkV7oOgBT+dF0vqt+5Y4J5dIAiwjsQqGiExe1XApZ0KstwiRsHxyA4AG47WW2c7Qg8dEwFeDuBvEMLDDkbwb8I9IQMGhd4uh/wGPTYioWhO2nFOXHX0ldfl7AN8aqvcKDFVz0leUXfnooB5SoVvQoXugRe9kwh08Ew6Hr636oNZWNzD6Vrl1IWx+b8z+m2NflGhqL64jMinjxuul2An8LOLYB/5/zISZTTFIw9pcqT2V2QToVJtopDp6EpooQruybZuPazTdUifopR7Lqvz9UAOHUbbsUmiLJdyaRydunR8shuAS59kBVPbsryYHEWSugy1C9VAaLqfzF9AQQEKC5eo0PFGBaQkEqKikkUrSvX7WOmtzr6FEv5n85n5Mcx6LkvGCfNT5L/cQrVrYQMpFcxep8NR1NqCCYKgdE7sed77wEEICS0TGjn5m3DtbLDFzHq1CoaaBmnsUTslO6LogW6RHri9Oh3enfZPxjuIWQvwC3jPUaDbFxpSqtTAFb9O4fQ6yb8ruFZjJWONz5cBOfGHQw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN6PR1101MB2147.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(66446008)(83380400001)(64756008)(8676002)(66556008)(66476007)(76116006)(5660300002)(55016002)(8936002)(33656002)(9686003)(19627235002)(66946007)(4326008)(7696005)(316002)(186003)(30864003)(508600001)(86362001)(54906003)(110136005)(38100700002)(71200400001)(15650500001)(6506007)(53546011)(966005)(122000001)(52536014)(2906002)(26005)(38070700005)(45080400002)(579004)(559001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?fHAL3OMKtPKZaG4153qdlD8mAzUoCyuSoNjMHL/v4iQdg1yh69CtTRWQIfA9?= =?us-ascii?Q?SXsgu1BDidk8s1pBteWgAJ4Pf/b+ETAGy38yE9AvVxUaML00KC7C97/CtWBB?= =?us-ascii?Q?4LwDrFq3elW+On4b+gDbj8ozuDjQ24UrbSZVXVIGp+Jb/LSQJVikZCvdm1pL?= =?us-ascii?Q?dVDm+YT3d3vw1+WfKV+czcpuSLadvye1c6IjEzvivJlB82b1BvUH+xd1avT3?= =?us-ascii?Q?q5AK8w8GTlsabp1ktwkza7kTr07WmcAqbzxAn1lrIx3LQBYTJjMbnu5F5jUc?= =?us-ascii?Q?5f9zrVcpIIWSFCcHAMsJL13V6CwcS45Wf599EwPbC0gvZg0AAmxHewWrtrMu?= =?us-ascii?Q?dlVSHRxOwHjUtjnW0gfGQP02xafl0o7l88IArb8Q+w2lpRndTTaNAn8Xh1zw?= =?us-ascii?Q?m/dKYrPr2c2kq4h21/XwfF3fTM4HdmEVaHJB5x5GD1oQKOSr9qI9epOhAONe?= =?us-ascii?Q?ldilG6RWJoH3iO8WVxAoPVGDTC7I7mtKAZtzrcidq8JxL24e0RRIU3/0MeBZ?= =?us-ascii?Q?EWXbrgSLlBw9G9C3VLqnZNT0mya7yvfUuJEdJtDXgTlbVpAEBBj6GyMFfZAh?= =?us-ascii?Q?9fIl6wZ5VVdOEBLp3BSrjGvUTULrcoEFsvf82yd9nXctCRpUcMgs+hZTvlm8?= =?us-ascii?Q?NkonCeVev8EWRSYisZavqZztqbAMaw/XLQGSxFiTaKtm75ETPw3zoXGS10zG?= =?us-ascii?Q?DShFmhuTByw5yPCXackn9zNivDfB/Kah/kAsKa4yxnFmM8ydl5iLssIdADsV?= =?us-ascii?Q?D3BRD45Gws8YV2ZMOUca1lTW8gIgL3sloOlfVWuQJOv6a61RrenUhcgMzzWt?= =?us-ascii?Q?uFt+WO3Tf2HB49/ZDolv/mdouturznLtFUqknoG5tJIxeMHvfzvvDKaqSB5n?= =?us-ascii?Q?DR8dvO4ILjVZ4A8HpTMKZVVZU5ACQZS7N5IEWEixaU36e0GHyivTzT+xERsd?= =?us-ascii?Q?fnSwthYstvso380anbBLHhRvVTn5826Dz3VOsZmoioE8ZrY0oK0JjQSYwJO4?= =?us-ascii?Q?q7Plz2NqlTYgQyWIgEmodUUs7ASoaewn4kVnBaadhcrD9tE4pHLFakUcCVGZ?= =?us-ascii?Q?20ssSsm365rQv46omsLauovj5EnUg7QXwohnQ7z49bxyCjKERbruwSSHC8Pb?= =?us-ascii?Q?/K740nC7LilUpC3VKkl/MGMKcxWT/+TYRmlHb6qaCKZYnKl/rBIzt5RE7n52?= =?us-ascii?Q?Hy3CqKWPgEAu4/OOWBBJYZktzV/P7XmMlrFx5qtDcrDw6i6EVnQMWpMjXeVc?= =?us-ascii?Q?UD5TypuDW6IWcQNep8UoIzJ0/XU3sSALGKRDxI25hXuq/Gj1nXfiR/LfKEZe?= =?us-ascii?Q?g/AbDb/w2PtHonoI0Z2qY5HS?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR1101MB2147.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b391f629-4b90-4f42-bf78-08d98541f8a7 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Oct 2021 01:14:23.9378 (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: 0xcbhGoZbxaNVr7996a/7e77uGrzRoaTj2kgp/dftVhoQi+RJ9TiaJOlOajW2Q2v9Ni0m33Kpc9200ii2QoHAV6jW0NeTfWDCzL4W/r/A3M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB0050 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Pushed: https://github.com/tianocore/edk2-platforms/commit/bbb431a > -----Original Message----- > From: mikuback@linux.microsoft.com > Sent: Friday, September 24, 2021 11:23 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L > ; Liming Gao > ; Dong, Eric ; Maddy, > Daniel ; Michael Kubacki > > Subject: [edk2-platforms][PATCH v2 1/1] MinPlatformPkg/AcpiTables: > Update structures for ACPI 6.3 >=20 > From: Daniel Maddy >=20 > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3535 >=20 > Updates ACPI table structures in MinPlatformPkg for ACPI 6.3. >=20 > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Liming Gao > Cc: Eric Dong > Cc: Daniel Maddy > Co-authored-by: Michael Kubacki > Signed-off-by: Michael Kubacki > Reviewed-by: Nate DeSimone > --- > Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c | 181 > ++++++++++---------- > Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c | 11 +- > Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c | 74 ++++-= --- > 3 files changed, 138 insertions(+), 128 deletions(-) >=20 > diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c > b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c > index 843ba832ce67..f5c4f2c3f1a9 100644 > --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c > +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c > @@ -2,6 +2,7 @@ > ACPI Platform Driver >=20 > Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.
> +Copyright (c) Microsoft Corporation.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -11,7 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #pragma > pack(1) >=20 > typedef struct { > - UINT32 AcpiProcessorId; > + UINT32 AcpiProcessorUid; > UINT32 ApicId; > UINT32 Flags; > UINT32 SocketNum; > @@ -25,9 +26,9 @@ typedef struct { > // Define Union of IO APIC & Local APIC structure; // typedef union { > - EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE AcpiLocalApic; > - EFI_ACPI_4_0_IO_APIC_STRUCTURE AcpiIoApic; > - EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE AcpiLocalx2Apic; > + EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE AcpiLocalApic; > + EFI_ACPI_6_3_IO_APIC_STRUCTURE AcpiIoApic; > + EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE AcpiLocalx2Apic; > struct { > UINT8 Type; > UINT8 Length; > @@ -36,9 +37,9 @@ typedef union { >=20 > #pragma pack() >=20 > -extern EFI_ACPI_5_0_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs; - > extern EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE Fadt; -extern > EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER Hpet; > +extern EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs; > +extern EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt; > +extern EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER Hpet; > extern EFI_ACPI_WSMT_TABLE Wsmt; >=20 > VOID *mLocalTable[] =3D { > @@ -103,7 +104,7 @@ DebugDisplayReOrderTable ( > for (Index =3D 0; Index < mNumberOfCpus; Index++) { > DEBUG ((DEBUG_INFO, " %02d 0x%02X 0x%02X %d %d > %d\n", > Index, > - CpuApicIdOrderTable[Index].AcpiProcessorId, > + CpuApicIdOrderTable[Index].AcpiProcessorUid, > CpuApicIdOrderTable[Index].ApicId, > CpuApicIdOrderTable[Index].Thread, > CpuApicIdOrderTable[Index].Flags, @@ -118,31 = +119,31 @@ > AppendCpuMapTableEntry ( > ) > { > EFI_STATUS Status; > - EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE *LocalApicPtr; > - EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE *LocalX2ApicPtr; > + EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE *LocalApicPtr; > + EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE *LocalX2ApicPtr; > UINT8 Type; >=20 > Status =3D EFI_SUCCESS; > Type =3D ((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiApicCommon.Type; > - LocalApicPtr =3D (EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE > *)(&((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalApic); > - LocalX2ApicPtr =3D (EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE > *)(&((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalx2Apic); > + LocalApicPtr =3D (EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE > + *)(&((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalApic); > + LocalX2ApicPtr =3D (EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE > + *)(&((ACPI_APIC_STRUCTURE_PTR *)ApicPtr)->AcpiLocalx2Apic); >=20 > - if(Type =3D=3D EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC) { > + if(Type =3D=3D EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC) { > if(!mX2ApicEnabled) { > - LocalApicPtr->Flags =3D > (UINT8)mCpuApicIdOrderTable[LocalApicCounter].Flags; > - LocalApicPtr->ApicId =3D > (UINT8)mCpuApicIdOrderTable[LocalApicCounter].ApicId; > - LocalApicPtr->AcpiProcessorId =3D > (UINT8)mCpuApicIdOrderTable[LocalApicCounter].AcpiProcessorId; > + LocalApicPtr->Flags =3D > (UINT8)mCpuApicIdOrderTable[LocalApicCounter].Flags; > + LocalApicPtr->ApicId =3D > (UINT8)mCpuApicIdOrderTable[LocalApicCounter].ApicId; > + LocalApicPtr->AcpiProcessorUid =3D > + (UINT8)mCpuApicIdOrderTable[LocalApicCounter].AcpiProcessorUid; > } else { > - LocalApicPtr->Flags =3D 0; > - LocalApicPtr->ApicId =3D 0xFF; > - LocalApicPtr->AcpiProcessorId =3D (UINT8)0xFF; > + LocalApicPtr->Flags =3D 0; > + LocalApicPtr->ApicId =3D 0xFF; > + LocalApicPtr->AcpiProcessorUid =3D (UINT8)0xFF; > Status =3D EFI_UNSUPPORTED; > } > - } else if(Type =3D=3D EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC) { > + } else if(Type =3D=3D EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC) { > if(mX2ApicEnabled) { > LocalX2ApicPtr->Flags =3D > (UINT8)mCpuApicIdOrderTable[LocalApicCounter].Flags; > LocalX2ApicPtr->X2ApicId =3D > mCpuApicIdOrderTable[LocalApicCounter].ApicId; > - LocalX2ApicPtr->AcpiProcessorUid =3D > mCpuApicIdOrderTable[LocalApicCounter].AcpiProcessorId; > + LocalX2ApicPtr->AcpiProcessorUid =3D > + mCpuApicIdOrderTable[LocalApicCounter].AcpiProcessorUid; > } else { > LocalX2ApicPtr->Flags =3D 0; > LocalX2ApicPtr->X2ApicId =3D (UINT32)-1; > @@ -201,15 +202,15 @@ SortCpuLocalApicInTable ( > //update processorbitMask > if (CpuIdMapPtr->Flags =3D=3D 1) { > if (mForceX2ApicId) { > - CpuIdMapPtr->SocketNum &=3D 0x7; > - CpuIdMapPtr->AcpiProcessorId &=3D 0xFF; //keep lower 8bit due = to use > Proc obj in dsdt > + CpuIdMapPtr->SocketNum &=3D 0x7; > + CpuIdMapPtr->AcpiProcessorUid &=3D 0xFF; //keep lower 8bit due > + to use Proc obj in dsdt > } > } > } else { //not enabled > - CpuIdMapPtr->ApicId =3D (UINT32)-1; > - CpuIdMapPtr->Thread =3D (UINT32)-1; > - CpuIdMapPtr->Flags =3D 0; > - CpuIdMapPtr->SocketNum =3D (UINT32)-1; > + CpuIdMapPtr->ApicId =3D (UINT32)-1; > + CpuIdMapPtr->Thread =3D (UINT32)-1; > + CpuIdMapPtr->Flags =3D 0; > + CpuIdMapPtr->SocketNum =3D (UINT32)-1; > } //end if PROC ENABLE > } //end for CurrentProcessor >=20 > @@ -280,12 +281,12 @@ SortCpuLocalApicInTable ( > } >=20 > // > - // 5. Re-assigen AcpiProcessorId for AcpiProcessorUId uses purpose. > + // 5. Re-assign AcpiProcessorId for AcpiProcessorUid uses purpose. > // > for (Socket =3D 0; Socket < FixedPcdGet32 (PcdMaxCpuSocketCount); > Socket++) { > for (CurrProcessor =3D 0, Index =3D 0; CurrProcessor < mNumberOfCpus= ; > CurrProcessor++) { > if (mCpuApicIdOrderTable[CurrProcessor].Flags && > (mCpuApicIdOrderTable[CurrProcessor].SocketNum =3D=3D Socket)) { > - mCpuApicIdOrderTable[CurrProcessor].AcpiProcessorId =3D > (ProcessorInfoBuffer.Location.Package << mNumOfBitShift) + Index; > + mCpuApicIdOrderTable[CurrProcessor].AcpiProcessorUid =3D > + (ProcessorInfoBuffer.Location.Package << mNumOfBitShift) + Index; > Index++; > } > } > @@ -312,17 +313,17 @@ typedef struct { > } STRUCTURE_HEADER; >=20 > STRUCTURE_HEADER mMadtStructureTable[] =3D { > - {EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC, sizeof > (EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE)}, > - {EFI_ACPI_4_0_IO_APIC, sizeof > (EFI_ACPI_4_0_IO_APIC_STRUCTURE)}, > - {EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE, sizeof > (EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE)}, > - {EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE, sizeof > (EFI_ACPI_4_0_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE)}, > - {EFI_ACPI_4_0_LOCAL_APIC_NMI, sizeof > (EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE)}, > - {EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE, sizeof > (EFI_ACPI_4_0_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE)}, > - {EFI_ACPI_4_0_IO_SAPIC, sizeof > (EFI_ACPI_4_0_IO_SAPIC_STRUCTURE)}, > - {EFI_ACPI_4_0_LOCAL_SAPIC, sizeof > (EFI_ACPI_4_0_PROCESSOR_LOCAL_SAPIC_STRUCTURE)}, > - {EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES, sizeof > (EFI_ACPI_4_0_PLATFORM_INTERRUPT_SOURCES_STRUCTURE)}, > - {EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC, sizeof > (EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE)}, > - {EFI_ACPI_4_0_LOCAL_X2APIC_NMI, sizeof > (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE)} > + {EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC, sizeof > (EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE)}, > + {EFI_ACPI_6_3_IO_APIC, sizeof > (EFI_ACPI_6_3_IO_APIC_STRUCTURE)}, > + {EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE, sizeof > (EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE)}, > + {EFI_ACPI_6_3_NON_MASKABLE_INTERRUPT_SOURCE, sizeof > (EFI_ACPI_6_3_NON_MASKABLE_INTERRUPT_SOURCE_STRUCTURE)}, > + {EFI_ACPI_6_3_LOCAL_APIC_NMI, sizeof > (EFI_ACPI_6_3_LOCAL_APIC_NMI_STRUCTURE)}, > + {EFI_ACPI_6_3_LOCAL_APIC_ADDRESS_OVERRIDE, sizeof > (EFI_ACPI_6_3_LOCAL_APIC_ADDRESS_OVERRIDE_STRUCTURE)}, > + {EFI_ACPI_6_3_IO_SAPIC, sizeof > (EFI_ACPI_6_3_IO_SAPIC_STRUCTURE)}, > + {EFI_ACPI_6_3_LOCAL_SAPIC, sizeof > (EFI_ACPI_6_3_PROCESSOR_LOCAL_SAPIC_STRUCTURE)}, > + {EFI_ACPI_6_3_PLATFORM_INTERRUPT_SOURCES, sizeof > (EFI_ACPI_6_3_PLATFORM_INTERRUPT_SOURCES_STRUCTURE)}, > + {EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC, sizeof > (EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE)}, > + {EFI_ACPI_6_3_LOCAL_X2APIC_NMI, sizeof > (EFI_ACPI_6_3_LOCAL_X2APIC_NMI_STRUCTURE)} > }; >=20 > /** > @@ -481,7 +482,7 @@ InitializeHeader ( > **/ > EFI_STATUS > InitializeMadtHeader ( > - IN OUT EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER > *MadtHeader > + IN OUT EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER > + *MadtHeader > ) > { > EFI_STATUS Status; > @@ -493,8 +494,8 @@ InitializeMadtHeader ( >=20 > Status =3D InitializeHeader ( > &MadtHeader->Header, > - EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, > - EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION, > + EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, > + EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION, > 0 > ); > if (EFI_ERROR (Status)) { > @@ -502,7 +503,7 @@ InitializeMadtHeader ( > } >=20 > MadtHeader->LocalApicAddress =3D PcdGet32(PcdLocalApicAddress); > - MadtHeader->Flags =3D EFI_ACPI_4_0_PCAT_COMPAT; > + MadtHeader->Flags =3D EFI_ACPI_6_3_PCAT_COMPAT; >=20 > return EFI_SUCCESS; > } > @@ -539,7 +540,7 @@ CopyStructure ( > // > // Initialize the number of table entries and the table based on the t= able > header passed in. > // > - if (Header->Signature =3D=3D > EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE) { > + if (Header->Signature =3D=3D > + EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE) { > TableNumEntries =3D sizeof (mMadtStructureTable) / sizeof > (STRUCTURE_HEADER); > StructureTable =3D mMadtStructureTable; > } else { > @@ -649,7 +650,7 @@ BuildAcpiTable ( > return EFI_INVALID_PARAMETER; > } >=20 > - if (AcpiHeader->Signature !=3D > EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE) { > + if (AcpiHeader->Signature !=3D > + EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE) { > DEBUG (( > DEBUG_ERROR, > "MADT header signature is expected, actually 0x%08x\n", @@ -740,15 > +741,15 @@ InstallMadtFromScratch ( { > EFI_STATUS Status; > UINTN Index; > - EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER > *NewMadtTable; > + EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER > *NewMadtTable; > UINTN TableHandle; > - EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER > MadtTableHeader; > - EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE > ProcLocalApicStruct; > - EFI_ACPI_4_0_IO_APIC_STRUCTURE IoApicStruct; > - EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE > IntSrcOverrideStruct; > - EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE LocalApciNmiStruct= ; > - EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE > ProcLocalX2ApicStruct; > - EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE > LocalX2ApicNmiStruct; > + EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER > MadtTableHeader; > + EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE > ProcLocalApicStruct; > + EFI_ACPI_6_3_IO_APIC_STRUCTURE IoApicStruct; > + EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE > IntSrcOverrideStruct; > + EFI_ACPI_6_3_LOCAL_APIC_NMI_STRUCTURE LocalApciNmiStruct= ; > + EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE > ProcLocalX2ApicStruct; > + EFI_ACPI_6_3_LOCAL_X2APIC_NMI_STRUCTURE > LocalX2ApicNmiStruct; > STRUCTURE_HEADER **MadtStructs; > UINTN MaxMadtStructCount= ; > UINTN MadtStructsIndex; > @@ -809,11 +810,11 @@ InstallMadtFromScratch ( > // > // Build Processor Local APIC Structures and Processor Local X2APIC > Structures > // > - ProcLocalApicStruct.Type =3D EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC; > - ProcLocalApicStruct.Length =3D sizeof > (EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC_STRUCTURE); > + ProcLocalApicStruct.Type =3D EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC; > + ProcLocalApicStruct.Length =3D sizeof > + (EFI_ACPI_6_3_PROCESSOR_LOCAL_APIC_STRUCTURE); >=20 > - ProcLocalX2ApicStruct.Type =3D EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC; > - ProcLocalX2ApicStruct.Length =3D sizeof > (EFI_ACPI_4_0_PROCESSOR_LOCAL_X2APIC_STRUCTURE); > + ProcLocalX2ApicStruct.Type =3D EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC; > + ProcLocalX2ApicStruct.Length =3D sizeof > + (EFI_ACPI_6_3_PROCESSOR_LOCAL_X2APIC_STRUCTURE); > ProcLocalX2ApicStruct.Reserved[0] =3D 0; > ProcLocalX2ApicStruct.Reserved[1] =3D 0; >=20 > @@ -824,9 +825,9 @@ InstallMadtFromScratch ( > // use a processor local x2APIC structure. > // > if (!mX2ApicEnabled && mCpuApicIdOrderTable[Index].ApicId < > MAX_UINT8) { > - ProcLocalApicStruct.Flags =3D (UINT8) > mCpuApicIdOrderTable[Index].Flags; > - ProcLocalApicStruct.ApicId =3D (UINT8) > mCpuApicIdOrderTable[Index].ApicId; > - ProcLocalApicStruct.AcpiProcessorId =3D (UINT8) > mCpuApicIdOrderTable[Index].AcpiProcessorId; > + ProcLocalApicStruct.Flags =3D (UINT8) > mCpuApicIdOrderTable[Index].Flags; > + ProcLocalApicStruct.ApicId =3D (UINT8) > mCpuApicIdOrderTable[Index].ApicId; > + ProcLocalApicStruct.AcpiProcessorUid =3D (UINT8) > + mCpuApicIdOrderTable[Index].AcpiProcessorUid; >=20 > ASSERT (MadtStructsIndex < MaxMadtStructCount); > Status =3D CopyStructure ( > @@ -837,7 +838,7 @@ InstallMadtFromScratch ( > } else if (mCpuApicIdOrderTable[Index].ApicId !=3D 0xFFFFFFFF) { > ProcLocalX2ApicStruct.Flags =3D (UINT8) > mCpuApicIdOrderTable[Index].Flags; > ProcLocalX2ApicStruct.X2ApicId =3D > mCpuApicIdOrderTable[Index].ApicId; > - ProcLocalX2ApicStruct.AcpiProcessorUid =3D > mCpuApicIdOrderTable[Index].AcpiProcessorId; > + ProcLocalX2ApicStruct.AcpiProcessorUid =3D > + mCpuApicIdOrderTable[Index].AcpiProcessorUid; >=20 > ASSERT (MadtStructsIndex < MaxMadtStructCount); > Status =3D CopyStructure ( > @@ -855,8 +856,8 @@ InstallMadtFromScratch ( > // > // Build I/O APIC Structures > // > - IoApicStruct.Type =3D EFI_ACPI_4_0_IO_APIC; > - IoApicStruct.Length =3D sizeof (EFI_ACPI_4_0_IO_APIC_STRUCTURE); > + IoApicStruct.Type =3D EFI_ACPI_6_3_IO_APIC; IoApicStruct.Length =3D > + sizeof (EFI_ACPI_6_3_IO_APIC_STRUCTURE); > IoApicStruct.Reserved =3D 0; >=20 > PcIoApicEnable =3D PcdGet32 (PcdPcIoApicEnable); @@ -902,8 +903,8 @@ > InstallMadtFromScratch ( > // > // Build Interrupt Source Override Structures > // > - IntSrcOverrideStruct.Type =3D > EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE; > - IntSrcOverrideStruct.Length =3D sizeof > (EFI_ACPI_4_0_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE); > + IntSrcOverrideStruct.Type =3D > EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE; > + IntSrcOverrideStruct.Length =3D sizeof > + (EFI_ACPI_6_3_INTERRUPT_SOURCE_OVERRIDE_STRUCTURE); >=20 > // > // IRQ0=3D>IRQ2 Interrupt Source Override Structure @@ -946,11 +947,11 > @@ InstallMadtFromScratch ( > // > // Build Local APIC NMI Structures > // > - LocalApciNmiStruct.Type =3D EFI_ACPI_4_0_LOCAL_APIC_NMI; > - LocalApciNmiStruct.Length =3D sizeof > (EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE); > - LocalApciNmiStruct.AcpiProcessorId =3D 0xFF; // Applies to all pr= ocessors > - LocalApciNmiStruct.Flags =3D 0x0005; // Flags - Edge-tigg= ered, Active > High > - LocalApciNmiStruct.LocalApicLint =3D 0x1; > + LocalApciNmiStruct.Type =3D EFI_ACPI_6_3_LOCAL_APIC_NMI; > + LocalApciNmiStruct.Length =3D sizeof > (EFI_ACPI_6_3_LOCAL_APIC_NMI_STRUCTURE); > + LocalApciNmiStruct.AcpiProcessorUid =3D 0xFF; // Applies to all p= rocessors > + LocalApciNmiStruct.Flags =3D 0x0005; // Flags - Edge-tig= gered, Active > High > + LocalApciNmiStruct.LocalApicLint =3D 0x1; >=20 > ASSERT (MadtStructsIndex < MaxMadtStructCount); > Status =3D CopyStructure ( > @@ -967,8 +968,8 @@ InstallMadtFromScratch ( > // Build Local x2APIC NMI Structure > // > if (mX2ApicEnabled) { > - LocalX2ApicNmiStruct.Type =3D EFI_ACPI_4_0_LOCAL_X2APIC_NMI; > - LocalX2ApicNmiStruct.Length =3D sizeof > (EFI_ACPI_4_0_LOCAL_X2APIC_NMI_STRUCTURE); > + LocalX2ApicNmiStruct.Type =3D EFI_ACPI_6_3_LOCAL_X2APIC_NMI; > + LocalX2ApicNmiStruct.Length =3D sizeof > + (EFI_ACPI_6_3_LOCAL_X2APIC_NMI_STRUCTURE); > LocalX2ApicNmiStruct.Flags =3D 0x000D; // Flags - Le= vel-tiggered, > Active High > LocalX2ApicNmiStruct.AcpiProcessorUid =3D 0xFFFFFFFF; // Applies to= all > processors > LocalX2ApicNmiStruct.LocalX2ApicLint =3D 0x01; @@ -992,12 +993,12 @= @ > InstallMadtFromScratch ( > // Build Madt Structure from the Madt Header and collection of pointer= s in > MadtStructs[] > // > Status =3D BuildAcpiTable ( > - (EFI_ACPI_DESCRIPTION_HEADER *) &MadtTableHeader, > - sizeof > (EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER), > - MadtStructs, > - MadtStructsIndex, > - (UINT8 **) &NewMadtTable > - ); > + (EFI_ACPI_DESCRIPTION_HEADER *) &MadtTableHeader, > + sizeof > (EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER), > + MadtStructs, > + MadtStructsIndex, > + (UINT8 **)&NewMadtTable > + ); > if (EFI_ERROR (Status)) { > DEBUG ((DEBUG_ERROR, "BuildAcpiTable failed: %r\n", Status)); > goto Done; > @@ -1087,7 +1088,7 @@ InstallMcfgFromScratch ( > } >=20 > // > - // Publish Madt Structure to ACPI > + // Publish Mcfg Structure to ACPI > // > Status =3D mAcpiTable->InstallAcpiTable ( > mAcpiTable, > @@ -1120,7 +1121,7 @@ PlatformUpdateTables ( > EFI_ACPI_DESCRIPTION_HEADER *TableHeader; > UINT8 *TempOemId; > UINT64 TempOemTableId; > - EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *FadtHeader; > + EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE *FadtHeader; > EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER *HpetTable; > UINT32 HpetBaseAddress; > EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_BLOCK_ID HpetBlockId; > @@ -1177,12 +1178,12 @@ PlatformUpdateTables ( > // > switch (Table->Signature) { >=20 > - case EFI_ACPI_4_0_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE: > - ASSERT (FALSE); > + case EFI_ACPI_6_3_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE: > + ASSERT(FALSE); > break; >=20 > - case EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE: > - FadtHeader =3D (EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE *) > Table; > + case EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE: > + FadtHeader =3D (EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE *) Table; >=20 > FadtHeader->PreferredPmProfile =3D PcdGet8 > (PcdFadtPreferredPmProfile); > FadtHeader->IaPcBootArch =3D PcdGet16 (PcdFadtIaPcBootArch); > @@ -1228,7 +1229,7 @@ PlatformUpdateTables ( > DEBUG ((DEBUG_INFO, " Flags 0x%x\n", FadtHeader->Flags)); > break; >=20 > - case EFI_ACPI_3_0_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE: > + case EFI_ACPI_6_3_HIGH_PRECISION_EVENT_TIMER_TABLE_SIGNATURE: > HpetTable =3D (EFI_ACPI_HIGH_PRECISION_EVENT_TIMER_TABLE_HEADER > *)Table; > HpetBaseAddress =3D PcdGet32 (PcdHpetBaseAddress); > HpetTable->BaseAddressLower32Bit.Address =3D HpetBaseAddress; @@ - > 1280,8 +1281,8 @@ IsHardwareChange ( > UINTN HWChangeSize; > UINT32 PciId; > UINTN Handle; > - EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *FacsPtr; > - EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *pFADT; > + EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE *FacsPtr; > + EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE *pFADT; >=20 > HandleCount =3D 0; > HandleBuffer =3D NULL; > @@ -1327,7 +1328,7 @@ IsHardwareChange ( > // > Handle =3D 0; > Status =3D LocateAcpiTableBySignature ( > - EFI_ACPI_1_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, > + EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, > (EFI_ACPI_DESCRIPTION_HEADER **) &pFADT, > &Handle > ); > @@ -1349,7 +1350,7 @@ IsHardwareChange ( > // > // Set HardwareSignature value based on CRC value. > // > - FacsPtr =3D (EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE > *)(UINTN)pFADT->FirmwareCtrl; > + FacsPtr =3D (EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE > + *)(UINTN)pFADT->FirmwareCtrl; > FacsPtr->HardwareSignature =3D CRC; > FreePool (HWChange); > } > diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c > b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c > index cde6e478c6b9..8700c44e633d 100644 > --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c > +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c > @@ -1,9 +1,10 @@ > /** @file > - This file contains a structure definition for the ACPI 5.0 Firmware AC= PI > + This file contains a structure definition for the ACPI 6.3 Firmware > + ACPI > Control Structure (FACS). The contents of this file should only be mo= dified > for bug fixes, no porting is required. >=20 > Copyright (c) 2017, Intel Corporation. All rights reserved.
> +Copyright (c) Microsoft Corporation.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -35,9 +36,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // Please > modify all values in Facs.h only. > // >=20 > -EFI_ACPI_5_0_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs =3D { > - EFI_ACPI_5_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE, > - sizeof (EFI_ACPI_5_0_FIRMWARE_ACPI_CONTROL_STRUCTURE), > +EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs =3D { > + EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE, > + sizeof (EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE), >=20 > // > // Hardware Signature will be updated at runtime @@ -48,7 +49,7 @@ > EFI_ACPI_5_0_FIRMWARE_ACPI_CONTROL_STRUCTURE Facs =3D { > EFI_ACPI_GLOBAL_LOCK, > EFI_ACPI_FIRMWARE_CONTROL_STRUCTURE_FLAGS, > EFI_ACPI_X_FIRMWARE_WAKING_VECTOR, > - EFI_ACPI_5_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION, > + EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_VERSION, > { > EFI_ACPI_RESERVED_BYTE, > EFI_ACPI_RESERVED_BYTE, > diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c > b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c > index 6efb38cda40d..3418e960972f 100644 > --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c > +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c > @@ -1,9 +1,10 @@ > /** @file > - This file contains a structure definition for the ACPI 5.0 Fixed ACPI > + This file contains a structure definition for the ACPI 6.3 Fixed ACPI > Description Table (FADT). The contents of this file should only be mo= dified > for bug fixes, no porting is required. >=20 > Copyright (c) 2017, Intel Corporation. All rights reserved.
> +Copyright (c) Microsoft Corporation.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -44,9 +45,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // // I= A- > PC Boot Architecture Flags // > - > #define EFI_ACPI_IAPC_BOOT_ARCH 0 // To be fixed >=20 > +// > +// ARM Boot Architecture Flags > +// > +#define EFI_ACPI_ARM_BOOT_ARCH 0 // To be fixed > + > // > // Fixed Feature Flags > // > @@ -55,7 +60,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // // > PM1A Event Register Block Generic Address Information // -#define > EFI_ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID EFI_ACPI_2_0_SYSTEM_IO > +#define EFI_ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO > #define EFI_ACPI_PM1A_EVT_BLK_BIT_WIDTH 0x20 > #define EFI_ACPI_PM1A_EVT_BLK_BIT_OFFSET 0x00 > #define EFI_ACPI_PM1A_EVT_BLK_ADDRESS 0 // To be fixed > @@ -63,7 +68,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // // > PM1B Event Register Block Generic Address Information // -#define > EFI_ACPI_PM1B_EVT_BLK_ADDRESS_SPACE_ID EFI_ACPI_2_0_SYSTEM_IO > +#define EFI_ACPI_PM1B_EVT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO > #define EFI_ACPI_PM1B_EVT_BLK_BIT_WIDTH 0x00 > #define EFI_ACPI_PM1B_EVT_BLK_BIT_OFFSET 0x00 > #define EFI_ACPI_PM1B_EVT_BLK_ADDRESS 0 // To be fixed > @@ -71,7 +76,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // // > PM1A Control Register Block Generic Address Information // -#define > EFI_ACPI_PM1A_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_2_0_SYSTEM_IO > +#define EFI_ACPI_PM1A_CNT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO > #define EFI_ACPI_PM1A_CNT_BLK_BIT_WIDTH 0x10 > #define EFI_ACPI_PM1A_CNT_BLK_BIT_OFFSET 0x00 > #define EFI_ACPI_PM1A_CNT_BLK_ADDRESS 0 // To be fixed > @@ -79,7 +84,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // // > PM1B Control Register Block Generic Address Information // -#define > EFI_ACPI_PM1B_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_2_0_SYSTEM_IO > +#define EFI_ACPI_PM1B_CNT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO > #define EFI_ACPI_PM1B_CNT_BLK_BIT_WIDTH 0x00 > #define EFI_ACPI_PM1B_CNT_BLK_BIT_OFFSET 0x00 > #define EFI_ACPI_PM1B_CNT_BLK_ADDRESS 0 // To be fixed > @@ -87,7 +92,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // // > PM2 Control Register Block Generic Address Information // -#define > EFI_ACPI_PM2_CNT_BLK_ADDRESS_SPACE_ID EFI_ACPI_2_0_SYSTEM_IO > +#define EFI_ACPI_PM2_CNT_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO > #define EFI_ACPI_PM2_CNT_BLK_BIT_WIDTH 0x08 > #define EFI_ACPI_PM2_CNT_BLK_BIT_OFFSET 0x00 > #define EFI_ACPI_PM2_CNT_BLK_ADDRESS 0 // To be fixed > @@ -96,7 +101,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // > Power Management Timer Control Register Block Generic Address // > Information // -#define EFI_ACPI_PM_TMR_BLK_ADDRESS_SPACE_ID > EFI_ACPI_2_0_SYSTEM_IO > +#define EFI_ACPI_PM_TMR_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO > #define EFI_ACPI_PM_TMR_BLK_BIT_WIDTH 0x20 > #define EFI_ACPI_PM_TMR_BLK_BIT_OFFSET 0x00 > #define EFI_ACPI_PM_TMR_BLK_ADDRESS 0 // To be fixed > @@ -105,7 +110,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // > General Purpose Event 0 Register Block Generic Address // Information /= / - > #define EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID > EFI_ACPI_2_0_SYSTEM_IO > +#define EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO > #define EFI_ACPI_GPE0_BLK_BIT_WIDTH 0 // size of > R_PCH_ACPI_GPE0_STS_127_96 + R_PCH_ACPI_GPE0_EN_127_96 > #define EFI_ACPI_GPE0_BLK_BIT_OFFSET 0x00 > #define EFI_ACPI_GPE0_BLK_ADDRESS 0 // To be fixed > @@ -114,14 +119,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // > General Purpose Event 1 Register Block Generic Address // Information /= / - > #define EFI_ACPI_GPE1_BLK_ADDRESS_SPACE_ID > EFI_ACPI_2_0_SYSTEM_IO > +#define EFI_ACPI_GPE1_BLK_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO > #define EFI_ACPI_GPE1_BLK_BIT_WIDTH 0x0 > #define EFI_ACPI_GPE1_BLK_BIT_OFFSET 0x0 > #define EFI_ACPI_GPE1_BLK_ADDRESS 0 // To be fixed > // > // Reset Register Generic Address Information // -#define > EFI_ACPI_RESET_REG_ADDRESS_SPACE_ID EFI_ACPI_2_0_SYSTEM_IO > +#define EFI_ACPI_RESET_REG_ADDRESS_SPACE_ID > EFI_ACPI_6_3_SYSTEM_IO > #define EFI_ACPI_RESET_REG_BIT_WIDTH 0x08 > #define EFI_ACPI_RESET_REG_BIT_OFFSET 0x00 > #define EFI_ACPI_RESET_REG_ADDRESS 0x00000CF9 > @@ -162,11 +167,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // > Please modify all values in Fadt.h only. > // >=20 > -EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { > +EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { > { > - EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, > - sizeof (EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE), > - EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION, > + EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, > + sizeof (EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE), > + EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_REVISION, >=20 > // > // Checksum will be updated at runtime @@ -187,9 +192,9 @@ > EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { > // > // These addresses will be updated at runtime > // > - 0x00000000, > 0x00000000, > - > + 0x00000000, > + > EFI_ACPI_RESERVED_BYTE, > EFI_ACPI_PREFERRED_PM_PROFILE, > EFI_ACPI_SCI_INT, > @@ -198,7 +203,7 @@ EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE > Fadt =3D { > EFI_ACPI_ACPI_DISABLE, > EFI_ACPI_S4_BIOS_REQ, > EFI_ACPI_PSTATE_CNT, > - > + > EFI_ACPI_PM1A_EVT_BLK_ADDRESS, > EFI_ACPI_PM1B_EVT_BLK_ADDRESS, > EFI_ACPI_PM1A_CNT_BLK_ADDRESS, > @@ -240,15 +245,13 @@ EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE > Fadt =3D { > EFI_ACPI_RESET_REG_ADDRESS_SPACE_ID, > EFI_ACPI_RESET_REG_BIT_WIDTH, > EFI_ACPI_RESET_REG_BIT_OFFSET, > - EFI_ACPI_5_0_BYTE, > + EFI_ACPI_6_3_BYTE, > EFI_ACPI_RESET_REG_ADDRESS > }, > EFI_ACPI_RESET_VALUE, > - { > - EFI_ACPI_RESERVED_BYTE, > - EFI_ACPI_RESERVED_BYTE, > - EFI_ACPI_RESERVED_BYTE > - }, > + > + EFI_ACPI_ARM_BOOT_ARCH, > + EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_MINOR_REVISION, >=20 > // > // These addresses will be updated at runtime @@ -263,7 +266,7 @@ > EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE Fadt =3D { > EFI_ACPI_PM1A_EVT_BLK_ADDRESS_SPACE_ID, > EFI_ACPI_PM1A_EVT_BLK_BIT_WIDTH, > EFI_ACPI_PM1A_EVT_BLK_BIT_OFFSET, > - EFI_ACPI_5_0_WORD, > + EFI_ACPI_6_3_WORD, > EFI_ACPI_PM1A_EVT_BLK_ADDRESS > }, > { > @@ -273,7 +276,7 @@ EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE > Fadt =3D { > EFI_ACPI_PM1B_EVT_BLK_ADDRESS_SPACE_ID, > EFI_ACPI_PM1B_EVT_BLK_BIT_WIDTH, > EFI_ACPI_PM1B_EVT_BLK_BIT_OFFSET, > - EFI_ACPI_5_0_WORD, > + EFI_ACPI_6_3_WORD, > EFI_ACPI_PM1B_EVT_BLK_ADDRESS > }, > { > @@ -283,7 +286,7 @@ EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE > Fadt =3D { > EFI_ACPI_PM1A_CNT_BLK_ADDRESS_SPACE_ID, > EFI_ACPI_PM1A_CNT_BLK_BIT_WIDTH, > EFI_ACPI_PM1A_CNT_BLK_BIT_OFFSET, > - EFI_ACPI_5_0_WORD, > + EFI_ACPI_6_3_WORD, > EFI_ACPI_PM1A_CNT_BLK_ADDRESS > }, > { > @@ -293,7 +296,7 @@ EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE > Fadt =3D { > EFI_ACPI_PM1B_CNT_BLK_ADDRESS_SPACE_ID, > EFI_ACPI_PM1B_CNT_BLK_BIT_WIDTH, > EFI_ACPI_PM1B_CNT_BLK_BIT_OFFSET, > - EFI_ACPI_5_0_WORD, > + EFI_ACPI_6_3_WORD, > EFI_ACPI_PM1B_CNT_BLK_ADDRESS > }, > { > @@ -303,7 +306,7 @@ EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE > Fadt =3D { > EFI_ACPI_PM2_CNT_BLK_ADDRESS_SPACE_ID, > EFI_ACPI_PM2_CNT_BLK_BIT_WIDTH, > EFI_ACPI_PM2_CNT_BLK_BIT_OFFSET, > - EFI_ACPI_5_0_BYTE, > + EFI_ACPI_6_3_BYTE, > EFI_ACPI_PM2_CNT_BLK_ADDRESS > }, > { > @@ -313,7 +316,7 @@ EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE > Fadt =3D { > EFI_ACPI_PM_TMR_BLK_ADDRESS_SPACE_ID, > EFI_ACPI_PM_TMR_BLK_BIT_WIDTH, > EFI_ACPI_PM_TMR_BLK_BIT_OFFSET, > - EFI_ACPI_5_0_DWORD, > + EFI_ACPI_6_3_DWORD, > EFI_ACPI_PM_TMR_BLK_ADDRESS > }, > { > @@ -323,7 +326,7 @@ EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE > Fadt =3D { > EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID, > EFI_ACPI_GPE0_BLK_BIT_WIDTH, > EFI_ACPI_GPE0_BLK_BIT_OFFSET, > - EFI_ACPI_5_0_BYTE, > + EFI_ACPI_6_3_BYTE, > EFI_ACPI_GPE0_BLK_ADDRESS > }, > { > @@ -333,7 +336,7 @@ EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE > Fadt =3D { > EFI_ACPI_GPE1_BLK_ADDRESS_SPACE_ID, > EFI_ACPI_GPE1_BLK_BIT_WIDTH, > EFI_ACPI_GPE1_BLK_BIT_OFFSET, > - EFI_ACPI_5_0_BYTE, > + EFI_ACPI_6_3_BYTE, > EFI_ACPI_GPE1_BLK_ADDRESS > }, > { > @@ -355,5 +358,10 @@ EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE > Fadt =3D { > 0, > 0, > 0 > - } > + }, > + > + // > + // Hypervisor Vendor Identity > + // > + 0x0000000000000000, > }; > -- > 2.28.0.windows.1