From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.56]) by mx.groups.io with SMTP id smtpd.web10.9674.1635954111901951630 for ; Wed, 03 Nov 2021 08:41:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=BVKNZyTl; spf=pass (domain: arm.com, ip: 40.107.22.56, 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=8zr0IQ/krbkZ4NZ2B9Jv6wlHOFJbFXkYxFN82dfiqlY=; b=BVKNZyTlzqq+UggYPrLgsK3fbpgSp0rYNe6Y0xbfjIxJmAPptKs0wPk/PygsQJ74SgFbEMVh2OXbQEi6NOSkd5g+ci5PvuCheKP1pTmhHbGVyeHswXEFMfkDC9PIcqbb587P51/+CPsaV+j9pcBhqQDFrh0KPglaEHMOX/FG5DM= Received: from AM7PR03CA0010.eurprd03.prod.outlook.com (2603:10a6:20b:130::20) by DBBPR08MB4507.eurprd08.prod.outlook.com (2603:10a6:10:d1::10) 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:39 +0000 Received: from AM5EUR03FT060.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:130:cafe::d6) by AM7PR03CA0010.outlook.office365.com (2603:10a6:20b:130::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 3 Nov 2021 15:41:39 +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 AM5EUR03FT060.mail.protection.outlook.com (10.152.16.160) 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:39 +0000 Received: ("Tessian outbound 7b0bcc4a550a:v108"); Wed, 03 Nov 2021 15:41:38 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 76a386a99e32c212 X-CR-MTA-TID: 64aa7808 Received: from 791dcd653524.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 6652E590-E25D-465E-B9DF-66258E325B2D.1; Wed, 03 Nov 2021 15:41:32 +0000 Received: from EUR03-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 791dcd653524.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 03 Nov 2021 15:41:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gPKr6RzfKVu3aaJsK6u0f/kiTLizRn4uepPfUOvwG+X0yoEou76CzeJFFGkxdLo/No7oha6xMQKjtXoYuOd9u//Em1HtCJ0TCnBjSGXXn6usQ4GXAYHMZ5pTiLHozknQfe7/AUcp5Zxx/pAqkfvdPBV2hXHJg+C8u3pO6XbmltJ0T5dxoLjnR/N2ABrn1B/eQmYsq3oD2cXz5bOU4+n6y4BWMWPxoLfhh1w/tcFJmCHEhl6xq15i7NhNu/FvylomGBo5KsrG1D5Dkj38ALLaPqIrwn1ABzDyOKK90/RC/pP1nkeIv429QqzxUy2hDodUjOGosYuiMNuH/cvj9LbK0w== 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=8zr0IQ/krbkZ4NZ2B9Jv6wlHOFJbFXkYxFN82dfiqlY=; b=ob/oC6kRzul6+tJCb355P2rpTre37W5Kt7L9DLdO8MiUa33gmXjzssFHLobm+AMldK03nEmAAtiaYoQCviOs52XqnI70tWO9a2xDS5anU49Jote7G5Khf/XXDB1NcPjQuDir4j8wnyWTd0XEAkf3BeF9Ibiq3XZLlY0yviXQefPPMJhQPHH246poeIrlrmW5eWHYe8PSqgFth0svCZGElAtIqzAVUQmrhPrTRWkrmrq5sIXSKknd/QI/RVlqJrcrkAtVveFET2s15J/SpYEQ4fKPybKt19DvKst6gxFQM6qDkfCKspJmioiIFOCT4wwV2gxGmRabPx2XmgRxikTG6w== 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=8zr0IQ/krbkZ4NZ2B9Jv6wlHOFJbFXkYxFN82dfiqlY=; b=BVKNZyTlzqq+UggYPrLgsK3fbpgSp0rYNe6Y0xbfjIxJmAPptKs0wPk/PygsQJ74SgFbEMVh2OXbQEi6NOSkd5g+ci5PvuCheKP1pTmhHbGVyeHswXEFMfkDC9PIcqbb587P51/+CPsaV+j9pcBhqQDFrh0KPglaEHMOX/FG5DM= Received: from AM7PR03CA0013.eurprd03.prod.outlook.com (2603:10a6:20b:130::23) by HE1PR0801MB1865.eurprd08.prod.outlook.com (2603:10a6:3:4f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.18; Wed, 3 Nov 2021 15:41:30 +0000 Received: from AM5EUR03FT049.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:130:cafe::ee) by AM7PR03CA0013.outlook.office365.com (2603:10a6:20b:130::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 3 Nov 2021 15:41:30 +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 AM5EUR03FT049.mail.protection.outlook.com (10.152.17.130) 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:29 +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:17 +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 5/7] DynamicTablesPkg: Remove PPTT ID structure from ACPI 6.4 generator Date: Wed, 3 Nov 2021 15:41:06 +0000 Message-ID: <20211103154108.6534-6-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: 7bb14c2c-b0b2-42ba-f6a4-08d99ee06d2a X-MS-TrafficTypeDiagnostic: HE1PR0801MB1865:|DBBPR08MB4507: 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: jGWfDEweyA2pyFwyOsPjIIf07xEXKEoms618OqoUvQbqSq7Mh40pIpASqrJ3b3jgwVt0PbabFTA+hVYSkyDE8AAjKEh50ZIFFrx41b7t0isx3+fRz1wnw9EdMiuAJmf4b+94aUHgIpUEauP8Jxyrkj3F0yD/WULYuMx9moq37Zo/CdcnoX6mr62IvMAtDayQ0tqrpFsyf2Wjz5Eg3O3KZd8BiAeGtS4k5XeJqmEjfZirqI0Zpco1uCpgJ63QnXX+7FuLWhWkVJwKbG9eS8aHAKDtvE2t2XtT1NZV/eDIk+MH8/OHwyrcg9chtx2aKk2DV4Zz0wItPaEgs42PPXw8osqpZGuMZxmsTTjPnGoU7r2PddOGW8nHcclS7RUuZ9Gp6z5col/O5CvM+/ACTWBsFM9VpazecL6vTmBfFKbqF7k5hRewSx/btbSpPGF172+qbmP39HP/2W9m9d2A86+7pE+do/m0x0WPLOUzLMpK4t8MDt0fzQ9eEhCrR1knLVfqSYsfk/SnHoQx0cLjufncyh7kAt3qjD7WdA/w+/3ov2n8U+nIZ5s6f+LxwL4II8YmSQQpOj0FUG1GyHapCq73gXO6KGn8zIux6BT5VUD6wu3vObKtjY1EFDNLVT19ZOy7Cq3sp1/1A20FnOEf2crvoIElrcV23TlDjVQvOEDI8GlMTvoZjzoGKS1FtqEZXvFJcNbb+QOCPoaZsUnKtJUazE89zDCozLoQw+m5GzJEINzLIU4MZcZMG5q9rbWc3qqC+Ung1cqWV20P1uk/oqCwdjLJwkVGzkkA6Nb9LT1jrWHwfmJtx3RWhodCeuh1Nuzr 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)(2906002)(508600001)(426003)(36860700001)(5660300002)(82310400003)(86362001)(336012)(8936002)(26005)(7696005)(6916009)(54906003)(81166007)(8676002)(47076005)(316002)(2616005)(186003)(6666004)(83380400001)(356005)(1076003)(4326008)(36756003)(70206006)(70586007)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1865 Return-Path: Christopher.Jones@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT060.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 1c6952be-01ff-46af-bf3c-08d99ee067a2 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZA2PILV9BryAiIIhqf9C6F4KJE6b98QT+nr+BPxKm9BzfkQoQnvl9qMdu9fDjD9GhFNI46Mg6aBCHg7grDO6kOO/0z8+lW1Vl8UfytasPjFWGEf3CzJL0fxhBc1ncVrta29zt1yOOpaO4yG0WLEaOz2gLLAt+iFD6kqmpZ17oXLUTcAuXFREWRf6A9AOn6h62t6GLsmgMCaoipkdZqCHA5iEiQaxXaiZmnPP+b1LE5RXMbEmHQOm/g7/IqjbOkgxnu0nDwXtR8XpEv4OcEsMIXzcNMxQI9heZHveEguEKl8p3HlnQx05+O+a7hBi8qks3bJ54JXNukv64jtuAzxXY0VtMXyIa7dWrmcIf4583/ZmL8diECy70pgJUXDkLNtDJuF7o+cteqTBYXVAyT9fJUBksEjRbFQ9mBQE4sECLKHZPemTsv+iNhjPusFKhwDrUn4N2DDr5VSYTm29ycaKKTKvHDSj8KxNn/uvGj3zYw68dUOLy7yr/Fs4+ewYjkN4JNXmQClZKSPXOVK/Ypl4nTHHkPwqa2+xKHn0oVb2UPXNHUjpvYlugjuZw7gHTi/mwagalwGCFUezvgQSY68IqsTHr6cLmlfB5RJ4ApDpG/iEEIamtPVUrTXUnha6UGTPr65eIL5r2W8cppYm/jOCKIBGZZW3nv6xTkN20nWYOhqRiwJlzDZdhc8Ep0G84DHikC/cEwlxtnz0EM+60fx950LVjSwAkg0Ei8KS4UxGnYac5c96nZ4QytVpm/NTcHjJQ9a5mhR6VwR7x8FK4YvdLA== 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)(5660300002)(6916009)(8676002)(1076003)(426003)(70586007)(47076005)(36860700001)(508600001)(7696005)(26005)(8936002)(4326008)(336012)(186003)(70206006)(83380400001)(82310400003)(36756003)(2616005)(81166007)(316002)(2906002)(54906003)(86362001)(6666004);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2021 15:41:39.0301 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7bb14c2c-b0b2-42ba-f6a4-08d99ee06d2a 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: AM5EUR03FT060.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4507 Content-Type: text/plain Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3697) ACPI 6.3A deprecated PPTT ID (type 2) structure which was subsequently removed in ACPI 6.4. Therefore remove support for generating PPTT ID structures. Signed-off-by: Chris Jones --- DynamicTablesPkg/Include/ArmNameSpaceObjects.h | 23 +-- DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c | 155 +------------------- DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h | 4 - 3 files changed, 3 insertions(+), 179 deletions(-) diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h index f19c9c70666970bb70b6aa09f064bb10a9a67112..6bc5ab6b2b28424c1afddc26cc89a54b81941aeb 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -50,7 +50,7 @@ typedef enum ArmObjectID { EArmObjSmmuInterruptArray, ///< 26 - SMMU Interrupt Array EArmObjProcHierarchyInfo, ///< 27 - Processor Hierarchy Info EArmObjCacheInfo, ///< 28 - Cache Info - EArmObjProcNodeIdInfo, ///< 29 - Processor Node ID Info + EArmObjReserved29, ///< 29 - Reserved EArmObjCmRef, ///< 30 - CM Object Reference EArmObjMemoryAffinityInfo, ///< 31 - Memory Affinity Info EArmObjDeviceHandleAcpi, ///< 32 - Device Handle Acpi @@ -746,27 +746,6 @@ typedef struct CmArmCacheInfo { UINT16 LineSize; } CM_ARM_CACHE_INFO; -/** A structure that describes the ID Structure (Type 2) in PPTT - - ID: EArmObjProcNodeIdInfo -*/ -typedef struct CmArmProcNodeIdInfo { - /// A unique token used to identify this object - CM_OBJECT_TOKEN Token; - // Vendor ID (as described in ACPI ID registry) - UINT32 VendorId; - /// First level unique node ID - UINT64 Level1Id; - /// Second level unique node ID - UINT64 Level2Id; - /// Major revision of the node - UINT16 MajorRev; - /// Minor revision of the node - UINT16 MinorRev; - /// Spin revision of the node - UINT16 SpinRev; -} CM_ARM_PROC_NODE_ID_INFO; - /** A structure that describes a reference to another Configuration Manager object. diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c index d70fc59e754e7d348965b8c3739822a9f1c4b7e6..65d1661c0ec47a4d1631c0dcac7bcb16dbc619e0 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c @@ -34,7 +34,6 @@ The following Configuration Manager Object(s) are used by this Generator: - EArmObjProcHierarchyInfo (REQUIRED) - EArmObjCacheInfo - - EArmObjProcNodeIdInfo - EArmObjCmRef - EArmObjGicCInfo (REQUIRED) */ @@ -59,16 +58,6 @@ GET_OBJECT_LIST ( CM_ARM_CACHE_INFO ); -/** - This macro expands to a function that retrieves the ID information for - Processor Hierarchy Nodes from the Configuration Manager. -*/ -GET_OBJECT_LIST ( - EObjNameSpaceArm, - EArmObjProcNodeIdInfo, - CM_ARM_PROC_NODE_ID_INFO - ); - /** This macro expands to a function that retrieves the cross-CM-object- reference information from the Configuration Manager. @@ -131,15 +120,6 @@ GET_SIZE_OF_PPTT_STRUCTS ( CM_ARM_CACHE_INFO ); -/** This macro expands to a function that retrieves the amount of memory - required to store the ID Structures (Type 2) and updates the Node Indexer. -*/ -GET_SIZE_OF_PPTT_STRUCTS ( - IdStructs, - sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_ID), - CM_ARM_PROC_NODE_ID_INFO - ); - /** Search the Node Indexer and return the indexed PPTT node with the given Token. @@ -372,8 +352,8 @@ AddPrivateResources ( } // The Node indexer has the Processor hierarchy nodes at the begining - // followed by the cache structs and Id structs. Therefore we can - // skip the Processor hierarchy nodes in the node indexer search. + // followed by the cache structs. Therefore we can skip the Processor + // hierarchy nodes in the node indexer search. Status = GetPpttNodeReferencedByToken ( Generator->CacheStructIndexedList, (Generator->ProcTopologyStructCount - @@ -964,72 +944,6 @@ AddCacheTypeStructures ( return EFI_SUCCESS; } -/** - Update the ID Type Structure (Type 2) information. - - This function populates the ID Type Structures with information from - the Configuration Manager and and adds this information to the PPTT table. - - @param [in] Generator Pointer to the PPTT Generator. - @param [in] CfgMgrProtocol Pointer to the Configuration Manager - Protocol Interface. - @param [in] Pptt Pointer to PPTT table structure. - @param [in] NodesStartOffset Offset from the start of PPTT table to the - start of ID Type Structures. - - @retval EFI_SUCCESS Structures updated successfully. - @retval EFI_INVALID_PARAMETER A parameter is invalid. - @retval EFI_NOT_FOUND A required object was not found. -**/ -STATIC -EFI_STATUS -AddIdTypeStructures ( - 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 UINT32 NodesStartOffset - ) -{ - EFI_ACPI_6_3_PPTT_STRUCTURE_ID * IdStruct; - CM_ARM_PROC_NODE_ID_INFO * ProcIdInfoNode; - PPTT_NODE_INDEXER * IdStructIterator; - UINT32 NodeCount; - - - ASSERT ( - (Generator != NULL) && - (CfgMgrProtocol != NULL) && - (Pptt != NULL) - ); - - IdStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_ID*)((UINT8*)Pptt + NodesStartOffset); - - IdStructIterator = Generator->IdStructIndexedList; - NodeCount = Generator->IdStructCount; - while (NodeCount-- != 0) { - ProcIdInfoNode = (CM_ARM_PROC_NODE_ID_INFO*)IdStructIterator->Object; - - // Populate the node - IdStruct->Type = EFI_ACPI_6_3_PPTT_TYPE_ID; - IdStruct->Length = sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_ID); - IdStruct->Reserved[0] = EFI_ACPI_RESERVED_BYTE; - IdStruct->Reserved[1] = EFI_ACPI_RESERVED_BYTE; - IdStruct->VendorId = ProcIdInfoNode->VendorId; - IdStruct->Level1Id = ProcIdInfoNode->Level1Id; - IdStruct->Level2Id = ProcIdInfoNode->Level2Id; - IdStruct->MajorRev = ProcIdInfoNode->MajorRev; - IdStruct->MinorRev = ProcIdInfoNode->MinorRev; - IdStruct->SpinRev = ProcIdInfoNode->SpinRev; - - // Next ID Type Structure - IdStruct = (EFI_ACPI_6_3_PPTT_STRUCTURE_ID*)((UINT8*)IdStruct + - IdStruct->Length); - IdStructIterator++; - } // ID Type Structure - - return EFI_SUCCESS; -} - /** Construct the PPTT ACPI table. @@ -1068,15 +982,12 @@ BuildPpttTable ( UINT32 ProcTopologyStructCount; UINT32 ProcHierarchyNodeCount; UINT32 CacheStructCount; - UINT32 IdStructCount; UINT32 ProcHierarchyNodeOffset; UINT32 CacheStructOffset; - UINT32 IdStructOffset; CM_ARM_PROC_HIERARCHY_INFO * ProcHierarchyNodeList; CM_ARM_CACHE_INFO * CacheStructList; - CM_ARM_PROC_NODE_ID_INFO * IdStructList; ACPI_PPTT_GENERATOR * Generator; @@ -1150,27 +1061,6 @@ BuildPpttTable ( ProcTopologyStructCount += CacheStructCount; Generator->CacheStructCount = CacheStructCount; - // Get the processor hierarchy node ID info and update the processor topology - // structure count with ID Structures (Type 2) - Status = GetEArmObjProcNodeIdInfo ( - CfgMgrProtocol, - CM_NULL_TOKEN, - &IdStructList, - &IdStructCount - ); - if (EFI_ERROR (Status) && (Status != EFI_NOT_FOUND)) { - DEBUG (( - DEBUG_ERROR, - "ERROR: PPTT: Failed to get processor hierarchy node ID info. " \ - "Status = %r\n", - Status - )); - goto error_handler; - } - - ProcTopologyStructCount += IdStructCount; - Generator->IdStructCount = IdStructCount; - // Allocate Node Indexer array NodeIndexer = (PPTT_NODE_INDEXER*)AllocateZeroPool ( sizeof (PPTT_NODE_INDEXER) * @@ -1237,27 +1127,6 @@ BuildPpttTable ( )); } - // Include the size of ID Type Structures and index them - if (Generator->IdStructCount != 0) { - IdStructOffset = TableSize; - Generator->IdStructIndexedList = NodeIndexer; - TableSize += GetSizeofIdStructs ( - IdStructOffset, - IdStructList, - Generator->IdStructCount, - &NodeIndexer - ); - DEBUG (( - DEBUG_INFO, - " IdStructCount = %d\n" \ - " IdStructOffset = 0x%x\n" \ - " IdStructIndexedList = 0x%p\n", - Generator->IdStructCount, - IdStructOffset, - Generator->IdStructIndexedList - )); - } - DEBUG (( DEBUG_INFO, "INFO: PPTT:\n" \ @@ -1343,24 +1212,6 @@ BuildPpttTable ( } } - // Add ID Type Structures (Type 2) to the generated table - if (Generator->IdStructCount != 0) { - Status = AddIdTypeStructures ( - Generator, - CfgMgrProtocol, - Pptt, - IdStructOffset - ); - if (EFI_ERROR (Status)) { - DEBUG (( - DEBUG_ERROR, - "ERROR: PPTT: Failed to add ID Type Structures. Status = %r\n", - Status - )); - goto error_handler; - } - } - // Validate CM object cross-references in PPTT Status = DetectCyclesInTopology (Generator); if (EFI_ERROR (Status)) { @@ -1484,8 +1335,6 @@ ACPI_PPTT_GENERATOR PpttGenerator = { 0, // Count of Cache Structures 0, - // Count of Id Structures - 0, // Pointer to PPTT Node Indexer NULL }; diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h index 0a14da502d595e27d87262b1bac681318f1d9ced..59ddd71ac4ef57d748e143afaa6ac0befb4900e0 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h @@ -171,8 +171,6 @@ typedef struct AcpiPpttGenerator { UINT32 ProcHierarchyNodeCount; /// Count of Cache Structures UINT32 CacheStructCount; - /// Count of Id Structures - UINT32 IdStructCount; /// List of indexed CM objects for PPTT generation PPTT_NODE_INDEXER * NodeIndexer; /// Pointer to the start of Processor Hierarchy nodes in @@ -180,8 +178,6 @@ typedef struct AcpiPpttGenerator { PPTT_NODE_INDEXER * ProcHierarchyNodeIndexedList; /// Pointer to the start of Cache Structures in the Node Indexer array PPTT_NODE_INDEXER * CacheStructIndexedList; - /// Pointer to the start of Id Structures in the Node Indexer array - PPTT_NODE_INDEXER * IdStructIndexedList; } ACPI_PPTT_GENERATOR; #pragma pack() -- Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")