From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (EUR01-DB5-obe.outbound.protection.outlook.com [40.107.15.44]) by mx.groups.io with SMTP id smtpd.web11.37699.1634569881663773459 for ; Mon, 18 Oct 2021 08:11:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=KlRzZKDU; spf=pass (domain: arm.com, ip: 40.107.15.44, mailfrom: christopher.jones@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l+4TVY+kzyUN9lUPJ9n+BISkqw1BnVOh6sDDDmDElS8=; b=KlRzZKDU1TZNUiP5u9d9pqdyG44KZO+2IH/d8l2Wtlup3xJG2WSFYPbcIFq7x2o9Mk7H9YrhngIlq0DT9ypoPrHgC9374eXj/j3F1muW+Zn7glXSi5/zkzwFGs+RMyJz5jFFmKh/ioddk5FXQ2lp2IYQulytHDGHd6KzmTPb+3E= Received: from AS9PR06CA0163.eurprd06.prod.outlook.com (2603:10a6:20b:45c::24) by DBBPR08MB4281.eurprd08.prod.outlook.com (2603:10a6:10:c4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Mon, 18 Oct 2021 15:11:12 +0000 Received: from AM5EUR03FT063.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:45c:cafe::2e) by AS9PR06CA0163.outlook.office365.com (2603:10a6:20b:45c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT063.mail.protection.outlook.com (10.152.16.226) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:11 +0000 Received: ("Tessian outbound e27daf245730:v103"); Mon, 18 Oct 2021 15:11:11 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 03e558f48bdab4fd X-CR-MTA-TID: 64aa7808 Received: from 11a0b21f19ef.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id CAAA0E6E-09A5-407D-88DB-18287C50DE35.1; Mon, 18 Oct 2021 15:11:05 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 11a0b21f19ef.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 18 Oct 2021 15:11:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aBN4AGm4GCK8wCShvTdiFrm0Wn9FrMVOPBqO+bDWAAyfc0KxXkm14vyCQjOxIKIWAjMfW3FevRk0BCTVjRz3bD+Ftu/OaFfiJQdKr4zDi5nkgF44VrugPy58Z8POCrI7Q9n3yKO2B4hx1tyz5wgGa6PLkMuPQFmSI8lAcJgSyucapSBPJqLSt8mXPaSC+3o9+MBniZWZdRIxg52BFxnOMQwYf9fUmrLN2x7nmXm4foP50cC+ls1ACJQcevsVN33KIZFZI4I1e1VuaAd12EWqSPRGmYAt+Rrpw+PGDgMEXrzMcbuDua/WXs9/hTF2PZt3Kjk3yA7FGGT5jJpRDsi0PQ== 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=l+4TVY+kzyUN9lUPJ9n+BISkqw1BnVOh6sDDDmDElS8=; b=RZxqEencfIREg4HY1O6plwv/TaI2HOJZ/idGB3AUjFl/jUFPw1dAqRDO5fHP9CTerMpS6KFWBhn/VImW+O57ow/sCvwZuMtsnjXX748Lwwda5tzSSdK7kom930I7XURLjCrU0ImCZZZOWwykExHUlLEiHf3sZImyjS8FBwZbCBRhGfrkyP0bkhYn/fxmINXTOYcO0lYNR+XS0+kKIapuya4qFpSFvqipZ00VRJEBjM+rZSpko6g9QdB2vOIaekL+kIuFsmMKYoNve/lJ1D0h/aMQVTEEZf9EkSduQpVoFb94OqTJjI3dBwxFLkxXYifIBoZ7DvjipAmUyoxrUw9ihw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l+4TVY+kzyUN9lUPJ9n+BISkqw1BnVOh6sDDDmDElS8=; b=KlRzZKDU1TZNUiP5u9d9pqdyG44KZO+2IH/d8l2Wtlup3xJG2WSFYPbcIFq7x2o9Mk7H9YrhngIlq0DT9ypoPrHgC9374eXj/j3F1muW+Zn7glXSi5/zkzwFGs+RMyJz5jFFmKh/ioddk5FXQ2lp2IYQulytHDGHd6KzmTPb+3E= Received: from AS9PR06CA0010.eurprd06.prod.outlook.com (2603:10a6:20b:462::33) by HE1PR0801MB1675.eurprd08.prod.outlook.com (2603:10a6:3:87::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Mon, 18 Oct 2021 15:11:03 +0000 Received: from AM5EUR03FT004.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:462:cafe::c9) by AS9PR06CA0010.outlook.office365.com (2603:10a6:20b:462::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT004.mail.protection.outlook.com (10.152.16.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:02 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.14; Mon, 18 Oct 2021 15:10:51 +0000 Received: from e125153.arm.com (10.57.27.61) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Mon, 18 Oct 2021 15:10:50 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [PATCH v1 6/7] DynamicTablesPkg: Update PPTT generator to ACPI 6.4 Date: Mon, 18 Oct 2021 16:10:45 +0100 Message-ID: <20211018151046.31232-7-christopher.jones@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211018151046.31232-1-christopher.jones@arm.com> References: <20211018151046.31232-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 81582369-acd7-4967-2b02-08d992498580 X-MS-TrafficTypeDiagnostic: HE1PR0801MB1675:|DBBPR08MB4281: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:7691;OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: vyqdVbGB8Luhfr8aYHJjNtCGT4eumZlUjqfkPnqtKjOg1FFjz+UBVxWshsvo1yFQSDsEqCvaqX27wWBcTG6zhH92mv0MPNnkgb+k7OSLYFfkL+tE9RQXRFYKB6AVNb8FXqUEuvEGmaK+ER5CiqVw6HkhPrXNChjb+rpiqZFa1U8Fv3INsw/6iRtD7xrQZP59vTnkwLnbWvjYM9kBHgyXeTSnrm23f3/ZML4tX1Jx6LpVeDqXMPSeD5+77hA5k8Ni717YPvDiC9bKHeSmcIRmILJPsAytTBTtyeLikyB4zAvEqA1wbr5gLloXveq/qtr7FTx+7ml2STULFrSP+lythKIE7dTKJmfvf7S+DRkm5/Itek21B0TiTG//ksw9XjmMZfEY5nuL6JF2F5hQgkHGFsp9/ben1yAYp1egV/7mJj5TaAMpXFJmtN6CFe+Hw54oynPmWQmikpbrgY3/iRgKg1FUO+9AhenOJOe23n1PbXLrhihXuObsVlKsmVQz84SzTIO04gtsIBce8BxO8TBGkn1QIttUEsv5lkzeHXmVBjQfnEdOmUc1DO1oNTWX3av+W0PUrZ6cLWbtQ18OsshJ7YKppYpLsD8+LaOwa6cCvbrGz0oEyWKZa2NFCocj1SMPBhSGtMxoP+TIV+1Eh5bPNTdbYf/K+H9lb9PMw3dHdULXpZ0M30MHiYgMV57svI4vOwLeoJqTiobyvzpfnCkBNM3p5XPow/TsdEM73ZUESR/x5ckJXlNmOB008pKrukPmiRy8CxBHbGwBrxer3V4VeH5msG/CsB8fVGI2ygCXxZu+qnBbA6EJEhL0U5BQGSmn X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(2906002)(5660300002)(508600001)(7696005)(47076005)(426003)(2616005)(83380400001)(70206006)(54906003)(4326008)(8936002)(70586007)(82310400003)(6666004)(1076003)(26005)(6916009)(316002)(81166007)(186003)(15650500001)(36756003)(356005)(8676002)(86362001)(336012)(36860700001)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1675 Return-Path: Christopher.Jones@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT063.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 06e8d2ab-92ed-46b9-0467-08d992497fed X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1lH6ihePlyae7oJU+/WmsmMF5dBu3h6B2NC4Fi6mSUwDwBr7uGD1PAJq8D1Q1/PXxq6vrkrZ6C6c+Ynvc1++s3hhnBPYEGQW/Q/n18TmFPAgNly5RrvTgaFYOWZLTV+LqjAg3Y0Mx/PuiM+02ibWCH3bIoVj1CnZflWqrrCV2kn5FGTj5nkntFO98u4KNFRu5NyQvAB8A4iu3F+1iMmWxrX1/3JxAWmZD8loB9E7XppYwAF5eujwQ//GRQ1Mew7YC8tWKUtTY5o3tgZ+ft5Mu9k8Ohhqltdm+mNHJbPfBMU5LmQW86qse3zxc7Xz/1rlZUs1Hobw/JHf/k/o1al5GWqfaLcCuLS2643jF9+3PNSBgEv2zLinFVknaK04ASIRVPJkAZLtFTH0PKx0CN2QHKa119f26buBU77O/S+3Gwn5jwvox+E30fokdl5p+rVWqkl5y4WJU1BI08THWz6mt3lCBEDOUSxbyfBLEvJWodu/275lLlKEazA2P6AJmh+iy6IOGrLComssbNR9vFZb3TADxQs1plrpnJmA95zkTyd8/euYiw/v3xXSIL/PPs8EeSpBizCHNUg8e4gqVIKcrh+p/N9LfzH6S7bJi+mwucylpcoUpY3i8vdlIgPb9PHB3BdHvXa61dv2CW7jt3H/rKLDphwes+aSpWC4aLwdTUfh0URn5QLUc4eBvqXv3KD27x2KVMPfkEphZ7jGTuhL4GT15ZYDjB4prqqvXvOZaBg9Zyt5+fvZfnc6n2yZQ9vf3F88lTYMRfp4QFBqvrV60NHEFmNrq1fiGjLELCb9dXg= X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(70206006)(6666004)(4326008)(6916009)(83380400001)(7696005)(82310400003)(8936002)(5660300002)(36756003)(426003)(26005)(36860700001)(86362001)(2906002)(70586007)(54906003)(508600001)(316002)(81166007)(8676002)(15650500001)(2616005)(186003)(47076005)(336012)(1076003);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 15:11:11.8943 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 81582369-acd7-4967-2b02-08d992498580 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT063.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4281 Content-Type: text/plain Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3697) Update the PPTT generator to use Acpi64.h. Signed-off-by: Chris Jones --- DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c | 44 ++++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c index 65d1661c0ec47a4d1631c0dcac7bcb16dbc619e0..18f093998db57ea4698953ed06a9826df559c1b7 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c @@ -1,11 +1,11 @@ /** @file PPTT Table Generator - Copyright (c) 2019, ARM Limited. All rights reserved. + Copyright (c) 2021, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): - - ACPI 6.3 Specification, January 2019 + - ACPI 6.4 Specification, January 2021 @par Glossary: - Cm or CM - Configuration Manager @@ -96,7 +96,7 @@ GetProcHierarchyNodeSize ( ASSERT (Node != NULL); // + - return sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR) + + return sizeof (EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR) + (Node->NoOfPrivateResources * sizeof (UINT32)); } @@ -116,7 +116,7 @@ GET_SIZE_OF_PPTT_STRUCTS ( */ GET_SIZE_OF_PPTT_STRUCTS ( CacheTypeStructs, - sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE), + sizeof (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE), CM_ARM_CACHE_INFO ); @@ -466,12 +466,12 @@ EFI_STATUS AddProcHierarchyNodes ( IN CONST ACPI_PPTT_GENERATOR * CONST Generator, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol, - IN CONST EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt, + IN CONST EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt, IN CONST UINT32 NodesStartOffset ) { EFI_STATUS Status; - EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR * ProcStruct; + EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR * ProcStruct; UINT32 * PrivateResources; BOOLEAN IsGicCTokenDuplicated; @@ -492,7 +492,7 @@ AddProcHierarchyNodes ( (Pptt != NULL) ); - ProcStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR*)((UINT8*)Pptt + + ProcStruct = (EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR*)((UINT8*)Pptt + NodesStartOffset); ProcNodeIterator = Generator->ProcHierarchyNodeIndexedList; @@ -536,7 +536,7 @@ AddProcHierarchyNodes ( } // Populate the node header - ProcStruct->Type = EFI_ACPI_6_3_PPTT_TYPE_PROCESSOR; + ProcStruct->Type = EFI_ACPI_6_4_PPTT_TYPE_PROCESSOR; ProcStruct->Length = (UINT8)Length; ProcStruct->Reserved[0] = EFI_ACPI_RESERVED_BYTE; ProcStruct->Reserved[1] = EFI_ACPI_RESERVED_BYTE; @@ -657,7 +657,7 @@ AddProcHierarchyNodes ( ProcStruct->NumberOfPrivateResources = ProcInfoNode->NoOfPrivateResources; PrivateResources = (UINT32*)((UINT8*)ProcStruct + - sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR)); + sizeof (EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR)); if (ProcStruct->NumberOfPrivateResources != 0) { // Populate the private resources array @@ -680,7 +680,7 @@ AddProcHierarchyNodes ( } // Next Processor Hierarchy Node - ProcStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR*)((UINT8*)ProcStruct + + ProcStruct = (EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR*)((UINT8*)ProcStruct + ProcStruct->Length); ProcNodeIterator++; } // Processor Hierarchy Node @@ -744,12 +744,12 @@ EFI_STATUS AddCacheTypeStructures ( IN CONST ACPI_PPTT_GENERATOR * CONST Generator, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol, - IN CONST EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt, + IN CONST EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt, IN CONST UINT32 NodesStartOffset ) { EFI_STATUS Status; - EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE * CacheStruct; + EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE * CacheStruct; PPTT_NODE_INDEXER * PpttNodeFound; CM_ARM_CACHE_INFO * CacheInfoNode; PPTT_NODE_INDEXER * CacheNodeIterator; @@ -761,7 +761,7 @@ AddCacheTypeStructures ( (Pptt != NULL) ); - CacheStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE*)((UINT8*)Pptt + + CacheStruct = (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE*)((UINT8*)Pptt + NodesStartOffset); CacheNodeIterator = Generator->CacheStructIndexedList; @@ -771,13 +771,13 @@ AddCacheTypeStructures ( CacheInfoNode = (CM_ARM_CACHE_INFO*)CacheNodeIterator->Object; // Populate the node header - CacheStruct->Type = EFI_ACPI_6_3_PPTT_TYPE_CACHE; - CacheStruct->Length = sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE); + CacheStruct->Type = EFI_ACPI_6_4_PPTT_TYPE_CACHE; + CacheStruct->Length = sizeof (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE); CacheStruct->Reserved[0] = EFI_ACPI_RESERVED_BYTE; CacheStruct->Reserved[1] = EFI_ACPI_RESERVED_BYTE; // "On Arm-based systems, all cache properties must be provided in the - // table." (ACPI 6.3, Section 5.2.29.2) + // table." (ACPI 6.4, Section 5.2.29.2) CacheStruct->Flags.SizePropertyValid = 1; CacheStruct->Flags.NumberOfSetsValid = 1; CacheStruct->Flags.AssociativityValid = 1; @@ -936,7 +936,7 @@ AddCacheTypeStructures ( CacheStruct->LineSize = CacheInfoNode->LineSize; // Next Cache Type Structure - CacheStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE*)((UINT8*)CacheStruct + + CacheStruct = (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE*)((UINT8*)CacheStruct + CacheStruct->Length); CacheNodeIterator++; } // Cache Type Structure @@ -994,7 +994,7 @@ BuildPpttTable ( // Pointer to the Node Indexer array PPTT_NODE_INDEXER * NodeIndexer; - EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt; + EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt; ASSERT ( (This != NULL) && @@ -1081,7 +1081,7 @@ BuildPpttTable ( Generator->NodeIndexer = NodeIndexer; // Calculate the size of the PPTT table - TableSize = sizeof (EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER); + TableSize = sizeof (EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER); // Include the size of Processor Hierarchy Nodes and index them if (Generator->ProcHierarchyNodeCount != 0) { @@ -1150,7 +1150,7 @@ BuildPpttTable ( goto error_handler; } - Pptt = (EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER*)*Table; + Pptt = (EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER*)*Table; DEBUG (( DEBUG_INFO, @@ -1307,9 +1307,9 @@ ACPI_PPTT_GENERATOR PpttGenerator = { // Generator Description L"ACPI.STD.PPTT.GENERATOR", // ACPI Table Signature - EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGNATURE, + EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGNATURE, // ACPI Table Revision supported by this Generator - EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_REVISION, + EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_REVISION, // Minimum supported ACPI Table Revision EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_REVISION, // Creator ID -- Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")