From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.88]) by mx.groups.io with SMTP id smtpd.web12.9484.1635954118298576167 for ; Wed, 03 Nov 2021 08:41:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=Bw/vq0Q4; spf=pass (domain: arm.com, ip: 40.107.7.88, 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=Bw/vq0Q4adhngctRuzjie/MG7R9xb+ZR2n9OlSHchLd6O72UQB0K9zubXHmt7YNTmmiFDzSR5k5nZ4UrbxbHLqS9UbaN0FSHD3X2bnfJ+aGxK9NqxAVLcj9LBgnZwJ4XlrcXggEnWueudQmC0lHXi5kvGSOS7ih/tjXe2ijYiB8= Received: from AS9PR04CA0047.eurprd04.prod.outlook.com (2603:10a6:20b:46a::31) by AM0PR08MB3825.eurprd08.prod.outlook.com (2603:10a6:208:10c::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10; Wed, 3 Nov 2021 15:41:43 +0000 Received: from VE1EUR03FT025.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:46a:cafe::d2) by AS9PR04CA0047.outlook.office365.com (2603:10a6:20b:46a::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.17 via Frontend Transport; Wed, 3 Nov 2021 15:41:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;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 VE1EUR03FT025.mail.protection.outlook.com (10.152.18.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14 via Frontend Transport; Wed, 3 Nov 2021 15:41:42 +0000 Received: ("Tessian outbound 7b0bcc4a550a:v108"); Wed, 03 Nov 2021 15:41:42 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 1db4ee90989d68b3 X-CR-MTA-TID: 64aa7808 Received: from 8dc28e38a065.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 00FD8040-AE7C-4168-AC58-908896EA07BA.1; Wed, 03 Nov 2021 15:41:36 +0000 Received: from EUR02-AM5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 8dc28e38a065.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 03 Nov 2021 15:41:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dU6ERzBAYKpY76u/eBbPOpjrBq3nDoBDywx2NwXbQVI3IRKyhXr2Wjp1/9YmidCi+z6H4FZSw/1RxrtpgnXP2rg7zjy9tIZtZsWGJbyVZC5isZCLyMPBH3DVu0NnbB4em1Zwr+WPV5DPcIfXsLTBfVgoEnzCyIKrdQjfTva7YxCZXSz5dZpux6c45g/wj2W6htPX29GTPOxW3fTHldVqEeL9wxdWSKbVwXQWfaV2qiCVX7qvPXhuRFTjEyELorXP/jR/8s3rFsgTNsKKvM6zxkYUBrGtnv58Wnz90jUwfcal6oIPb8NjClBNgCQGFwAxJPZ00MwNspJzYzjwBES6rQ== 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=SLkR/6YedJRYz/NhSq1qJ9EtCorJBm3NCUFOHVlmTGNI24tAXF+uosXFZny5EAMqHh3T/o/+eDKRCKsTbRzAo8FjgiI2RFF+cD8LXnMBU3eCw1AciywtBZ24lDU1yaDaD+JZpi89uckPtLAbqkuQg63cj37yHthlCDOFVPc7XOlb/fJ0VQnertC90IFVzgBcQV2K6lAvSiHjSDpfdU3DmXUlmpV6VeaTp/cR1HpWv0ifiVKyRg3LmXlRdjoSYAH7jPvMy+Jnh/Tm4/utDbk7kXzQp3fgfQSPaKtmmw/k5fnSFiNzT5sAm86B9q96M7K0K2Tuieu4FYclApIb4QJg6g== 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=Bw/vq0Q4adhngctRuzjie/MG7R9xb+ZR2n9OlSHchLd6O72UQB0K9zubXHmt7YNTmmiFDzSR5k5nZ4UrbxbHLqS9UbaN0FSHD3X2bnfJ+aGxK9NqxAVLcj9LBgnZwJ4XlrcXggEnWueudQmC0lHXi5kvGSOS7ih/tjXe2ijYiB8= Received: from AS8PR04CA0097.eurprd04.prod.outlook.com (2603:10a6:20b:31e::12) by VI1PR08MB4591.eurprd08.prod.outlook.com (2603:10a6:803:b5::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.17; Wed, 3 Nov 2021 15:41:31 +0000 Received: from AM5EUR03FT004.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:31e:cafe::46) by AS8PR04CA0097.outlook.office365.com (2603:10a6:20b:31e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.17 via Frontend Transport; Wed, 3 Nov 2021 15:41:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;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.4649.14 via Frontend Transport; Wed, 3 Nov 2021 15:41:31 +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; Wed, 3 Nov 2021 15:41:18 +0000 Received: from e125153.arm.com (10.57.26.45) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Wed, 3 Nov 2021 15:41:17 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [PATCH v2 6/7] DynamicTablesPkg: Update PPTT generator to ACPI 6.4 Date: Wed, 3 Nov 2021 15:41:07 +0000 Message-ID: <20211103154108.6534-7-christopher.jones@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211103154108.6534-1-christopher.jones@arm.com> References: <20211103154108.6534-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0b0cbebb-8a42-4dc0-d45e-08d99ee06f6b X-MS-TrafficTypeDiagnostic: VI1PR08MB4591:|AM0PR08MB3825: 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: Sobgo6EHYKj5PArdB0LQQX1RveQVN3csOzNsW91yueunp9QsProt+lKyp7VrF+ATEMHMO85oyz3BUL6+BQhrJFQVcW5c2h9wRUU+SLVCGOMkEn4pA/RjkAkuvtURGmFz4ykfGS+Ga3tXfGxq3AAvfnuBXWYOEaePAPOhXqToUo1fUL7zbJ3/L+tGexl/OYFX+3F+b3jKtOVN6YcgvDo9l2ljIEbQGr8G2tcmofqv4qGfCgYPn1+T+lPg/RaFcusFC9xzm5+YVC8Z3ceCes2XMbcHHI7id7TQVsXpnmR73OnlFYZoLFtEKxUVnJ5r6hlG2NHq+ELUzMPeWyUPn+xMaHid729SjbT0mZ3+8mZGkuqdOG8I8MXcoF1Ccc2yprxmB+SOGmpdSY7vgMoowOBz/VMP9F2GOz1wZ9P98qgjhZ8Iovuc0a5UeDLS9jCQl9chTQwJfxX1GiaKh/P3yS8jJNeEKArsGj1d3qJQaEPapWUdxUbJuY8MRVIrHRTWktvPuV2H5855/usSvBgZ7UmMFGCBSZ9PUYQ4K5JQwGH9or3bIwvrpj5PxlRDwYWYkA+ns6qYRmh200yok9f3nJ7y7oY9SHptLe9yszp+q6XpbUpKbUE1bn8wpCK0gqvdkzmFZ0QcrZYsOSVc4B0zIipmJhmwlRn9h0qJcc20YqbcipD2hn7OiBKpNNZ53OXNPBsiYN/58Rsm+pjWyo194Wvex9sqS3pIx80Heju+OwppZAmmttG8sQFJc5tejkX2LB5lAmhRb9UBUZsLybesA4cCKHh/LT/pSRllSLTrGQLzwgOrSB872JbEgQgS2bv1A5Ez 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)(8676002)(36860700001)(15650500001)(26005)(6666004)(316002)(36756003)(8936002)(54906003)(1076003)(47076005)(4326008)(70586007)(2906002)(356005)(186003)(508600001)(426003)(2616005)(86362001)(6916009)(70206006)(336012)(83380400001)(5660300002)(81166007)(82310400003)(7696005)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB4591 Return-Path: Christopher.Jones@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT025.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: a6c4a6b7-9ffc-450e-389e-08d99ee0687d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rRrF2lDcvBFPNloj5tk+gLJnics9t54GQpNT1cabDI8cBRIbxAyk7DGTk6NCiFEeKbxthXMvEJwKdk+1bdAudemgaxOi2PKPDtqVtRxt4E0SQJZ8Ro7j31yqVkcVFoMXVKW2zYmF/kneHPnW4DsbqX91/NUD+NDYdZT1WT9avMDQbxyYGgmOj2sDULu9vrpAJWltOQumehYohZ7pC2e9yyUekKMguwVvBJh2X8Z0SlFc7tmtBJv84PGa56rhZX9+yTlcZzyoiFwWtQcdSq3B/MrjgeQgIB+gZIcsyYS158Eky9OZv4cMZgClajnn7rItdlK4CtG6+Krca676EMDiZzWnyr3NZQxcvGA6RkLsznEYU1imaCr9GjS56glehCg+padUP0pliNFcKTFMb8ho6hC0aOk2U9bjOBgivEaqGK8y0+vaBMMvMv8JVZ5nd7SzPxqv0ThRWP77RnsfZH/o+NiI6pRug1PehnGLXCA3qgiwaLMA4vYc08PzKARCmSFzUoAYwCsZbqDCUcUCVSqJr1uYf4C3eMLT3q/ZiaR9i775m35XuDsp846+nBg6d9aWUR73b12fIvdS2wrVgbtfxzWSfZNEgfOSxcdr3bdenaDDVkQ6iGPvEyF4ArMN4cVbW3jLWZxlQn3sjSRW25THxs/TWekHEbHYiV6KxxgO4Uik/O43MsHkY9IUJ85rgpmwq2ONTOzF0fuctEVHOJVk+Wj+lXHYVAE+strfsllzdRufsuBA+It4IGMEAGVmXidMp0tpS/uXBza/CVXd46LYtiijgF6vyXOuu3oTh4Ujz8A= 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)(46966006)(36840700001)(4326008)(6916009)(54906003)(316002)(47076005)(7696005)(2906002)(6666004)(81166007)(8676002)(8936002)(5660300002)(426003)(2616005)(86362001)(36756003)(1076003)(82310400003)(36860700001)(26005)(15650500001)(70206006)(186003)(336012)(70586007)(83380400001)(508600001);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2021 15:41:42.7407 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b0cbebb-8a42-4dc0-d45e-08d99ee06f6b 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: VE1EUR03FT025.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3825 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")