From nobody Tue May 7 00:38:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83271+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635954087895516.3537389279545; Wed, 3 Nov 2021 08:41:27 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id bgheYY1788612xxzDpodqFQf; Wed, 03 Nov 2021 08:41:27 -0700 X-Received: from EUR03-DB5-obe.outbound.protection.outlook.com (EUR03-DB5-obe.outbound.protection.outlook.com [40.107.4.84]) by mx.groups.io with SMTP id smtpd.web08.9426.1635954085478084400 for ; Wed, 03 Nov 2021 08:41:26 -0700 X-Received: from DB9PR02CA0025.eurprd02.prod.outlook.com (2603:10a6:10:1d9::30) by AS8PR08MB6150.eurprd08.prod.outlook.com (2603:10a6:20b:29c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15; Wed, 3 Nov 2021 15:41:21 +0000 X-Received: from DB5EUR03FT035.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:1d9:cafe::60) by DB9PR02CA0025.outlook.office365.com (2603:10a6:10:1d9::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15 via Frontend Transport; Wed, 3 Nov 2021 15:41:21 +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 (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83271+1787277+3901457@groups.io; helo=mail02.groups.io; 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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT035.mail.protection.outlook.com (10.152.20.65) 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:21 +0000 X-Received: ("Tessian outbound e7ce0d853b63:v108"); Wed, 03 Nov 2021 15:41:21 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: bf6b5fc4942b5189 X-CR-MTA-TID: 64aa7808 X-Received: from 0230fc7081e2.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id F7284BCB-A7F4-4F9A-8D50-A6492FF4DD98.1; Wed, 03 Nov 2021 15:41:15 +0000 X-Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 0230fc7081e2.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 03 Nov 2021 15:41:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L3HIR+OdDjmTeH3e62b0xhqK0uBWemoNsarT+aaqAkvkupoRDLqPmxcGeuQjSfaqHU0o1FwESkTKXfZOavyMPDOilpIwuXLEnd/VfrlQEXNNEU+aQAq1PT18F+38UnFg3LEj612+SjLue+picCY7ucwn8KlHqsZ8w08MtdeNrbbI2LmRF/Pa57LNy1yfRgQZkAlk0cHvnBfVYRv8dCrPZoyBz9U8CaE4ZIk830QG9/V+TIQAfWiWYanPV4lz+oZQ1Y6hnJCr+/JNY3iGJV5IQV/QHcAMOfa1FJ1pvXZRAWEr39/y3JmTA6fWtocPS9DIV3n3CUQZDn8di6+b356ZFA== 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=KgBBtvHSHCczagWeXZtsYRwLNI3gIGIdpD54Ra8tPUM=; b=Kx/EzejpohgbYOm/6aypyBB1llpqWnjAx6WuDSYhhUHbgMMKem6CPCkLE8RVNJtiqHfbBu41TAsp4NxcGbKwJ3xhcx6TZa6Xwj2lZR+bzWHHxujLk1YaRsBhJM8fRK/T+5sRXpLm0CjgkdMKuG2nz0k7a78eO+PLVJe30p1sQhv41lyeEMhHlgBK1EGM57GmHk+I70hEK7jc7LCgWPPWPw2jP3ZiSPNByRMKu1Y0RT/c6Q2KjivSWi5sZV0hnRc837UknLRNQX/xURP6khbU/BmNBdlQ3Y1sSW/ToekSEBSrJcvWfUUgWQf0Dy63tkKTUwjjQzl/04PY3hDDljDNCA== 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 X-Received: from AM6P193CA0047.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::24) by HE1PR0802MB2140.eurprd08.prod.outlook.com (2603:10a6:3:c2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15; Wed, 3 Nov 2021 15:41:11 +0000 X-Received: from AM5EUR03FT029.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:8e:cafe::4f) by AM6P193CA0047.outlook.office365.com (2603:10a6:209:8e::24) 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:11 +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; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT029.mail.protection.outlook.com (10.152.16.150) 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:10 +0000 X-Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.14; Wed, 3 Nov 2021 15:41:15 +0000 X-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.14; Wed, 3 Nov 2021 15:41:09 +0000 X-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:15 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v2 1/7] MdePkg: Add missing Cache ID (in)valid define Date: Wed, 3 Nov 2021 15:41:02 +0000 Message-ID: <20211103154108.6534-2-christopher.jones@arm.com> 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: 224493f0-377c-4ecd-c4b5-08d99ee062ba X-MS-TrafficTypeDiagnostic: HE1PR0802MB2140:|AS8PR08MB6150: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:1388;OLM:1388; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: lW2TGWQIb/MAcCxFiESvjGWHkhEEgTPqIX+v8wA4VWw8gdbO6cMpmJqwgMYquXHTzM/4X4mCrQTNMZYqW07iGX0a8uOcranjy6IUc39h+VuPo9PK7lHQhBaeSMUylnCklVnjU+NjOtOYgu6I2pvkZMP62md+0dQ8NhOfdSnfapRrkpCznSbh06Xgr28CYVR9Ff3u0SzMOPtq3Nie6ioTrmFAe6EdX5ocGFr3ehe8gJVr7tuzXUsgXWCy0+hSfIbxSsChiteVOq4zpsiCXu8gBUP4hO0hYKDuFePnTpakXJD4ArcPa6p/+M0dN59Is0kMIilfutXF+x5QZgS4/wM2qVeZ0AMPZ7GTdQfbQs13JI95UI8CnzcnaGuMWJL0ttshTAMWh2yQ+DovCTjF/6+6WR6K9TeUZzl3EI3lWSAiul/topJKKztI7X9bqBDr37QsfyTKRyaup5nE7ri5RtnWSxDOgrYiDa6inrj1K2BBFa8cCaaYSQCHRtVjOPD9kocP9oRWH3YlF0SdtMinxLfWZKBDi5qw6eiffvKEc2dT62lkt4n5BrjWR8rhNEOBfbCCNDGQN8eTVNAZv3eOc4u86q8JhJi+lImu+yNy7Oqcr9taQ//2dkbk8qNHt+avDXozY8zISPMeF021tsZC/LU1sBxBpwC7tylVlfPVNF/R70OznBdB/Ngb4dvi+BiI3ldMWFU+J9TdHoseO93mX43EVN4DGYaYphyi0Ew6PkGjuJfREzhYrY+7CE0EOPRNjy2ChsggqlPNxRW5lb5tAXQNvoQ/9/NksEbB2JHKxET8TkoBhtC1e6lbJJlL6EJmJ1kQ 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)(36860700001)(4326008)(8936002)(316002)(1076003)(54906003)(70206006)(8676002)(70586007)(7696005)(508600001)(426003)(81166007)(26005)(2616005)(2906002)(356005)(186003)(6666004)(19627235002)(36756003)(336012)(86362001)(82310400003)(5660300002)(47076005)(6916009)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2140 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT035.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 3ce71ce1-93a4-48c6-552f-08d99ee05c30 X-Microsoft-Antispam-Message-Info: Izx3JP3ETC8VjUcDg8h56PjIYYz9E3c66f5f6KuqXAFHb0X5eM3cgz4XBOBhDhiKd7dS1gKvIOx8/XYRkqklH+VxyAFKggzJ1ucy3DXxE7/N0uIZCTJXCQ/+t4faMJBRtaOnQROFlL68gk7aq3WG3h9j9RZhyG6senihR6FJfKUtz1TYZhiaqF36AU+kZI8gbJTEhv7NomRcqXaPaSz9ks1ELADBT/sy2ZcYH/NztYWgsKrw9clJnN7stfz3OsIQirCiNI0boiJlWbJMZTDha3fiv0t1NCoUTASCi26X+cwxzFdP/9D7nTmm2kP6UyEFnCo7Ta5GpMJMVeHOO6rbTlAtLJ27DsfwmCHb4bzV9Oloe5GOgHq8qIZqdpDbBx9U1s9n3LVS6E4CnP+s6rl9KjzwtMnCHgwVZvjJ/qlbxS2xRPmCguMKK1GLrPutW5SG1xEdGnfSuCUxR5oSNlXkdRQ3VwM5BBVA+5jjRlYhmBE3xfzIr7hlZlaegUAFYm1M75611gA3PivDqURYS+W9Ct+gYFW3X0Px3EWudt/Vx7Po2PjGZCRkxcrUQSo1jWTPi+gKbMmCddb6+9bKc7J4qY9mlEhPLNrxXEb6eNZpBVCFMsD1Pb+Sw0fVfvtSSCRYRgz3bTEcudo8ElsXSx1arFcnDmj9FoDhSczm+hvCLzFR5Gn+IP8lcmln1azLFigOREEzPPXuqkCYoBl/aXAlCxuXX23eIc01Z6eJ1EE0f3rApuQNZpDM25h0LE2IJ9suls0WjDf5pf1pHJ11u5hbKicpVqs1B+RM6H8xu3gNLLM= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2021 15:41:21.5825 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 224493f0-377c-4ecd-c4b5-08d99ee062ba 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: DB5EUR03FT035.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6150 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,christopher.jones@arm.com X-Gm-Message-State: InCCA8p1rxOTyLRSaJU7blDux1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635954087; bh=iD2JFIUuRsydqOksSlhng3dh7cGHqYcaCKdTVlvGfy8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=cyP/Ms3k30dmAyVK4obHQ7B1zxWRA9qTtevcrdG7wY6/V790AvB7weoNTYnRoj5qb7i qRJrRKAc4fMF8J3lcEabefG6FcZtORz5zipiws0al1zgWE+bGKoxRvtlpX7oOuU2WWOir 3k5ZCc3gjK6kBuReA327n1JMbv7E9ue3dVQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635954088837100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3697) Add Cache ID valid/invalid defines to Acpi64.h which were not initially added when the CacheIdValid field was added to EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE_FLAGS. Signed-off-by: Chris Jones Reviewed-by: Zhichao Gao --- MdePkg/Include/IndustryStandard/Acpi64.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MdePkg/Include/IndustryStandard/Acpi64.h b/MdePkg/Include/Indu= stryStandard/Acpi64.h index 3a91302f8c0e71d4951d27aac35322073219c836..625504ba77b4000c0a0b540299d= 2e0e42c768400 100644 --- a/MdePkg/Include/IndustryStandard/Acpi64.h +++ b/MdePkg/Include/IndustryStandard/Acpi64.h @@ -2680,6 +2680,8 @@ typedef struct { #define EFI_ACPI_6_4_PPTT_WRITE_POLICY_VALID 0x1 #define EFI_ACPI_6_4_PPTT_LINE_SIZE_INVALID 0x0 #define EFI_ACPI_6_4_PPTT_LINE_SIZE_VALID 0x1 +#define EFI_ACPI_6_4_PPTT_CACHE_ID_INVALID 0x0 +#define EFI_ACPI_6_4_PPTT_CACHE_ID_VALID 0x1 =20 /// /// Cache Type Structure flags --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83271): https://edk2.groups.io/g/devel/message/83271 Mute This Topic: https://groups.io/mt/86794146/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:38:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83273+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635954095166875.1008379462229; Wed, 3 Nov 2021 08:41:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ThZAYY1788612xYXfcXDCBCj; Wed, 03 Nov 2021 08:41:34 -0700 X-Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.70]) by mx.groups.io with SMTP id smtpd.web12.9481.1635954093389576932 for ; Wed, 03 Nov 2021 08:41:34 -0700 X-Received: from DB6P195CA0022.EURP195.PROD.OUTLOOK.COM (2603:10a6:4:cb::32) by HE1PR0801MB1820.eurprd08.prod.outlook.com (2603:10a6:3:85::13) 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:20 +0000 X-Received: from DB5EUR03FT037.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:cb:cafe::73) by DB6P195CA0022.outlook.office365.com (2603:10a6:4:cb::32) 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:20 +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 (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83273+1787277+3901457@groups.io; helo=mail02.groups.io; 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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT037.mail.protection.outlook.com (10.152.20.215) 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:20 +0000 X-Received: ("Tessian outbound 7b0bcc4a550a:v108"); Wed, 03 Nov 2021 15:41:20 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: f0d0dc1ef7204f82 X-CR-MTA-TID: 64aa7808 X-Received: from d473fd6efefb.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id B47CA3F1-445B-465C-BBD9-6D0D395959CD.1; Wed, 03 Nov 2021 15:41:13 +0000 X-Received: from EUR03-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id d473fd6efefb.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 03 Nov 2021 15:41:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AkxOGt79jPp3THMl4vGGmEM0svVC1ujnQwzpoW+jN1M9UTWE5k6lKru1b3PgzLy4j5ZbShX1HUOKVi+gst1/goH/4MuPH8/yrjzX44+Le3AMXmuR9mFVH4plj7GUCQ/aikAINuDulfYhyEP3dgvNppNwD1Ky6xCESr+KpDN4yDM8PH4VFsf7s2C5Khr94+R5cu9ATKZbgZtWn4+n0kiKgBc3Vooz0MZfBgDDCqaIoV/U6ivSk/ypdM4+aTvxJ7TKTXn+7TO6wWPaWtZQE2YVxJvSRux3f9cq2yLaNRcfcL5v0jTBZouBNW73C7ARZLBBn4YhAf1zfQXVeJLgMzXhQA== 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=+trzKFDBWh3f8c/B83CHEVrt22LlYezEfIJSacjVHM0=; b=fyPMa2G6Wg/hRFh3xd5nSIChZJfV8e9+6krY/7y0sH6MugMOpkzhUW8ot9yf89La8CNHxMbRJSHzDR5K4nBcdEXKFq3nRnELmf7eNCXD2043ErOEQnQA9aqTy3FLv7UsNe15QrYwV6dpI/EBM2uTUCH34kj3m4CciJyFLlku7nbzXHyTb+3nBdCcCl92QajGqBgIWjzvQBJUyc65ShF7e+NjTdlxR4ERkixY/+yGdNkn6D2dIg/7jl2LtzyWf+7tsZdVMdgbWAbZ/fIbzHr05SIUeS1ZZfW/vgAWAu6q5DK1JAsS14ZNrAQtKbkIGhRfyTyJulzLI3P2+Oq7aV9Y7Q== 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 X-Received: from AM6P194CA0081.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::22) by PAXPR08MB7419.eurprd08.prod.outlook.com (2603:10a6:102:2ba::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15; Wed, 3 Nov 2021 15:41:11 +0000 X-Received: from AM5EUR03FT016.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:8f:cafe::4a) by AM6P194CA0081.outlook.office365.com (2603:10a6:209:8f::22) 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:11 +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; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT016.mail.protection.outlook.com (10.152.16.142) 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:10 +0000 X-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:16 +0000 X-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:15 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v2 2/7] MdePkg: Remove PPTT ID type structure Date: Wed, 3 Nov 2021 15:41:03 +0000 Message-ID: <20211103154108.6534-3-christopher.jones@arm.com> 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: 428e47ca-9ecb-4d39-180a-08d99ee061e2 X-MS-TrafficTypeDiagnostic: PAXPR08MB7419:|HE1PR0801MB1820: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:1013;OLM:1013; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: WlkxqhPyPzExpvAR0BjU0hNUFrXTUi9nCE2LFJjuRY6EeczPG8ap+KpHVtd5otFumyCU4FBZl1CFS9TIOGGD34tjYaIPI35KhTfCKSH3og0blxeVJCUD7Zcy35h1oeNZoKK3fj7Nx/dAz80EFDZqwWxRQD1+1yCMk/ZgM6kotI1eM5HbRSA/886frtq6tUQwKxBrOuQzipMj4CsNfF0y6m3ZcqRw7ftMMASkILYgL6lkQPwv12Yyfq0A9H6BRE0LphmzbM+RQhiBUxjrNgr3M5fbAOGLSIaN+oZTXrMuCWdsz+o0vtaoopmxO6acpAqao4lcFQ3UqxV9XZIaZAWO+5a/5ta3ev2nXtER4ZAIQwM3z4EV7Z4k7aprRdyqQQ+RLTFeD+Bzo1PQH+DRQl3ptwidRWKJgNOs2IFmvJ02i08PpkuahqoAt59/X9KmdSug+/v6TEl8j7DUCQAhhBSsS++M9rYR0aD58doRBJPtKgt1FVqGZzdPUHU7lQj98lBjl6AKwUM9cTpFb5dnslfp/9D5yqDBk/EP/mbxUxGkf9lo4kkP7p5F4z13lWMt/LVToAmD2HENgbERimfy/92WPW4qHOqlzraknV5+tP5ICYLeP3FpD+3aysRIa+WhPe51x94qSUGKaYOLZ/eO+CcFykjsQoJGxBjEWfSIW7W/blzj28QyeuvatDcaJCI8gD6mcB+N1LuOaXQ94IAk/+uAN9ZhJ2FFbneqa/rqoLKgBhXiDe+x6CdyxSTfbQGbDWxxIdhjnEucai/E3VTT1v15NTRN00EvsXhvozuDaVsweF0X5MJ4sCaNcVnEU2HTNwSmnCcnj/r8Swv3HidNJWc1wvf9WcMErJzmZn8KJPzNdts= 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)(6916009)(16799955002)(316002)(82310400003)(36860700001)(70206006)(336012)(54906003)(4326008)(186003)(8936002)(47076005)(86362001)(19627235002)(1076003)(8676002)(83380400001)(6666004)(36756003)(81166007)(5660300002)(26005)(508600001)(356005)(7696005)(2906002)(2616005)(70586007)(426003)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7419 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT037.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: fbe23737-38da-4111-3c79-08d99ee05c6d X-Microsoft-Antispam-Message-Info: 7LvV1/g1UgUV81dldMIqYYJOYDclEvaa4XDgxeACXUppJkr0uOPFAduP+XhupEl4+UL7CFBNLc/lXM/3gU5keRxDkaMTksYepnbQipdGFy5RB3Qk+SrJEIFI6Gd1qZC4nZav5iyPYiRuc1FA2gCfoEmZKu10cgu7pC7zBcEmMYMCdqxu8DQwJxM4DtZ+gHRc7Dr2VgYH+dP9BZk7ZpLr5fq7kM/eMtw8B5u0vnh0k6yqIcfnNPBfRINo18bCyc8UXhXRQi761PYfftMpE7REXdjX4ba4wIG7vrXheFAAPm/2DML/47dVo6fUDtirB7zWrGEB2nY9Yd/+8WIji3o7JP2jUDUfb+LQyv4FW6op728Pu2JVLCZll3CHtNsdo02YZt3ah6+YZFwZ7jANwHy10pqH7QgIbn4m8cBUebu15m9M775t9v/2pA3nHH6wnY+O3G3RnL9FieedqIaalOt0GfjvTRN0dk9dfXTc6vmmyp/x4RmxNpTzW7/Ofb3ZxVlqSES2OWPZp8AQsK9689WHLIWnA2dTvcUe665lFEGG1/vYnI6xQuxujZXAayN1gWI/zwVfICvxNjJYDVT/lD2G0rlX1q+iK+N61x6O92Pz4ORMfaHVI3kbNawOuDRGNdWI/Ypt52HntBC9MnTEdzFp6tjx0KVsuJ3sJ9EZ0ctow1Ppu2FzjxiBuk5342lT9gOrGU09BWxG0sXxjbsxs08RAFa3RjnP6gyDCLyZWmR2ZWWsY3MKu03WwmtzWRsuiDN496EEHnKDyVZJ8KDDQNmRLBsZx3JwQuPtJct1GykFuf84ooqrPpIQi/oPvKk0MnLV4bYnlBrQp84Caze9t36G/A== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2021 15:41:20.1626 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 428e47ca-9ecb-4d39-180a-08d99ee061e2 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: DB5EUR03FT037.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1820 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,christopher.jones@arm.com X-Gm-Message-State: WMnlWKwDz1SFdJRVvJSSmJpOx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635954094; bh=WDTIHuaub1/Znxqf/D9ZpURtyq8vCYr+E3Fi/O0nqpM=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=wRaxU3+YQjJqUeZg7QnAGi9a8oaune7T2WNkbvgJBhADePzBAg1D8zuiT9RXhAXQj/S sIx84GwdL58QfPIeIa5SFj09+9D0JMb6iwPqVqP7S9c858wPFkom4o+ycdn3oQ/tSvcOQ cP4IBYDb0OnUTh6l1RjSuEUJzZzwI3rkdTU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635954095523100005 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3697) The ACPI 6.3A specification deprecated the PPTT ID type structure (type 2) therefore remove it from Acpi64.h. Mantis ID: 2072 (https://mantis.uefi.org/mantis/view.php?id=3D2072) Signed-off-by: Chris Jones --- MdePkg/Include/IndustryStandard/Acpi64.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/MdePkg/Include/IndustryStandard/Acpi64.h b/MdePkg/Include/Indu= stryStandard/Acpi64.h index 625504ba77b4000c0a0b540299d2e0e42c768400..bc1522722424156f0381e848c26= 17760f2d31aba 100644 --- a/MdePkg/Include/IndustryStandard/Acpi64.h +++ b/MdePkg/Include/IndustryStandard/Acpi64.h @@ -2613,7 +2613,6 @@ typedef struct { /// #define EFI_ACPI_6_4_PPTT_TYPE_PROCESSOR 0x00 #define EFI_ACPI_6_4_PPTT_TYPE_CACHE 0x01 -#define EFI_ACPI_6_4_PPTT_TYPE_ID 0x02 =20 /// /// PPTT Structure Header @@ -2737,21 +2736,6 @@ typedef struct { UINT32 CacheId; } EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE; =20 -/// -/// ID structure -/// -typedef struct { - UINT8 Type; - UINT8 Length; - UINT8 Reserved[2]; - UINT32 VendorId; - UINT64 Level1Id; - UINT64 Level2Id; - UINT16 MajorRev; - UINT16 MinorRev; - UINT16 SpinRev; -} EFI_ACPI_6_4_PPTT_STRUCTURE_ID; - /// /// Platform Health Assessment Table (PHAT) Format /// --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83273): https://edk2.groups.io/g/devel/message/83273 Mute This Topic: https://groups.io/mt/86794155/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:38:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83275+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635954110448687.699394156917; Wed, 3 Nov 2021 08:41:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id t1e6YY1788612x4gAuWTUOeK; Wed, 03 Nov 2021 08:41:49 -0700 X-Received: from EUR04-DB3-obe.outbound.protection.outlook.com (EUR04-DB3-obe.outbound.protection.outlook.com [40.107.6.50]) by mx.groups.io with SMTP id smtpd.web12.9483.1635954108704698537 for ; Wed, 03 Nov 2021 08:41:49 -0700 X-Received: from AS9PR04CA0081.eurprd04.prod.outlook.com (2603:10a6:20b:48b::22) by DB9PR08MB6491.eurprd08.prod.outlook.com (2603:10a6:10:23f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14; Wed, 3 Nov 2021 15:41:45 +0000 X-Received: from VE1EUR03FT031.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:48b:cafe::d8) by AS9PR04CA0081.outlook.office365.com (2603:10a6:20b:48b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 3 Nov 2021 15:41:45 +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 (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83275+1787277+3901457@groups.io; helo=mail02.groups.io; 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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT031.mail.protection.outlook.com (10.152.18.69) 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:44 +0000 X-Received: ("Tessian outbound 6ebd41198c5d:v108"); Wed, 03 Nov 2021 15:41:44 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 5ed315d0070a7592 X-CR-MTA-TID: 64aa7808 X-Received: from d7088ff92c80.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 75681B8C-1403-413A-A632-57A563698D9A.1; Wed, 03 Nov 2021 15:41:31 +0000 X-Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id d7088ff92c80.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 03 Nov 2021 15:41:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bTDiWzU5mY4qno87YGsIX7vAsk4wTNXP3uBfAA9nEa1Z0FIHKYVfLHMwbqXWP7oSDbcbyZrYXSJPymKQpGwLcwXZEpwmyYD4eKT9+IMP7kbAptm+u3nw5KfLRK4Hgyan85f59JUcpSYR4Kyr+JIeqKi+dRpyfc7LlwBBgO61JSkz3d+HI9Sq3f74+4I0YXSH1bG4Od2L3uofJXJG/k+fN8xi6T4cdyx9MrFyAjn8prZ/6ubA0qXiryt17NZqjVdAQRX1gTU2LhhpS7Rbkqdxa0q35wOCQ/CQ0ZLiO5cmsVKO9FxGQU/I2REPgThzCEcetKiiHjdo1zp9Hob83xBJgA== 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=bvO7bfJgOW7kmFTHe91ULhWl8sMrVnSZ4k33xC7roNk=; b=boU6tURvkQJkgdrRfc9ZAsn/WEExbHHzLwlK3ZUVsEnHaPAOTurgqr8wWVhRVslAqPSU2E3Q6roAoJbniP9x9Qq+Uoqxi+3CixN1dwn2ArBsHu/93LBHqtIaIo2XjcHeGaHDusSj6gxPgNJEcl6jS5G1sC2wjUlPblVHIsq7blSPYFq0DBPFkIRdZudPaJvJCPgjiXcDvGBMjxn4E9XRsoQIUq67S4DKm5f8A/CqiIQEiJD+e9pwjqDq79/BAtboyQVV3dRi5OD3OVwRYGMsd2j7DWMsGd4p1GcqWFE4eqDNt9J63Arz1DOy74DV5gFdVtdA2kQ/rrOwnAPieWUmlA== 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 X-Received: from AM7PR03CA0021.eurprd03.prod.outlook.com (2603:10a6:20b:130::31) by AM0PR08MB3106.eurprd08.prod.outlook.com (2603:10a6:208:5a::11) 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:28 +0000 X-Received: from AM5EUR03FT049.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:130:cafe::f9) by AM7PR03CA0021.outlook.office365.com (2603:10a6:20b:130::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 3 Nov 2021 15:41:28 +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; X-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:27 +0000 X-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:16 +0000 X-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:16 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v2 3/7] ShellPkg: Update Acpiview PPTT parser to ACPI 6.4 Date: Wed, 3 Nov 2021 15:41:04 +0000 Message-ID: <20211103154108.6534-4-christopher.jones@arm.com> 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: ce7f9bf7-3818-4aaa-da1b-08d99ee07089 X-MS-TrafficTypeDiagnostic: AM0PR08MB3106:|DB9PR08MB6491: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:9508;OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: ljAiQh1A0H6VERrcNbpAi47lV5Fs7lJPvfFQAWmOfVFby7f+DgHnegKJSENRgTlPUbYzDpKLaOi0qqcaf5bcvpawwepNPn28mx3t2TiHGs/3CmTU5nW2x1/B3BxO087cShRs75nzCRQlxDyG9dDsTfWfK6s1SwShl9Zh5asyYSH0DSs/v7fvyvZwePzC3IuBycFmj02iIKP2Mr8Ji/07SN++xngwgjJ7fj0Kp9ROa0V7uEqccOKLqjoJd0ZDmRmfQCW3rwRZdkEWew+jtZiYiGuvi3nYLawoxihXFqxCUP87Go5kuO8lgvgIKbdP5aJJUAI8TFd60iwZ+oxhlMq7HvjDA4fSMQ0NN1iYxpn5387vTOnVWGhIUA/2t0vQPJ2aNPbBmSpgFBs3HYrHowSG/Jqq83Dyf1gBp296Almx7JjjzO0k1UbyLm7E8px/sCX5AMh8ebVhs3Km3nUa7WIudoY5RNUOWF+FbGpFH4KFhAeFSbDXFRwuS3Ovd7ZVQkqk6R9BZME6AqY7MWAb7wueu7hfj8FxU882LtaaAvUKH4fAuplUH6HjQMpp4NngvyB6cADz/cl2lWfMTzWSwu8UzoTt7ZDLDNogQKlAJ4wW/ZnvH6Gtyi1rmJk0MX21Xp9gaXRocoiBot+vEhsCB86WMmF61rctTtSXpn1HDej/hkCxQ18boCy3Oe09JfKpmQEF/muj/4+Eb5P4nghcJ2GrwqO9VndIP5+Q2GQrhMKnrI394hSq4a6nFd9+MnUFNxGPhgpdN9HnLov3aZB+bSJfhV/P1U6onhzs31RhVvvA5UiVpTotibMk5KgKVQbYEmiq 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)(86362001)(186003)(36860700001)(2906002)(81166007)(6916009)(8676002)(26005)(82310400003)(7696005)(1076003)(83380400001)(356005)(70206006)(6666004)(336012)(8936002)(36756003)(5660300002)(316002)(47076005)(70586007)(508600001)(4326008)(2616005)(15650500001)(426003)(54906003)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3106 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT031.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 3cc937bb-9dc1-480c-fff6-08d99ee0668e X-Microsoft-Antispam-Message-Info: SbALrVd/1COxCO+DSABHHiPuovhH4i/oTz5m5OlvdtWrnK3hH9Xo+FK7nW8khjs+FbNbBNwDoNBQcECnDveo/rANLaGuK4L2jM4Gjhftp+gPmL81spJVpXq+eTrq82Af2jUR3GfUeNBav2Pa3FWa4j/vLxv6nhiCJHyL84e0Qdm5RbnBNSAOjtilVqT7h/uiqqWrnrinoDXxatICodEssRv98Otq5RfiTmJi4jutyVLCiHA4npkeRXKzcKkSKSXppUj8Et1t/0CAyiad6l26qqDmrQoWs7J39lNZhmfuNm0DspK6rGjG5+BKiqhbetsA15HvyosjAQSjB9s8j/s/XvYlC8CFd16gkbt06sNUU/aXo6jmmNEQi5KDqEHmO7yYn2t4UoAUq+rQeIeETaU8zuso6sUPOFJb3n1K4mwg4fDLD1Tv4tLY14ScFfoej0P/PR7Rso44ZQ1t9YL4k/m0gZsTpc+QXb9NlvkQS33HF1FNKelQVpTtznDeMSEtYaQAevM02vbQJA1Ehf5NSS5iAdvlH0K5JPaLACTEkRx4Thx3t1UmyW6KvjrQ2XsQQ/iSKS55Wg4pyqJX6R+aGc7A2hgDd8bV14AeJWfoEBX3asNxezziYTfQj48jUMdOsEixNUAYJOzsYazvImr3fMUQPC0fGy1HnB5nw6C9RpFNtJC0tKZlbMlHQjAQJr71wBSTlUKczhrum1yhRKzbsevk4fwuldM3laV+eNQpGU6pfwtPd1ia02QzwKskFsNQ1Kr0xjQiI/G9hxl7DAhbiZ4s1ZGd9pQEPVFKrl3B5eMPgqI= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2021 15:41:44.6101 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ce7f9bf7-3818-4aaa-da1b-08d99ee07089 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: VE1EUR03FT031.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6491 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,christopher.jones@arm.com X-Gm-Message-State: plWkogFfz3X2yMcwChNwhtfBx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635954109; bh=4NXVGwrgL9jKS4X3EnPIDNNL57jJgcK8LfyAeFB0lrU=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=BXH5Yoe9HptTbqa8/PBByZDjB3lrPhjvuVfw8lqb9zPkj9kUCp5Uy1BfGhkN5ca0mJ8 3spLnPnTF24Ee8Thd8fb0qPZsrHFfUnwtzWNaG/dfkZGazbvNkDQHDX+Y6DjARootIJnH dxOPw3KLAHZhWNGobe7ZobH2xBxP8ritsRM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635954111421100002 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3697) Update the Acpiview PPTT parser to use Acpi64.h. As part of the changes, remove support for parsing PPTT type 2 ID structure. Signed-off-by: Chris Jones Reviewed-by: Zhichao Gao --- Notes: v2: - Changed PPTT ID error message to say "removed" instead of "deprecated= ". ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c = | 61 ++++---------------- ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c= | 2 +- 2 files changed, 12 insertions(+), 51 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/Pptt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttPa= rser.c index acd2b81bb3258c7322aa10d2c0e0d842d89e358b..bb840a0dbab240d371aa58d323e= 61f47fa8d1587 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c @@ -1,11 +1,11 @@ /** @file PPTT table parser =20 - Copyright (c) 2019 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2019 - 2021, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent =20 @par Reference(s): - - ACPI 6.3 Specification - January 2019 + - ACPI 6.4 Specification - January 2021 - ARM Architecture Reference Manual ARMv8 (D.a) **/ =20 @@ -157,8 +157,8 @@ ValidateCacheAttributes ( ) { // Reference: Advanced Configuration and Power Interface (ACPI) Specific= ation - // Version 6.2 Errata A, September 2017 - // Table 5-153: Cache Type Structure + // Version 6.4, January 2021 + // Table 5-140: Cache Type Structure UINT8 Attributes; Attributes =3D *(UINT8*)Ptr; =20 @@ -222,22 +222,6 @@ STATIC CONST ACPI_PARSER CacheTypeStructureParser[] = =3D { {L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineSize, NULL} }; =20 -/** - An ACPI_PARSER array describing the ID Type Structure - Type 2. -**/ -STATIC CONST ACPI_PARSER IdStructureParser[] =3D { - {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL}, - {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL}, - {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL}, - - {L"VENDOR_ID", 4, 4, NULL, Dump4Chars, NULL, NULL, NULL}, - {L"LEVEL_1_ID", 8, 8, L"0x%x", NULL, NULL, NULL, NULL}, - {L"LEVEL_2_ID", 8, 16, L"0x%x", NULL, NULL, NULL, NULL}, - {L"MAJOR_REV", 2, 24, L"0x%x", NULL, NULL, NULL, NULL}, - {L"MINOR_REV", 2, 26, L"0x%x", NULL, NULL, NULL, NULL}, - {L"SPIN_REV", 2, 28, L"0x%x", NULL, NULL, NULL, NULL}, -}; - /** This function parses the Processor Hierarchy Node Structure (Type 0). =20 @@ -335,29 +319,6 @@ DumpCacheTypeStructure ( ); } =20 -/** - This function parses the ID Structure (Type 2). - - @param [in] Ptr Pointer to the start of the ID Structure data. - @param [in] Length Length of the ID Structure. -**/ -STATIC -VOID -DumpIDStructure ( - IN UINT8* Ptr, - IN UINT8 Length - ) -{ - ParseAcpi ( - TRUE, - 2, - "ID Structure", - Ptr, - Length, - PARSER_PARAMS (IdStructureParser) - ); -} - /** This function parses the ACPI PPTT table. When trace is enabled this function parses the PPTT table and @@ -366,7 +327,6 @@ DumpIDStructure ( This function parses the following processor topology structures: - Processor hierarchy node structure (Type 0) - Cache Type Structure (Type 1) - - ID structure (Type 2) =20 This function also performs validation of the ACPI table fields. =20 @@ -444,22 +404,23 @@ ParseAcpiPptt ( Print (L"0x%x\n", Offset); =20 switch (*ProcessorTopologyStructureType) { - case EFI_ACPI_6_2_PPTT_TYPE_PROCESSOR: + case EFI_ACPI_6_4_PPTT_TYPE_PROCESSOR: DumpProcessorHierarchyNodeStructure ( ProcessorTopologyStructurePtr, *ProcessorTopologyStructureLength ); break; - case EFI_ACPI_6_2_PPTT_TYPE_CACHE: + case EFI_ACPI_6_4_PPTT_TYPE_CACHE: DumpCacheTypeStructure ( ProcessorTopologyStructurePtr, *ProcessorTopologyStructureLength ); break; - case EFI_ACPI_6_2_PPTT_TYPE_ID: - DumpIDStructure ( - ProcessorTopologyStructurePtr, - *ProcessorTopologyStructureLength + case EFI_ACPI_6_3_PPTT_TYPE_ID: + IncrementErrorCount (); + Print ( + L"ERROR: PPTT Type 2 - Processor ID has been removed and must no= t be" + L"used.\n" ); break; default: diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiView= CommandLib.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiVi= ewCommandLib.c index d725cad14c5d018e2004eb8e33c845aa9c719429..ab9e6c619d70df4f79d78241603= 7d7bef62c92d5 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommand= Lib.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommand= Lib.c @@ -62,7 +62,7 @@ ACPI_TABLE_PARSER ParserList[] =3D { ParseAcpiMcfg}, {EFI_ACPI_6_4_PLATFORM_COMMUNICATIONS_CHANNEL_TABLE_SIGNATURE, ParseAcpiPcct}, - {EFI_ACPI_6_2_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGNATURE, + {EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGNATURE, ParseAcpiPptt}, {RSDP_TABLE_INFO, ParseAcpiRsdp}, {EFI_ACPI_6_2_SYSTEM_LOCALITY_INFORMATION_TABLE_SIGNATURE, ParseAcpiSlit= }, --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83275): https://edk2.groups.io/g/devel/message/83275 Mute This Topic: https://groups.io/mt/86794163/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:38:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83274+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635954103387527.0559045790791; Wed, 3 Nov 2021 08:41:43 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id d3wrYY1788612xKEY2GKH80r; Wed, 03 Nov 2021 08:41:43 -0700 X-Received: from EUR03-DB5-obe.outbound.protection.outlook.com (EUR03-DB5-obe.outbound.protection.outlook.com [40.107.4.73]) by mx.groups.io with SMTP id smtpd.web11.9610.1635954101909744510 for ; Wed, 03 Nov 2021 08:41:42 -0700 X-Received: from DB6PR0202CA0028.eurprd02.prod.outlook.com (2603:10a6:4:a5::14) by DB9PR08MB7022.eurprd08.prod.outlook.com (2603:10a6:10:2c9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 3 Nov 2021 15:41:38 +0000 X-Received: from DB5EUR03FT009.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:a5:cafe::b4) by DB6PR0202CA0028.outlook.office365.com (2603:10a6:4:a5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 3 Nov 2021 15:41:38 +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 (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83274+1787277+3901457@groups.io; helo=mail02.groups.io; 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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT009.mail.protection.outlook.com (10.152.20.117) 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:38 +0000 X-Received: ("Tessian outbound 7b0bcc4a550a:v108"); Wed, 03 Nov 2021 15:41:38 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 2980863ea49d66dc X-CR-MTA-TID: 64aa7808 X-Received: from 33169af635ae.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 3B7099AE-9176-4126-B832-AF994F0A6ACB.1; Wed, 03 Nov 2021 15:41:31 +0000 X-Received: from EUR01-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 33169af635ae.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 03 Nov 2021 15:41:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fVRH4NDaFIDWpOSC3KaprEwHOsUfQSLtr26KbeU15YIFh7E6qFItBOw9uD1Jxog6+II/GOhJ08Ljx7hwbALAaDw6EyMMqEzbwSf0IF9+ZGRk0mZGpyFALx7Xhv0T5Zwrxi0n/KBwYp+K4H+3mMV3Q/Wf5Gy17urkccTEbD6/Poz2WH9lmfBK7rreT6ldnuw9N813cDnW9QyUrTUoG74kf8WTIo/7DPpgdxrOUaXqcq5IlMY4f5w4BwoOfoTsI3azua7OAP3TDKOX5WTYjPYDAuFZrTy/ppWPvtQAM6w8vDWMzdACVPR63BrC0sBur4yvtJLojTRe3EKI52kwJWr/+g== 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=NKEIbCHgLXLrXdpSyXTkUNKZ4ouxxAn6gTA1n2uEjZs=; b=A3DiebKFlUjXs+l1Aufq5G7tZjJjp0ByK2QOgmesNJNpjvRdnuDKSBU2HbgJvDCZuMtGY4dms9QL7nitg751fg/OFtjwzbFOL7sy+qRnEzoc1VxnnCMG+/Zw0RpKVy4jxAyN0CN/j+COIl2Eo4ZAU5AKCmnZ7wW/pgXo2Y4Twc5CpWjaxnBbt8DbnRtVrC8HDE/iyF3DApgRSJMQqyIygaa5VUMWVknGgEWj0mJlsnLc5lsPwv4HbMRdT63NZ20Z7g5RXEDHsYeJFiucQ3P5JsklCbCGxwkIx9c1uDtfX81ygIY4EokH71C295/5mOTfoHwQ+Xl+Jx6m8eutxH+5Aw== 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 X-Received: from AM6P192CA0070.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:82::47) by AS8PR08MB7267.eurprd08.prod.outlook.com (2603:10a6:20b:422::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 3 Nov 2021 15:41:29 +0000 X-Received: from AM5EUR03FT037.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:82:cafe::2d) by AM6P192CA0070.outlook.office365.com (2603:10a6:209:82::47) 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:29 +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; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT037.mail.protection.outlook.com (10.152.17.241) 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:28 +0000 X-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:16 +0000 X-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:16 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v2 4/7] ShellPkg: Add Cache ID to PPTT parser Date: Wed, 3 Nov 2021 15:41:05 +0000 Message-ID: <20211103154108.6534-5-christopher.jones@arm.com> 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: cfdf221f-bc08-4c90-b4d3-08d99ee06ccf X-MS-TrafficTypeDiagnostic: AS8PR08MB7267:|DB9PR08MB7022: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:9508;OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: aGCts37njrQPnl7OHXmBJ0UTzWlwFZjSvQ3Y8vOOflkBR5oim6DpYKc1SoEOv5TRKkd7xt/TixD3e1qNS7wKoeWTN4dSw6MDYhXgfC7EvnX/YO5p2ebSdYrNxYy0qMvXjJ9Hixq+CXMTPAKFnFXeOi9oYx9j3AkAweRtp4ihx+zglRclx3dt010DkZzz2FG7GRkOEXGvc4hwIsIdcb1qm2gKsesT1E0SOhl1rCVfhdfH8K21eHqVlMo2++jt+IcSZQqb75inUiPep1LYx1bZo8Cm0WASJsgVeYOuRgtHy08InZNePr2FAsCeUZkyna6FnhJ1uxuvnhkBxx0AIODKB8OwfT793mziwDyqV/6bzveIzTMm0Fgu60g54r8ZSmo9U4H3mQI9v8jLzyE96lPq2GcIwfEljggkZBn+I+RPoyC916XAIVmsEXbJ8M/iml9wfjJ96jWUGDoDNcv63veeurvheXb7wL41mIlm8qbbZKuFhLf/beR1YuCm959NC/44YTm+kVfNY1LrvbYQp2z/wXAvEqZT23cezspX8hvEVqMkO/ffNQ4LR6zLfFHYyI4exPJdZKtsKqS7F5yDHLB5+iBO//79VcmpZ4IEfnJLZDqWLayV9JA+bqPe6fnDXhpXPhNoOW9u0wOOWqu17AOtVFFCzvGoA6i31HR7gYcl4YLHSaOBVa8xE0Rr9LtYGt6ifYfPTbpey6prjVR0rEgz5S0qp4eAoZjaHC0VCwAFrx4K6UKDARKETAsfLJd9rfzOEKTFXDy8lcZH8v0kecP0E6hv8yzKKWQ9wvtIHOxhVFUk+04FA4arcRZimNk2thnX 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)(186003)(1076003)(426003)(2906002)(70586007)(70206006)(54906003)(82310400003)(86362001)(8676002)(4326008)(316002)(5660300002)(36860700001)(6666004)(36756003)(7696005)(2616005)(26005)(6916009)(336012)(83380400001)(356005)(81166007)(47076005)(508600001)(8936002)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB7267 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT009.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 1c0257ff-baba-441d-62ab-08d99ee066fb X-Microsoft-Antispam-Message-Info: XbOhpZ+LlFycqsmTwsAHkusbhvg0FgdFVE1g+hbwSwv7WTjIfE1EzGVzPssJ6bxHvGUFK2Cry9CzpLCOmSC4osuiapRbc+3lGlmpTz+7U6XsdPR/k1DczL2O2S+6vLo8sSx3BvMnib3GalEH8OX+5MFNPWFJ/vJ/kG84F3KL5s101Lb/x3ArfTYJiGL+c837KIPfEsKF7xbX2ff0pWAcw4D+ZElNtYwCfGkU3QMdYsulriNGj0Y7QkcfuTPdIh970Z1xZuw51s+N2W6T73tQtI1YunV+E5/h449JmO5108lnQHeJBWj3Wrfo2VoZWQKtDZNIV1cbGwEAWGtnzgvMVWyfp1Im8HXOk5U2ya9lx3R03XB0IVL8r4J+aJ3gg9ZQAZPQXuXk5DaS5wKzipBGGvyrYfyjmW8kzYR9qOGwJMMrE9K+1s3E+H8//8W2ds7fo2L5LU2ZpozBv4djpL3NcDO97HNh117S/JKdx20rs0YuqLhqU5ltUMYczitLPJRb+SH/KBPjA/nczOCbk0+I0IQ89o0NCIExHfzxCGOGci2c/o0HV6CONSpKKrb4IYz5c7xFIiDQZqypXG9fXThuD1EGZfykm1qZetIgCVRmZEF0TYHAYD4cO96+Do3Iihbh8LkB21jhXSMIOgxCT6vujmuGjuIYpldaGuILtyEyuql2qtz/s1F7htErDMDlvYlUpxtSSfmsz+vZzxjFrWdaUa5Wl+VsIhNtiCgCJWsDaNwOVv1qAuG4JRYS6v58xP6ED3fpVwCMViQ1YB+GLf/uWhTjfENdTCv7djpgXIaDcYo= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2021 15:41:38.4980 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cfdf221f-bc08-4c90-b4d3-08d99ee06ccf 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: DB5EUR03FT009.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB7022 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,christopher.jones@arm.com X-Gm-Message-State: g6T0wE8Yt1eV8GjJa4VNxADix1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635954103; bh=2Bct5UCLwUjpAcxzs5emA12O+larUq+PnSae+7IExYU=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=CXnCCOagnEpzwo5Z2JmmMULvCYfWP625M7ma5fcmNwRATVUwmZi3e1geywM9elIJ9Qx stUNevzDGPJV1/wopwcliYByfHZd+tFfTo4GeFlEY88LAjoEn6iUc43JmEkFXExXqWzdi cK0MdD6ZqUIGAhUHfrew/szncci8rdoBagQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635954104363100002 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3697) Update the Acpiview PPTT parser with the Cache ID field and relevant validations as defined in tables 5.140 and 5.141 of the ACPI 6.4 specification. Signed-off-by: Chris Jones Reviewed-by: Zhichao Gao --- Notes: v2: - Fixed a bug where 'CacheFlags' and 'CacheId' were only set after the validation function had finished. Instead set them inside the validation function using the first 'Ptr' parameter. ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c | 1= 20 +++++++++++++++++++- 1 file changed, 118 insertions(+), 2 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/Pptt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttPa= rser.c index bb840a0dbab240d371aa58d323e61f47fa8d1587..3f93038ce1d83c005ae3d6a43e1= 1f309440ad6fa 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c @@ -20,8 +20,84 @@ STATIC CONST UINT8* ProcessorTopologyStructureType; STATIC CONST UINT8* ProcessorTopologyStructureLength; STATIC CONST UINT32* NumberOfPrivateResources; +STATIC CONST EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE_FLAGS* CacheFlags; STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo; =20 +/** + Increment the error count and print an error that a required flag is mis= sing. + + @param [in] FlagName Name of the missing flag. +**/ +STATIC +VOID +EFIAPI +LogCacheFlagError ( + IN CONST CHAR16* FlagName + ) +{ + IncrementErrorCount (); + Print ( + L"\nERROR: On Arm based systems, all cache properties must be" + L"provided in the cache type structure." + L"Missing '%s' flag.", + *FlagName + ); +} + +/** + This function validates the Cache Type Structure (Type 1) Cache Flags fi= eld. + + @param [in] Ptr Pointer to the start of the field data. + @param [in] Context Pointer to context specific information e.g. this + could be a pointer to the ACPI table header. +**/ +STATIC +VOID +EFIAPI +ValidateCacheFlags ( + IN UINT8* Ptr, + IN VOID* Context + ) +{ +#if defined(MDE_CPU_ARM) || defined(MDE_CPU_AARCH64) + CacheFlags =3D (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE_FLAGS*)Ptr; + + if (CacheFlags =3D=3D NULL) { + IncrementErrorCount (); + Print (L"\nERROR: Cache Structure Flags were not successfully read."); + return; + } + + if (CacheFlags->SizePropertyValid =3D=3D EFI_ACPI_6_4_PPTT_CACHE_SIZE_IN= VALID) { + LogCacheFlagError (L"Size Property Valid"); + } + if (CacheFlags->NumberOfSetsValid =3D=3D EFI_ACPI_6_4_PPTT_NUMBER_OF_SET= S_INVALID) { + LogCacheFlagError (L"Number Of Sets Valid"); + } + if (CacheFlags->AssociativityValid =3D=3D EFI_ACPI_6_4_PPTT_ASSOCIATIVIT= Y_INVALID) { + LogCacheFlagError (L"Associativity Valid"); + } + if (CacheFlags->AllocationTypeValid =3D=3D EFI_ACPI_6_4_PPTT_ALLOCATION_= TYPE_INVALID) { + LogCacheFlagError (L"Allocation Type Valid"); + } + if (CacheFlags->CacheTypeValid =3D=3D EFI_ACPI_6_4_PPTT_CACHE_TYPE_INVAL= ID) { + LogCacheFlagError (L"Cache Type Valid"); + } + if (CacheFlags->WritePolicyValid =3D=3D EFI_ACPI_6_4_PPTT_WRITE_POLICY_I= NVALID) { + LogCacheFlagError (L"Write Policy Valid"); + } + if (CacheFlags->LineSizeValid =3D=3D EFI_ACPI_6_4_PPTT_LINE_SIZE_INVALID= ) { + LogCacheFlagError (L"Line Size Valid"); + } + // Cache ID was only introduced in revision 3 + if (*(AcpiHdrInfo.Revision) >=3D 3) { + if (CacheFlags->CacheIdValid =3D=3D EFI_ACPI_6_4_PPTT_CACHE_ID_INVALID= ) { + LogCacheFlagError (L"Cache Id Valid"); + } + } +#endif +} + /** This function validates the Cache Type Structure (Type 1) 'Number of set= s' field. @@ -141,6 +217,44 @@ ValidateCacheLineSize ( #endif } =20 +/** + This function validates the Cache Type Structure (Type 1) Cache ID field. + + @param [in] Ptr Pointer to the start of the field data. + @param [in] Context Pointer to context specific information e.g. this + could be a pointer to the ACPI table header. +**/ +STATIC +VOID +EFIAPI +ValidateCacheId ( + IN UINT8* Ptr, + IN VOID* Context + ) +{ + UINT32 CacheId; + CacheId =3D *(UINT32*)Ptr; + + // Cache ID was only introduced in revision 3 + if (*(AcpiHdrInfo.Revision) < 3) { + return; + } + + if (CacheFlags =3D=3D NULL) { + IncrementErrorCount (); + Print (L"\nERROR: Cache Structure Flags were not successfully read."); + return; + } + + if (CacheFlags->CacheIdValid =3D=3D EFI_ACPI_6_4_PPTT_CACHE_ID_VALID) { + if (CacheId =3D=3D 0) { + IncrementErrorCount (); + Print (L"\nERROR: 0 is not a valid Cache ID."); + return; + } + } +} + /** This function validates the Cache Type Structure (Type 1) Attributes fie= ld. =20 @@ -213,13 +327,15 @@ STATIC CONST ACPI_PARSER CacheTypeStructureParser[] = =3D { {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL}, {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL}, =20 - {L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL}, + {L"Flags", 4, 4, L"0x%x", NULL, (VOID**)&CacheFlags, ValidateCacheFlags, + NULL}, {L"Next Level of Cache", 4, 8, L"0x%x", NULL, NULL, NULL, NULL}, {L"Size", 4, 12, L"0x%x", NULL, NULL, NULL, NULL}, {L"Number of sets", 4, 16, L"%d", NULL, NULL, ValidateCacheNumberOfSets,= NULL}, {L"Associativity", 1, 20, L"%d", NULL, NULL, ValidateCacheAssociativity,= NULL}, {L"Attributes", 1, 21, L"0x%x", NULL, NULL, ValidateCacheAttributes, NUL= L}, - {L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineSize, NULL} + {L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineSize, NULL}, + {L"Cache ID", 4, 24, L"%d", NULL, NULL, ValidateCacheId, NULL} }; =20 /** --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83274): https://edk2.groups.io/g/devel/message/83274 Mute This Topic: https://groups.io/mt/86794159/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:38:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83277+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635954114051640.4732624044749; Wed, 3 Nov 2021 08:41:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id e1rfYY1788612x9V7nzAXcHy; Wed, 03 Nov 2021 08:41:53 -0700 X-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 X-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 X-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 (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83277+1787277+3901457@groups.io; helo=mail02.groups.io; 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; X-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 X-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 X-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 X-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 X-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 X-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; X-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 X-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 X-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: [edk2-devel] [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> 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 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-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-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 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,christopher.jones@arm.com X-Gm-Message-State: luQvypyR2IBelw5TVctbdUuVx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635954113; bh=BnSeDgbc2/9Fo05R60DDyOGIljnfLGomcLgRED3dgGY=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=QleASiBZ6b5EDIgqHg3Ptx/Oq8PTpiZtIi51U9RCt+J5aWY/zWhnglkszjT4QoPuejq D/uDxG/OsnhU021cXnwGmKYL3OIb/7BDsF6+y0xGJtUc8VXdghg6hnVJrGrzgYiJLdrBV diO0X+aBwEiV39PMv3vxfvwk9yNji6ik3Ec= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635954115786100004 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3697) 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/DynamicTables= Pkg/Include/ArmNameSpaceObjects.h index f19c9c70666970bb70b6aa09f064bb10a9a67112..6bc5ab6b2b28424c1afddc26cc8= 9a54b81941aeb 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; =20 -/** 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. =20 diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator= .c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c index d70fc59e754e7d348965b8c3739822a9f1c4b7e6..65d1661c0ec47a4d1631c0dcac7= bcb16dbc619e0 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 Generat= or: - EArmObjProcHierarchyInfo (REQUIRED) - EArmObjCacheInfo - - EArmObjProcNodeIdInfo - EArmObjCmRef - EArmObjGicCInfo (REQUIRED) */ @@ -59,16 +58,6 @@ GET_OBJECT_LIST ( CM_ARM_CACHE_INFO ); =20 -/** - 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 ); =20 -/** This macro expands to a function that retrieves the amount of memory - required to store the ID Structures (Type 2) and updates the Node Inde= xer. -*/ -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 ( } =20 // 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 =3D GetPpttNodeReferencedByToken ( Generator->CacheStructIndexedList, (Generator->ProcTopologyStructCount - @@ -964,72 +944,6 @@ AddCacheTypeStructures ( return EFI_SUCCESS; } =20 -/** - 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 tabl= e. - - @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 t= he - 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 !=3D NULL) && - (CfgMgrProtocol !=3D NULL) && - (Pptt !=3D NULL) - ); - - IdStruct =3D (EFI_ACPI_6_3_PPTT_STRUCTURE_ID*)((UINT8*)Pptt + NodesStart= Offset); - - IdStructIterator =3D Generator->IdStructIndexedList; - NodeCount =3D Generator->IdStructCount; - while (NodeCount-- !=3D 0) { - ProcIdInfoNode =3D (CM_ARM_PROC_NODE_ID_INFO*)IdStructIterator->Object; - - // Populate the node - IdStruct->Type =3D EFI_ACPI_6_3_PPTT_TYPE_ID; - IdStruct->Length =3D sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_ID); - IdStruct->Reserved[0] =3D EFI_ACPI_RESERVED_BYTE; - IdStruct->Reserved[1] =3D EFI_ACPI_RESERVED_BYTE; - IdStruct->VendorId =3D ProcIdInfoNode->VendorId; - IdStruct->Level1Id =3D ProcIdInfoNode->Level1Id; - IdStruct->Level2Id =3D ProcIdInfoNode->Level2Id; - IdStruct->MajorRev =3D ProcIdInfoNode->MajorRev; - IdStruct->MinorRev =3D ProcIdInfoNode->MinorRev; - IdStruct->SpinRev =3D ProcIdInfoNode->SpinRev; - - // Next ID Type Structure - IdStruct =3D (EFI_ACPI_6_3_PPTT_STRUCTURE_ID*)((UINT8*)IdStruct + - IdStruct->Length); - IdStructIterator++; - } // ID Type Structure - - return EFI_SUCCESS; -} - /** Construct the PPTT ACPI table. =20 @@ -1068,15 +982,12 @@ BuildPpttTable ( UINT32 ProcTopologyStructCount; UINT32 ProcHierarchyNodeCount; UINT32 CacheStructCount; - UINT32 IdStructCount; =20 UINT32 ProcHierarchyNodeOffset; UINT32 CacheStructOffset; - UINT32 IdStructOffset; =20 CM_ARM_PROC_HIERARCHY_INFO * ProcHierarchyNodeList; CM_ARM_CACHE_INFO * CacheStructList; - CM_ARM_PROC_NODE_ID_INFO * IdStructList; =20 ACPI_PPTT_GENERATOR * Generator; =20 @@ -1150,27 +1061,6 @@ BuildPpttTable ( ProcTopologyStructCount +=3D CacheStructCount; Generator->CacheStructCount =3D CacheStructCount; =20 - // Get the processor hierarchy node ID info and update the processor top= ology - // structure count with ID Structures (Type 2) - Status =3D GetEArmObjProcNodeIdInfo ( - CfgMgrProtocol, - CM_NULL_TOKEN, - &IdStructList, - &IdStructCount - ); - if (EFI_ERROR (Status) && (Status !=3D EFI_NOT_FOUND)) { - DEBUG (( - DEBUG_ERROR, - "ERROR: PPTT: Failed to get processor hierarchy node ID info. " \ - "Status =3D %r\n", - Status - )); - goto error_handler; - } - - ProcTopologyStructCount +=3D IdStructCount; - Generator->IdStructCount =3D IdStructCount; - // Allocate Node Indexer array NodeIndexer =3D (PPTT_NODE_INDEXER*)AllocateZeroPool ( sizeof (PPTT_NODE_INDEXER) * @@ -1237,27 +1127,6 @@ BuildPpttTable ( )); } =20 - // Include the size of ID Type Structures and index them - if (Generator->IdStructCount !=3D 0) { - IdStructOffset =3D TableSize; - Generator->IdStructIndexedList =3D NodeIndexer; - TableSize +=3D GetSizeofIdStructs ( - IdStructOffset, - IdStructList, - Generator->IdStructCount, - &NodeIndexer - ); - DEBUG (( - DEBUG_INFO, - " IdStructCount =3D %d\n" \ - " IdStructOffset =3D 0x%x\n" \ - " IdStructIndexedList =3D 0x%p\n", - Generator->IdStructCount, - IdStructOffset, - Generator->IdStructIndexedList - )); - } - DEBUG (( DEBUG_INFO, "INFO: PPTT:\n" \ @@ -1343,24 +1212,6 @@ BuildPpttTable ( } } =20 - // Add ID Type Structures (Type 2) to the generated table - if (Generator->IdStructCount !=3D 0) { - Status =3D AddIdTypeStructures ( - Generator, - CfgMgrProtocol, - Pptt, - IdStructOffset - ); - if (EFI_ERROR (Status)) { - DEBUG (( - DEBUG_ERROR, - "ERROR: PPTT: Failed to add ID Type Structures. Status =3D %r\n", - Status - )); - goto error_handler; - } - } - // Validate CM object cross-references in PPTT Status =3D DetectCyclesInTopology (Generator); if (EFI_ERROR (Status)) { @@ -1484,8 +1335,6 @@ ACPI_PPTT_GENERATOR PpttGenerator =3D { 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..59ddd71ac4ef57d748e143afaa6= ac0befb4900e0 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; =20 #pragma pack() --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83277): https://edk2.groups.io/g/devel/message/83277 Mute This Topic: https://groups.io/mt/86794165/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:38:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83278+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635954119945921.7624457707569; Wed, 3 Nov 2021 08:41:59 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 2KQGYY1788612xZutoKIoEVo; Wed, 03 Nov 2021 08:41:59 -0700 X-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 X-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 X-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 (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83278+1787277+3901457@groups.io; helo=mail02.groups.io; 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; X-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 X-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 X-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 X-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 X-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 X-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; X-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 X-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 X-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: [edk2-devel] [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> 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 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-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-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 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,christopher.jones@arm.com X-Gm-Message-State: aPluHNrmcEloE5V3kmoJ1I2gx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635954119; bh=hOEDJ/nSdRWCRupaiXMJ4dSl9Asfc4HcyeF4u52hWw8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=GLaQQrGF9Df0RwmWo4ZLuuGdjvtfctHPW2vJ4Qk6UjSxSL+gb4gsaIdSHsJHll856s8 NaCBJGhNo4lx45uqXEIL1Xs3YV625+G/9DZ4BxicF04DQ/9snMYxBj6qVNm+cgXCmMKKQ DH3tCQuUYz0sXOJPwzQVArrmXMVgw3eSLms= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635954120554100004 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3697) 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..18f093998db57ea4698953ed06a= 9826df559c1b7 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 =20 - Copyright (c) 2019, ARM Limited. All rights reserved. + Copyright (c) 2021, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent =20 @par Reference(s): - - ACPI 6.3 Specification, January 2019 + - ACPI 6.4 Specification, January 2021 =20 @par Glossary: - Cm or CM - Configuration Manager @@ -96,7 +96,7 @@ GetProcHierarchyNodeSize ( ASSERT (Node !=3D NULL); =20 // + - return sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR) + + return sizeof (EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR) + (Node->NoOfPrivateResources * sizeof (UINT32)); } =20 @@ -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 ); =20 @@ -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; =20 @@ -492,7 +492,7 @@ AddProcHierarchyNodes ( (Pptt !=3D NULL) ); =20 - ProcStruct =3D (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR*)((UINT8*)Pptt + + ProcStruct =3D (EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR*)((UINT8*)Pptt + NodesStartOffset); =20 ProcNodeIterator =3D Generator->ProcHierarchyNodeIndexedList; @@ -536,7 +536,7 @@ AddProcHierarchyNodes ( } =20 // Populate the node header - ProcStruct->Type =3D EFI_ACPI_6_3_PPTT_TYPE_PROCESSOR; + ProcStruct->Type =3D EFI_ACPI_6_4_PPTT_TYPE_PROCESSOR; ProcStruct->Length =3D (UINT8)Length; ProcStruct->Reserved[0] =3D EFI_ACPI_RESERVED_BYTE; ProcStruct->Reserved[1] =3D EFI_ACPI_RESERVED_BYTE; @@ -657,7 +657,7 @@ AddProcHierarchyNodes ( =20 ProcStruct->NumberOfPrivateResources =3D ProcInfoNode->NoOfPrivateReso= urces; PrivateResources =3D (UINT32*)((UINT8*)ProcStruct + - sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR)); + sizeof (EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR)); =20 if (ProcStruct->NumberOfPrivateResources !=3D 0) { // Populate the private resources array @@ -680,7 +680,7 @@ AddProcHierarchyNodes ( } =20 // Next Processor Hierarchy Node - ProcStruct =3D (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR*)((UINT8*)ProcSt= ruct + + ProcStruct =3D (EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR*)((UINT8*)ProcSt= ruct + 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 !=3D NULL) ); =20 - CacheStruct =3D (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE*)((UINT8*)Pptt + + CacheStruct =3D (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE*)((UINT8*)Pptt + NodesStartOffset); =20 CacheNodeIterator =3D Generator->CacheStructIndexedList; @@ -771,13 +771,13 @@ AddCacheTypeStructures ( CacheInfoNode =3D (CM_ARM_CACHE_INFO*)CacheNodeIterator->Object; =20 // Populate the node header - CacheStruct->Type =3D EFI_ACPI_6_3_PPTT_TYPE_CACHE; - CacheStruct->Length =3D sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE); + CacheStruct->Type =3D EFI_ACPI_6_4_PPTT_TYPE_CACHE; + CacheStruct->Length =3D sizeof (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE); CacheStruct->Reserved[0] =3D EFI_ACPI_RESERVED_BYTE; CacheStruct->Reserved[1] =3D EFI_ACPI_RESERVED_BYTE; =20 // "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 =3D 1; CacheStruct->Flags.NumberOfSetsValid =3D 1; CacheStruct->Flags.AssociativityValid =3D 1; @@ -936,7 +936,7 @@ AddCacheTypeStructures ( CacheStruct->LineSize =3D CacheInfoNode->LineSize; =20 // Next Cache Type Structure - CacheStruct =3D (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE*)((UINT8*)CacheStru= ct + + CacheStruct =3D (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE*)((UINT8*)CacheStru= ct + CacheStruct->Length); CacheNodeIterator++; } // Cache Type Structure @@ -994,7 +994,7 @@ BuildPpttTable ( // Pointer to the Node Indexer array PPTT_NODE_INDEXER * NodeIndexer; =20 - EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt; + EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt; =20 ASSERT ( (This !=3D NULL) && @@ -1081,7 +1081,7 @@ BuildPpttTable ( Generator->NodeIndexer =3D NodeIndexer; =20 // Calculate the size of the PPTT table - TableSize =3D sizeof (EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_H= EADER); + TableSize =3D sizeof (EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_H= EADER); =20 // Include the size of Processor Hierarchy Nodes and index them if (Generator->ProcHierarchyNodeCount !=3D 0) { @@ -1150,7 +1150,7 @@ BuildPpttTable ( goto error_handler; } =20 - Pptt =3D (EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER*)*Tabl= e; + Pptt =3D (EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER*)*Tabl= e; =20 DEBUG (( DEBUG_INFO, @@ -1307,9 +1307,9 @@ ACPI_PPTT_GENERATOR PpttGenerator =3D { // 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 --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83278): https://edk2.groups.io/g/devel/message/83278 Mute This Topic: https://groups.io/mt/86794168/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 7 00:38:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83276+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635954113592727.438552185027; Wed, 3 Nov 2021 08:41:53 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id uUBiYY1788612xFrGrQY7mAd; Wed, 03 Nov 2021 08:41:53 -0700 X-Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.89]) by mx.groups.io with SMTP id smtpd.web08.9432.1635954112014602655 for ; Wed, 03 Nov 2021 08:41:52 -0700 X-Received: from AS8P250CA0030.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:330::35) by AM6PR08MB3253.eurprd08.prod.outlook.com (2603:10a6:209:49::22) 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:47 +0000 X-Received: from AM5EUR03FT014.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:330:cafe::36) by AS8P250CA0030.outlook.office365.com (2603:10a6:20b:330::35) 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:47 +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 (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83276+1787277+3901457@groups.io; helo=mail02.groups.io; 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; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT014.mail.protection.outlook.com (10.152.16.130) 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:46 +0000 X-Received: ("Tessian outbound 2bb1f94ba47e:v108"); Wed, 03 Nov 2021 15:41:46 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 26e23fa5a3949cc8 X-CR-MTA-TID: 64aa7808 X-Received: from bb8f3a552368.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id C0522BBC-92AE-4D3D-A6F4-C531206C69A2.1; Wed, 03 Nov 2021 15:41:40 +0000 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id bb8f3a552368.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 03 Nov 2021 15:41:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q4MUmt5tDZ3VMOYYg58ltHZq9kmFOPBBRgOyIs3X+VLrr/8kNtozmY3HvcdnwC5aFSmwpVMFdGRD8thRWT8OUPWJeH1rWKTenaEhRECjBRsQGVkfv+SosQ2Y4/jVBSsUYGD3WdBYG1Ljo0MTKjNQUemVglf+9fmGHm1YQy5IeNxDRgDBw4QjYr3HrnDvEtllHTtZhn2RvCHzlzVx70q6hLJVZim7ZDWN5Y1RW/y/bhw/khHO14j8AvMucjtuk3iNqgdlpkdA116pqAbUzi7//573vwba0UA0ZRyRLSRUHm8nE0r2mph+0yHvbsdNnf3qHA5AiGuW4lz+PPvzMV1g3w== 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=7mq61y6skqPqcfIvCsgwmeuKYCKCvWFGf/R/fN42h9M=; b=V+vQnorVxsrO/pW3sVaebO5tHAfKeEvNJFK0Sp4qNZlDMkaqwL5rziOnyITv0j3M4+Nl71ae+K/pqvGWXzb5X2mh0Mob4bOtDbvwKIh7O8xe1MdpBtInirCoO/yFrmSRGYyzHDj+00bB3oSpNrwAGtx47dMcwJxXi/g+Ua8QIT8my9a9EPaTI7EV2djWydoGXoEXipCrESpUCf76PbBagvQBbiQyt0q9XbfCRecg+PHvmopFwdjCQ2VZBIM39ec/X9OtJBp90VOTMYf7kt6EnMWDM5/vuWInjM0lvaqoibzTS8vzASkL2eOGb/ycTv3scmMzG2GmDYofNa0wPM6wxQ== 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 X-Received: from AM6P193CA0060.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::37) by VI1PR0802MB2334.eurprd08.prod.outlook.com (2603:10a6:800:9d::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:36 +0000 X-Received: from AM5EUR03FT029.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:8e:cafe::b8) by AM6P193CA0060.outlook.office365.com (2603:10a6:209:8e::37) 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:36 +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; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT029.mail.protection.outlook.com (10.152.16.150) 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:35 +0000 X-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 X-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:18 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v2 7/7] DynamicTablesPkg: Add CacheId to PPTT generator Date: Wed, 3 Nov 2021 15:41:08 +0000 Message-ID: <20211103154108.6534-8-christopher.jones@arm.com> 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: d9ed7c20-0ee8-427f-bb79-08d99ee071d7 X-MS-TrafficTypeDiagnostic: VI1PR0802MB2334:|AM6PR08MB3253: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:10000;OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: JpEtZ5/fd6q3ktLTAL3W+QZx6L9yYQiOeh4Ohh6m+gW2hExrvvhO+qB92gh7SACk/88kTpkqpeD7Dkb+AaLrFviw2HmYZZL1ZylcpMSuzvxhTf3l+K2Zu3BqLk+719yCbkzLzxqGv7C+nsh7DDpqiwAKug9aIrp0vcQDTr0zqXkfdyX1BGJJASv8jlc7iaAui0tj2qlXE/EXUO2xXPYNts7p+ApPOcSVNl0cU127r/H2Fg+u8ll4H6gdGJ7xv4jt2KBGV1YvOw4dlpV0MFKlCqibrKZdAWaQaYt1iJuXFS16XDLXTF2J7MIBfLKOo4egTyZyed+0QucQ0+436HF+WjOsfRje2vE9gwLYo81Psad3tjSnx4hfSBNKbdB0rcFXX5zz5aJ01+YyHZH/1KmVB2LxRnrnUN0cenp4LJRX4SkXYvHrXygHkq9d3WTckqbbXnohD8WXHWAyYRo6pztZpwwNLfeaYQPZAYB3TCI3Ztq4pLOcb6yrQWMLLY6IMAwRQQp0/eKye0K2hrR2ZZL7BHrTnPhVbwUny0+R4pQb6nY6D8dTWtholMk+bAC3/kD8v3V30oL4r3zEt9rhAG11MeYun0xr+YMzsGCJmIKZg3U2AkaTqRdYntV8cz4fNeNRh8VFMe8f5vp2llt94XF2ZMNQRnsJbhHzUVR3wDsI7kzWnHequBu21TOFgj1+j2RM3lpAOCeVEIbAFewAD04eyQH9B3AMntSgp3A91zrF0SPYdQ1KwoA+u96a59+BkCUkbftlnyWGUFhXJ/E8k4bnJWTW5TxIyynh1GDpn/6xu3IkFsN7JD3Wy5B0QaEAKsHk 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)(426003)(336012)(186003)(2616005)(508600001)(36860700001)(26005)(82310400003)(2906002)(70586007)(70206006)(54906003)(8676002)(316002)(6666004)(7696005)(6916009)(8936002)(83380400001)(81166007)(47076005)(4326008)(356005)(86362001)(5660300002)(36756003)(1076003)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2334 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT014.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 99730a53-1350-43e8-e5e9-08d99ee06b4e X-Microsoft-Antispam-Message-Info: MoMLrdDF/z67fxLoNJDyQwLNgB8FBJVDaQj6l7QD8AvRE4Mk5La1tfa2SvBZwJRh+pjCssY3unyZ5BA/+jEOR6pTpaq+U4cYi+aL94ex2yYRk3aUexZEgg8BWEaaitMRz8TbO5x7hlB5O40LUIJb7w5rRZ7aNwS3267FuepaUFO25f6G4ONo/HakzqnnPgUJiPjQWEaUCYjiXFhXigcC7NMEa+dX/0ALW4YRhHuX1iXjciLtRBWfGLKjjSwzsWh53S//sXUkK8oyGnhjgehB2lupjLNJw6NUtkDxuuSErQPsfin03L3ds1qAxJTVy49FPwg4p+kR1+yuvx7JDa0nVffeUQVfPzFamUT+2YbAdQ40iLBJnFuvciJFfNsMXIhcc1B1NE/WkjcVH7nOmxLjQz23f5UEW7oVz6y/PZMra1hH2FBah3XzUDMvrP8VHMCZ9NyUnmFLGekSg+BHeog1+E4gdNQMjyAKpSSrpu/qzzt5g1C2+siHl5TsI8cUXKAwIXcSVVDKXsi9TcoZiwHDqqmkIjtLoFSxPO72iwPNyYdXe9C9vf7G7GxZhjy4WA3AvkLziy0rDwUwIcRI3+q/KKJqf4Fejp0YD7bbzIpAMiBgoezO0dTBMRGuSa0d6lK3ZloO+sGwMh21sC8IG5zyC0baGeNyCwNk417HxlgyGucJ0QgoO7QxPIr8elGagO0VJXt9vbMbCzYYn7D70BCslvVsKwqkOZQCAAVHleAYxxgOcyjCJ7fg5EDBMo1jCa6x4ebreGmVKYmKNwlynqlYYOTJo87QYiNu9ssbA2TIm00= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2021 15:41:46.8752 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d9ed7c20-0ee8-427f-bb79-08d99ee071d7 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: AM5EUR03FT014.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3253 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,christopher.jones@arm.com X-Gm-Message-State: xwGk433qf6NcgIruO0bZp7pGx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635954113; bh=V6I4R20sH5kNYKFRdrNy6corA+DdYzE6UER4GlCYPKk=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=u1KqyNY4Dsrhz8AbRVtTUDFeHlbR2UaKiFDXHqGEWCiIFeiyfChW8tXCBhreS2ngdEi Oukt10rLF9tH1IdPRrrWhRZq/FUy0OTteR6M3qHy9TPh++UQUsWpb2B4JQAQgvvaC2Lwg B6oLZs+L65/e0mkylhT/lfFgsXwH2t8XPCc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635954115729100002 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3697) Update the PPTT generator with the CacheId field as defined in table 5.140 of the ACPI 6.4 specification. Also add validations to ensure that the cache id generated is unique. Signed-off-by: Chris Jones --- Notes: v2: - Make IsCacheIdUnique() return BOOLEAN instead of EFI_STATUS. - Added a missing space to the definition of 'IsCacheIdUnique'. DynamicTablesPkg/Include/ArmNameSpaceObjects.h | 4 +- DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c | 102 +++= +++++++++++++++-- 2 files changed, 96 insertions(+), 10 deletions(-) diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTables= Pkg/Include/ArmNameSpaceObjects.h index 6bc5ab6b2b28424c1afddc26cc89a54b81941aeb..6e27158d720947efb22a350a7e5= ffcfdd3005361 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -740,10 +740,12 @@ typedef struct CmArmCacheInfo { /// PPTT_ARM_CCIDX_CACHE_ASSOCIATIVITY_MAX. Therfore this field /// is 32-bit wide. UINT32 Associativity; - /// Cache attributes (ACPI 6.3 - January 2019, PPTT, Table 5-156) + /// Cache attributes (ACPI 6.4 - January 2021, PPTT, Table 5.140) UINT8 Attributes; /// Line size in bytes UINT16 LineSize; + /// Unique ID for the cache + UINT32 CacheId; } CM_ARM_CACHE_INFO; =20 /** A structure that describes a reference to another Configuration Manager diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator= .c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c index 18f093998db57ea4698953ed06a9826df559c1b7..b74ab0b157b89aed576d6d100fa= dbf28182f80fa 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c @@ -722,6 +722,35 @@ AddProcHierarchyNodes ( return Status; } =20 +/** + Test whether CacheId is unique among the CacheIdList. + + @param [in] CacheId Cache ID to check. + @param [in] CacheIdList List of already existing cache IDs. + @param [in] CacheIdListSize Size of CacheIdList. + + @retval TRUE CacheId does not exist in CacheIdList. + @retval FALSE CacheId already exists in CacheIdList. +**/ +STATIC +BOOLEAN +IsCacheIdUnique ( + IN CONST UINT32 CacheId, + IN CONST UINT32 *CacheIdList, + IN CONST UINT32 CacheIdListSize + ) +{ + UINT32 Index; + + for (Index =3D 0; Index < CacheIdListSize; Index++) { + if (CacheIdList[Index] =3D=3D CacheId) { + return FALSE; + } + } + + return TRUE; +} + /** Update the Cache Type Structure (Type 1) information. =20 @@ -734,10 +763,12 @@ AddProcHierarchyNodes ( @param [in] Pptt Pointer to PPTT table structure. @param [in] NodesStartOffset Offset from the start of PPTT table to= the start of Cache Type Structures. + @param [in] Revision Revision of the PPTT table being reque= sted. =20 @retval EFI_SUCCESS Structures updated successfully. @retval EFI_INVALID_PARAMETER A parameter is invalid. @retval EFI_NOT_FOUND A required object was not found. + @retval EFI_OUT_OF_RESOURCES Out of resources. **/ STATIC EFI_STATUS @@ -745,7 +776,8 @@ AddCacheTypeStructures ( IN CONST ACPI_PPTT_GENERATOR * CONST Generator, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol, IN CONST EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt, - IN CONST UINT32 NodesStartOffset + IN CONST UINT32 NodesStartOffset, + IN CONST UINT32 Revision ) { EFI_STATUS Status; @@ -754,6 +786,9 @@ AddCacheTypeStructures ( CM_ARM_CACHE_INFO * CacheInfoNode; PPTT_NODE_INDEXER * CacheNodeIterator; UINT32 NodeCount; + BOOLEAN CacheIdUnique; + UINT32 TotalNodeCount; + UINT32 * FoundCacheIds; =20 ASSERT ( (Generator !=3D NULL) && @@ -766,6 +801,13 @@ AddCacheTypeStructures ( =20 CacheNodeIterator =3D Generator->CacheStructIndexedList; NodeCount =3D Generator->CacheStructCount; + TotalNodeCount =3D NodeCount; + + FoundCacheIds =3D AllocateZeroPool (TotalNodeCount * sizeof (*FoundCache= Ids)); + if (FoundCacheIds =3D=3D NULL) { + DEBUG ((DEBUG_ERROR, "ERROR: PPTT: Failed to allocate resources.\n")); + return EFI_OUT_OF_RESOURCES; + } =20 while (NodeCount-- !=3D 0) { CacheInfoNode =3D (CM_ARM_CACHE_INFO*)CacheNodeIterator->Object; @@ -785,6 +827,7 @@ AddCacheTypeStructures ( CacheStruct->Flags.CacheTypeValid =3D 1; CacheStruct->Flags.WritePolicyValid =3D 1; CacheStruct->Flags.LineSizeValid =3D 1; + CacheStruct->Flags.CacheIdValid =3D 1; CacheStruct->Flags.Reserved =3D 0; =20 // Populate the reference to the next level of cache @@ -807,7 +850,7 @@ AddCacheTypeStructures ( CacheInfoNode->Token, Status )); - return Status; + goto cleanup; } =20 // Update Cache Structure with the offset for the next level of cache @@ -831,7 +874,7 @@ AddCacheTypeStructures ( CacheInfoNode->NumberOfSets, Status )); - return Status; + goto cleanup; } =20 if (CacheInfoNode->NumberOfSets > PPTT_ARM_CACHE_NUMBER_OF_SETS_MAX) { @@ -858,7 +901,7 @@ AddCacheTypeStructures ( CacheInfoNode->Associativity, Status )); - return Status; + goto cleanup; } =20 // Validate the Associativity field based on the architecture specific= ation @@ -877,7 +920,7 @@ AddCacheTypeStructures ( CacheInfoNode->Associativity, Status )); - return Status; + goto cleanup; } =20 if (CacheInfoNode->Associativity > PPTT_ARM_CACHE_ASSOCIATIVITY_MAX) { @@ -918,7 +961,7 @@ AddCacheTypeStructures ( CacheInfoNode->LineSize, Status )); - return Status; + goto cleanup; } =20 if ((CacheInfoNode->LineSize & (CacheInfoNode->LineSize - 1)) !=3D 0) { @@ -930,18 +973,58 @@ AddCacheTypeStructures ( CacheInfoNode->LineSize, Status )); - return Status; + goto cleanup; } =20 CacheStruct->LineSize =3D CacheInfoNode->LineSize; =20 + if (Revision >=3D 3) { + // Validate and populate cache id + if (CacheInfoNode->CacheId =3D=3D 0) { + Status =3D EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: PPTT: The cache id cannot be zero. Status =3D %r\n", + Status + )); + goto cleanup; + } + + CacheIdUnique =3D IsCacheIdUnique ( + CacheInfoNode->CacheId, + FoundCacheIds, + TotalNodeCount + ); + if (!CacheIdUnique) { + Status =3D EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: PPTT: The cache id is not unique. " \ + "CacheId =3D %d. Status =3D %r\n", + CacheInfoNode->CacheId, + Status + )); + goto cleanup; + } + + // Store the cache id so we can check future cache ids for uniqueness + FoundCacheIds[NodeCount] =3D CacheInfoNode->CacheId; + + CacheStruct->CacheId =3D CacheInfoNode->CacheId; + } + // Next Cache Type Structure CacheStruct =3D (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE*)((UINT8*)CacheStru= ct + CacheStruct->Length); CacheNodeIterator++; } // Cache Type Structure =20 - return EFI_SUCCESS; + Status =3D EFI_SUCCESS; + +cleanup: + FreePool (FoundCacheIds); + + return Status; } =20 /** @@ -1200,7 +1283,8 @@ BuildPpttTable ( Generator, CfgMgrProtocol, Pptt, - CacheStructOffset + CacheStructOffset, + AcpiTableInfo->AcpiTableRevision ); if (EFI_ERROR (Status)) { DEBUG (( --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83276): https://edk2.groups.io/g/devel/message/83276 Mute This Topic: https://groups.io/mt/86794164/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-