From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.78]) by mx.groups.io with SMTP id smtpd.web08.15036.1638979616074839826 for ; Wed, 08 Dec 2021 08:06:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=m5IGuID1; spf=pass (domain: arm.com, ip: 40.107.20.78, 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=yzlj5PbVY85htt/yJvwThjuVCF516Yv15vXftGcmozI=; b=m5IGuID1FxIRGhzUz9t1qIA8ONsqTkK2+O/ZO8ewRKsSYXfG6pYlkftJjYbzEKntRQlCc4NHWjxc/XwbDOHVkCiUx+NbHGYYj+WLIFsoe4D+3I/jGCVq3fgywEuEa6NuQ+dMlCnQs6sxwxOu6d5XpK6TUg8YXrBzHfdwwaK5zgk= Received: from DB9PR05CA0022.eurprd05.prod.outlook.com (2603:10a6:10:1da::27) by AM9PR08MB6658.eurprd08.prod.outlook.com (2603:10a6:20b:303::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Wed, 8 Dec 2021 16:06:53 +0000 Received: from DB5EUR03FT029.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:1da:cafe::11) by DB9PR05CA0022.outlook.office365.com (2603:10a6:10:1da::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Wed, 8 Dec 2021 16:06:53 +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 DB5EUR03FT029.mail.protection.outlook.com (10.152.20.131) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:52 +0000 Received: ("Tessian outbound 1cd1a01725a6:v110"); Wed, 08 Dec 2021 16:06:52 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 0ee6c4d3ac257dee X-CR-MTA-TID: 64aa7808 Received: from 4fd9857b6f15.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id B994E48D-8EE7-4C70-9D4A-08DC52C49B47.1; Wed, 08 Dec 2021 16:06:40 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 4fd9857b6f15.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 08 Dec 2021 16:06:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NAkE9QdchzyWyJP4kyvaPhKrLgOUYBrpfeo3zGr4RQA/SpCrTeGsBaH5ZJoWQcM94WkFakZCTjdHX+mFOIizPAURVxNiRGiLnOKKJb1NlnypExGGzmqfNaus0XMldqjx3CCbv2fA8i+86DtvjX0uyQblgQ1DwgAVFK6Y5TYXLcdT4qUziENf7jmee5fYO09gGMceWCbuzAAoDPk/b44Go49J9eICbNSLnjLCNEJnUH49BJ4qA5SHLfXabxa5obLaHF5X48uZ/l1lmXBTcrl51atrkjUvTcwNG4E6QTEExssbWYWmvrDcrYJSEQy3CdiGDa0lJk+vMpVBie518Yi8Pg== 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=yzlj5PbVY85htt/yJvwThjuVCF516Yv15vXftGcmozI=; b=kJ/8TPzYOYGOnbgt5pXDCZZzvfViPHoYghoSHr+R2z1fK6mvuOJYg6qVjZGTq+l/eFJNdhg5T3vPJBwtM0EOF3HxWH8ZqibO4la7rUsFrdXHOT0s5UAio71z5zZqmKPGm4LfEi2KsOMWv2viYtz0kKcTzuoftaJgrZJvWaqeSd6nW1ZbV2dSPSxfSrbA2znPGtPF4TZ7BPyMXNhKov1x/3pIYlPsqaStx76tej+Lfoc4Lng7PgwPcWyiRNBgxh8nhe0508b8Tps5CQvW8n8jVHqaLT9oUG3i9WCDwptCPAEmv6gkBSA6PZ2mFno08dNqO0t7o0wqWij7FrG0CuDTkg== 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=yzlj5PbVY85htt/yJvwThjuVCF516Yv15vXftGcmozI=; b=m5IGuID1FxIRGhzUz9t1qIA8ONsqTkK2+O/ZO8ewRKsSYXfG6pYlkftJjYbzEKntRQlCc4NHWjxc/XwbDOHVkCiUx+NbHGYYj+WLIFsoe4D+3I/jGCVq3fgywEuEa6NuQ+dMlCnQs6sxwxOu6d5XpK6TUg8YXrBzHfdwwaK5zgk= Received: from DB6PR0301CA0089.eurprd03.prod.outlook.com (2603:10a6:6:30::36) by HE1PR08MB2810.eurprd08.prod.outlook.com (2603:10a6:7:37::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.28; Wed, 8 Dec 2021 16:06:37 +0000 Received: from DB5EUR03FT038.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:30:cafe::c6) by DB6PR0301CA0089.outlook.office365.com (2603:10a6:6:30::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12 via Frontend Transport; Wed, 8 Dec 2021 16:06:37 +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 DB5EUR03FT038.mail.protection.outlook.com (10.152.21.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:37 +0000 Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.20; Wed, 8 Dec 2021 16:06:37 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.20; Wed, 8 Dec 2021 16:06:36 +0000 Received: from e125153.arm.com (10.57.3.247) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 8 Dec 2021 16:06:36 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [PATCH v3 6/7] DynamicTablesPkg: Update PPTT generator to ACPI 6.4 Date: Wed, 8 Dec 2021 16:06:29 +0000 Message-ID: <20211208160630.10923-7-christopher.jones@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211208160630.10923-1-christopher.jones@arm.com> References: <20211208160630.10923-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 6f83e092-56fe-4f74-9451-08d9ba64bfef X-MS-TrafficTypeDiagnostic: HE1PR08MB2810:EE_|DB5EUR03FT029:EE_|AM9PR08MB6658:EE_ 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: oglMEy488y81QOMxqDcXyJZGwUHCXmHUO7S0KflmNs9Fk4fb9RPXfDPzv5H2Xd+IWOPqSU1Rqca/IJ2IEP/gM/TZIWRLPKeAbQamWbo+Q9Xeev48yQhkq75MOjhNsFmw6dC3PdNoMxmM7Z73DUCWMVoeGDPX2UPT/2RKfJpZ6448mXA7lX/NbhJjnWtObYiEUkRkPy9aIyt/mn4vj1oOUnok2nRlwznSVx0E2a2c6A+dFB2Zgm5AeepCQYpVg4iEj97TQ8nPdo6yQFROwBZ1WkSs6OWjrMNzzyuWXFAfaMDBQ5xeO87OGdFhDdd4z7RBTA6bddgvBeIE4RBXLbk2MO0jVUBWCD1PwbRseVHu5CrBGMmFNRH3HhsIF3NWw0JsY8Cvzu48+zF7SWwm8VQBt7ylel/y4N2m0P+W5cV9r4TVdRN1+DU+GiRDu8fNkuAUeBalb4P0yWMBW4+alJ9Lo6K/no4SRq4VzOfAWORVLDrTaMEl/PTALAxorz3qSDmWP9NXI241jJskjSnrDoY5pxDhyYiFMP/r7bNye+2mN8XUKYFlzfMZSBEmtkZvpdma/NxNgxd6F44g2s4DUNXJMH6XMRVRzSE0hotdIKpHcAqhOBx76CR+PbIrLM0ARZibcaOnHF/1zco7S2zRqc8NKu+O81UbmDKgZuSLb0E5ej2gZezPQBRqGnstqfnGKIKjhtqGfFLZwEFEFCj7htZq1WeR6TheixANI44oDTo20XpN8kvTBjy5Mqwb2TvYG4smYaGrV/eR2HEOoZs3voxflPp23o15VHLKpPq0dxEPmTi3rhSsVlymS664n0pihlLMZw2sORO9tloaWNUqqaBi8H4UhWYJvcdmskxVOTM957k9sgiR2DfiTsmv6QQrhp1y 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)(36840700001)(46966006)(40470700001)(47076005)(26005)(2906002)(7696005)(186003)(336012)(2616005)(86362001)(36860700001)(6916009)(83380400001)(4326008)(426003)(36756003)(1076003)(356005)(6666004)(40460700001)(70586007)(70206006)(508600001)(8936002)(82310400004)(15650500001)(81166007)(5660300002)(54906003)(316002)(8676002)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR08MB2810 Return-Path: Christopher.Jones@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT029.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 35a412ec-b4e9-4b7e-a7ad-08d9ba64b6cb X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DqDA8wPFDqtHJD8Xnutf45ar3BiGMGTVake8T88wYC5k2mex+aqSfI2OnhZq06L6A/Q1dCQrL6AZD8UrGiWLfIla6yfe6JWiz8EVY1h9J8PSvC+mIu9Qw+nt5v26XgRYh3s8cCOvL+nv5aBjj2da1GMgBk3xbwPO3wB923jz+qI2t71svOT69kvx7mVRhmtpVGV7afni/y0drCIEN2ZCGBZ9qwikH+2uIqkzmHGEYKDfWQpxGhXTU+9G3HypnVzPD7/TOBvzeRl9Okb3w5WixdmsQutZuit2scs/JidDrZSOk7F7LTK5XBVctHAg8R+p+WnBJndHRyz2iphGbuvpGKhkk9KwiV9Bsq8KWYhk3MNUn6J1r6XGIUlt0S4etyEt1VowtmV4nMG/WEO3xNS4xq/wiCadf7uw6sWoDxKrPtXtDYUqEz0TxbMOftYOrj4ERlq5eVNlXI/dHCOLNsc6oMiPjHZHszm4cXiQtIWn3xqGXwYRK3OHfdUkhyB60QxKoDUIZ7lIFkneD3Vt2JaCzLj2B8NhRPzbM7+SnKDEbme8N0PLhwbVheQ2ZFP+V3330BXT3Y4TQS7UW3ZA4IUNGSOy60dn6BH+fqWCUT1e9Sm3ADP5dtDrIBcHg+zGP45D+AxiPQHoUZeomdUZu1f90bS2nExQgDVugniL9nh4QcrZFJVmkDRCpPSS/NRUUMgs22AF3Bv+SWh2ocW/9c4itCVax6kKB8J0cZRJ7c8rDKQr7shyjsD0jR1IiJAYBLjPYe2ZSd9tmr4UDH2PH5nZrUfIoy8E8OKKoD0gwXqiKym30e7vrU6G+x6NTRhs5bSqjpzVNxFnsBPXKKjYgGn5ICpYKxAlZscvyPIyZanffPM= 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)(40470700001)(508600001)(70206006)(5660300002)(54906003)(8676002)(70586007)(7696005)(83380400001)(8936002)(2906002)(6666004)(86362001)(4326008)(47076005)(26005)(40460700001)(15650500001)(81166007)(6916009)(426003)(36860700001)(2616005)(82310400004)(336012)(186003)(36756003)(316002)(1076003);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 16:06:52.9191 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6f83e092-56fe-4f74-9451-08d9ba64bfef 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: DB5EUR03FT029.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR08MB6658 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 58ad338d339f7f2cf506df961f016edb160f0edc..3d416ca78ec16a1929ede87abbe4f8f4464ef0cf 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 ); @@ -468,12 +468,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; @@ -494,7 +494,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; @@ -538,7 +538,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; @@ -661,7 +661,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 @@ -684,7 +684,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 @@ -748,12 +748,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; @@ -765,7 +765,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; @@ -775,13 +775,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; @@ -941,7 +941,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 @@ -999,7 +999,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) && @@ -1087,7 +1087,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) { @@ -1155,7 +1155,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, @@ -1312,9 +1312,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")