From nobody Sun May 5 20:11:25 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+84509+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 1638979610168951.0489926225719; Wed, 8 Dec 2021 08:06:50 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id hrIJYY1788612xjI9srlnrHW; Wed, 08 Dec 2021 08:06:49 -0800 X-Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.79]) by mx.groups.io with SMTP id smtpd.web08.15028.1638979607832785429 for ; Wed, 08 Dec 2021 08:06:49 -0800 X-Received: from AS9PR05CA0046.eurprd05.prod.outlook.com (2603:10a6:20b:489::29) by AM8PR08MB5764.eurprd08.prod.outlook.com (2603:10a6:20b:1d2::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12; Wed, 8 Dec 2021 16:06:45 +0000 X-Received: from AM5EUR03FT026.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:489:cafe::9b) by AS9PR05CA0046.outlook.office365.com (2603:10a6:20b:489::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12 via Frontend Transport; Wed, 8 Dec 2021 16:06: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+84509+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 AM5EUR03FT026.mail.protection.outlook.com (10.152.16.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:44 +0000 X-Received: ("Tessian outbound 1cd1a01725a6:v110"); Wed, 08 Dec 2021 16:06:44 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: e94a71229313ba63 X-CR-MTA-TID: 64aa7808 X-Received: from 30df63c075b6.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 075E00B3-C4DC-4D10-A105-8D8D114105E9.1; Wed, 08 Dec 2021 16:06:37 +0000 X-Received: from EUR01-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 30df63c075b6.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 08 Dec 2021 16:06:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JyHKIm850rfp3KvE0lFj2y5KQczprjpXUniafTcaTKOwd6GXFP/9fnL9wSecuoTTWBmpWRWqP8I9eIlJxWw5yuySsIUEkSNVMpLp/EbKLnbVeNmrJSQiSYSlmtBehgG9OSCdh6t0Vy3aFocUJF7n0eMeaTRkARagoFR/boGaH77y1h4sKU8+C0yfmJlDVwbB1ZoF8kBEL0oriIaHE6LWrnTzURwGNayJJrp89PUrb4lz0yHOlG+SYi/BtMpoa5+wEiZt/DmF+5s6ulznL8wysEhxrk79rPlM1LwwKZrWYbe6p2hr7IOiAxQCWF8WBI3rRY9/P5t7vE8QqxGy6HgrSQ== 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=UL3JijsHtsNz5s47CjB1IjcX6gvC+eAJH6VzutIsqb8=; b=RsGTW0NmwUIx5uhxkxIwOD40+Ws8mlqtL/patyMFlGtZlzj0lCEfqBNrgVlNtexlUKO6v+3Hr7DebT7lu6HU3YMOcjlg0C70krVd2QyHsmD98ZD1UwLs5SHfrjV19+OOpmfdhuxhnpZ1HR7pfbL6pb4Nvo99spIBXfXPei9I1nQecMaQUUySrCpwidqyR6S4dtkj+acMNMl8EtcORZgGc7WBpk+87cMTEcUM82TLsXDHuVNkbx5ocK/YPVpZc/Xh9gJfWO6WiKUnD6vOV4ZGfD7rQryZ14cnQZqwmqmiRhIDLj6Z+15X2RKylrH/yigyzotnfRodzAxzZnBMziTerw== 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 AM7PR02CA0016.eurprd02.prod.outlook.com (2603:10a6:20b:100::26) by DU2PR08MB7270.eurprd08.prod.outlook.com (2603:10a6:10:2d5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.14; Wed, 8 Dec 2021 16:06:36 +0000 X-Received: from AM5EUR03FT003.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:100:cafe::2d) by AM7PR02CA0016.outlook.office365.com (2603:10a6:20b:100::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.17 via Frontend Transport; Wed, 8 Dec 2021 16:06: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 AM5EUR03FT003.mail.protection.outlook.com (10.152.16.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:36 +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.20; Wed, 8 Dec 2021 16:06:33 +0000 X-Received: from e125153.arm.com (10.57.3.247) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 8 Dec 2021 16:06:32 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v3 1/7] MdePkg: Add missing Cache ID (in)valid define Date: Wed, 8 Dec 2021 16:06:24 +0000 Message-ID: <20211208160630.10923-2-christopher.jones@arm.com> In-Reply-To: <20211208160630.10923-1-christopher.jones@arm.com> References: <20211208160630.10923-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: b3444807-f6d5-4dd7-03ef-08d9ba64bb30 X-MS-TrafficTypeDiagnostic: DU2PR08MB7270:EE_|AM5EUR03FT026:EE_|AM8PR08MB5764:EE_ 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: vUZNGAOJkaUX7uRzkDDwyZBdXdaws01ViS20XlKze1ZW9Bv9ZJtFwO1JjUjnh2qVm5FyCEpm6qrtjrgcJjIJ6POhwBIeib6zFG6YufUIhEi5N4mzKr3N/kRnMK6cySVDNRITJjLkiHNFSvYgLt2YR+5hdUZH4D40SAKWVqKcS9cMJbowKUTcDehw/pFSJD6pebzDX6a9i0KCux4O24msjm+jWDJhStXqUOriTgCLs3Lvqu4FPNkqYvzXYdJt37THoQJOeaEAJtom4JFLI90tLB4W8Zy8roh2DJUlYEBkfRIX/apC68ilhcaWrTNEeJhGiHVu3ueNTh6dKvWATSjVqt5s0mrWG0G521uKzE3cgLbI0h69+yHPIIa6PBsXAlsLPgSSWu38GZZZYFw8TofVfqnUp4SmS72+YrmRdKCa3ARz72vyzsiPPJPdn9ZCfKd5NtKJs0Qz8oGoa57/Lvw3aALHgFzZL5itq49CXIoqcbli97RuuPJ6Ksm08Q/jByYYX4ufN8pofujDI5R/xS/BQdKzqtiys+WM4famkie5/p0DGMS2ru3oTwl2mJHC9b8cvuXFucBnH+hgsZacaeILuwsej1pq0FggDihTHfrt570NzHfeNNJf2GwInClITOm3XEs03z1/8qExhC/H42+aSxMR7UEXkphe8JNT1DFu1nYi4DQFboasYPLn5T4THD1viaV/+WziqrkplwnvW4c7mf3lwe97T8sXeQ0+UyC8zKUrrNJpuRDN/zdy6hRiElN167yV+N01zOsuqGIW6PNagTlYktWoFsHt5u4yJFk874tmWTD91tmQ2wrEsMcQb1VJieZYSVEQFH1UvSL/BXTy4hHa2iWI0N6BYnRYx2UXc1FCBTCob7KMLO9oubOmwCAY X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700001)(508600001)(186003)(336012)(426003)(70586007)(47076005)(6666004)(70206006)(2616005)(19627235002)(1076003)(6916009)(86362001)(26005)(5660300002)(36756003)(2906002)(8936002)(40460700001)(8676002)(316002)(54906003)(7696005)(356005)(81166007)(82310400004)(36860700001)(4326008)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR08MB7270 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT026.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 4d80c941-b5c6-4125-fa41-08d9ba64b615 X-Microsoft-Antispam-Message-Info: JlA69c1Gs1ZYSDXoSsL6Zrre2DWdUTjQAmjyv395pxROLnVkK1dX2HcbCxEdMc7hTnkH59Qh56v0ZXOQxiOtjv9NHAzonXp666LeG243jy30UdhmMOWaxhXl4Xxp83QtMgdaPjT6lwJILxqVrbD8fgSDSYmEYBtpS3uz2oGrcZFmEtrEK7itqpgZJuNTcigTUGgeqp33sUztqmGEcRTiI4bj/BGU0jqDTZW0EK60ldbhDe7w7AHZjlHOaqR0aO1WpZUUDg3mYqZ5ROX1HVJPbXOIQblFu6njQ4SZaiLkiUby71cULCewvDQpil/f1x8m+gr5bRiAWjfeEde8tWKtl9qGsKQnc+aPBzpxzM5U0JNiWOKGtxllmeSgHFHPyXiZEVCdgDABaG8aKx4XVRT32DIB6DzLzAk67o4QtkO30FtaUQltpzcIDafGmMLc1KnUqon0OTD323Bp50aA4jrMHHStMsRgPFH6q1BjX+NVRugee5520XCYF51KVkehCHZQWsXKvT/U6IeL3Gbauww9lLCZ40kopqSjctassFgqGBh6Oy6nq2CK+7UbkG8QKQzXQ+g2oMhZSOEI92/PVDRW2Z/qJ5+nxOtL+QgHG/I3kI5sJZ5HjZByLvQPuz4h1tRUX3NxWinp48kSx2IIhRE60aFXDmLh86ivtECIWkzuj2OpSVbeAaHP3+J4OJ0nXWZg4NLOM6wgf27D5jVblChnM0eS6khFjwIJimnILeXiuMGaMMN3ASx9IbWTxEcI3Jb6QRu0PYgSk3ETzIRDcxLWv35oBNbisthg0cGM3ewXnaE= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 16:06:44.8992 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b3444807-f6d5-4dd7-03ef-08d9ba64bb30 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: AM5EUR03FT026.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR08MB5764 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: 4ImurSVRlq9Ft5hta1jhe5Ccx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1638979609; bh=H6bGZ8RHD7NMwjNXaxpPFGyJUbwdZijYKOq/nSbl0Q4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=YcjDecj+EbopwkKYRkeV7cXRyoFVWH/SrtcJqgKYq7IlIsa7NTJCOJYmqqs6VkudQMr 9oyjClvaiKKPuzsviD+lYw4NlId3a+DAqFCh7p9yPPzYnsJv3p/tGuJP+x9W8NrFAyRBt mEbD8wlLYDm1NzQc3sziZHzQrlmEqYT2kTE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1638979611102100001 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: Liming Gao Reviewed-by: Zhichao Gao Reviewed-by: Sami Mujawar --- 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 9cdd35b563fa8a181084f4f1b243793ae467ad6a..ff3cb441c215550f7cc635ced0f= 58e00d6510163 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 (#84509): https://edk2.groups.io/g/devel/message/84509 Mute This Topic: https://groups.io/mt/87591326/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 Sun May 5 20:11:25 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+84516+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 1638979626300605.015490772496; Wed, 8 Dec 2021 08:07:06 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id uSJOYY1788612xdqvEbKdawk; Wed, 08 Dec 2021 08:07:06 -0800 X-Received: from EUR02-VE1-obe.outbound.protection.outlook.com (EUR02-VE1-obe.outbound.protection.outlook.com [40.107.2.55]) by mx.groups.io with SMTP id smtpd.web11.15201.1638979624613046649 for ; Wed, 08 Dec 2021 08:07:05 -0800 X-Received: from AM5PR0601CA0030.eurprd06.prod.outlook.com (2603:10a6:203:68::16) by HE1PR0802MB2281.eurprd08.prod.outlook.com (2603:10a6:3:c0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 16:06:51 +0000 X-Received: from AM5EUR03FT047.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:68:cafe::ac) by AM5PR0601CA0030.outlook.office365.com (2603:10a6:203:68::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.19 via Frontend Transport; Wed, 8 Dec 2021 16:06:51 +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+84516+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 AM5EUR03FT047.mail.protection.outlook.com (10.152.16.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:51 +0000 X-Received: ("Tessian outbound c61f076cbd30:v110"); Wed, 08 Dec 2021 16:06:51 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 5261edbed3cb1262 X-CR-MTA-TID: 64aa7808 X-Received: from 24526b56bb93.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id BC78DBF0-A6F7-4F7A-AD12-C6F35262D863.1; Wed, 08 Dec 2021 16:06:37 +0000 X-Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 24526b56bb93.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 08 Dec 2021 16:06:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L+2UdxATuV+Y6biDS+AETkpNpy/OZLyfsnR0dJA4lV13245uwRlfoSXhL9CYedN2WOq4AqfqmwdyaBrvI2ayXnhyw1WDZxr5iIepVBiz8egguNXbd1XdZuBU8yr2wjjCTgAciJmiG8fx4Z8j63JnORiLehWxKIUfe1PK5773wSW1p7mr7uFC9ImzIDpHkFp6gWzFl3Il9p0th99VMTvBx9uREsL13tFtSyVOMdxjHv676yonKF7BtvWn+ZXyjZEY33ducyFwhO/bgjUvXOnCPvbai1xnEuut1h3oR01nrJKBnTodnfu3MPOn3iYCjt2aILTzbbbHU4vj5NMMH9cZGA== 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=hEQqF+Z5nkFvR5+VdxKw/RRmmInLJjr8vPbE/T80LjY=; b=n0nUa/29BnvaTe0MxMRHbR3ywBAhfiiQ+XuIR5QryiuILYaFx2dtMPRahPcVLo9kVh/c4NRncKOc9YZpcX38GrBPJ31IhDhY1W5P+t1Xv3clIimdg4UsliWn+oqRPTpn0vsgJA0XbL2XI0iC6a/kWZuXIl4Y2QWNjm5bE/5KRGFrgeKWi8cDJponN6oJDhgQvh455KgPRarGQKVpGX6cSNA8d5x9NbJ0FzczEANdHJhTAuqIn3ywVAvu7tmxe4Ph3llabxGR+6tcY6Vm4h9g60o2HjqVUHakX9SdZxiyf+G6jlvgMcsFtzpAzoYR9wfh6/zBzBCq8mimo6h0tbQHNA== 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 DB6PR0601CA0045.eurprd06.prod.outlook.com (2603:10a6:4:17::31) by AM0PR08MB3011.eurprd08.prod.outlook.com (2603:10a6:208:64::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Wed, 8 Dec 2021 16:06:35 +0000 X-Received: from DB5EUR03FT010.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:17:cafe::13) by DB6PR0601CA0045.outlook.office365.com (2603:10a6:4:17::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20 via Frontend Transport; Wed, 8 Dec 2021 16:06:35 +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 DB5EUR03FT010.mail.protection.outlook.com (10.152.20.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:35 +0000 X-Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.20; Wed, 8 Dec 2021 16:06:34 +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.20; Wed, 8 Dec 2021 16:06:34 +0000 X-Received: from e125153.arm.com (10.57.3.247) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 8 Dec 2021 16:06:33 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v3 2/7] MdePkg: Remove PPTT ID type structure Date: Wed, 8 Dec 2021 16:06:25 +0000 Message-ID: <20211208160630.10923-3-christopher.jones@arm.com> In-Reply-To: <20211208160630.10923-1-christopher.jones@arm.com> References: <20211208160630.10923-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 2dbf03c2-ced9-4618-afb8-08d9ba64bf1c X-MS-TrafficTypeDiagnostic: AM0PR08MB3011:EE_|AM5EUR03FT047:EE_|HE1PR0802MB2281:EE_ 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: oGul3521IL7vCeo+ocz3W9w+NhiGAxLeNBvTlFtj2Cf7Jn3UGC3EI5bjXvREP/y+qymREMPwUQaEIIobkyiCPMB24sku4NsqLsMpRTNuGcsBoFHVtYjv26yllS5uyLocVsWHDqqUyoA5geJ0qgUD83ghFMQqXbD9EGOYUdF6NHv/GpnT75XniUFk1gkcWcQAVk+gK+F5V3Ihg9aCSlJPX9xt0qGo8bFFeYZz3VUw2RaAwYx1B9SkiOCOb3+E6N6ohQTI7fkGF07TcIlM4/gHIeTk0BOOEWOJKNRYFUz5Qh81xkBDW9t/8SRWfebf4NTQbixrg5R/qISepytn8PeBAgmQgahiVI6wOhAhEvc2Q5ZM9WXKsE6f5TgudpkV7j2jJoGEsC9vT7ACXz3x0jK8e1DLxwGbYYBPSY2MzABwQmm6o/c64Vk1CIS9lIQ70YoAqXlzabzirg/dyK8J1GqIqWzhcXbQGvl7VN55pejv+e4dGEVbCxx9Q7ENZKm5lLiSST9baeJJgETFewzDGG4bkF39e5cxNhubU42pEN4K0h8VSa8Rr6YnBOh3gYcB1vTIfFFEsczTjjSUfL2sFu/JSdSzWj6epAbPt/aKGTyY5oAUTt/Bv/ZsjUjVvBQnKHf7L0uiPLEd+oq4Pk6WpNdd6ry63kmS1dubcyvLNnE6hbl5eA6tYJv6ulZSv9rnT4dPQqFd1H3FkU6AbUOiwfwgmZdAhqJuBbCOpUAlAUfiAEwugFPI2F6V8RHwUjO/wE32PpP5AK7QBQBJEm+rL6wHMIYJdJ8f+NCoO5QASumQNYNnFUA3NLeBOwlwPdJbViEHzoj8Bpwk2EP7FJ8MoSZou8cqyLeFiwEG263I4F8wZs7mGAECN1Po1uR6g0mHzSs/ 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)(40470700001)(8936002)(2906002)(81166007)(5660300002)(356005)(6916009)(316002)(186003)(83380400001)(70586007)(70206006)(16799955002)(19627235002)(2616005)(47076005)(40460700001)(508600001)(26005)(82310400004)(8676002)(426003)(7696005)(54906003)(36860700001)(336012)(4326008)(86362001)(36756003)(1076003)(6666004)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3011 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT047.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 45147687-a09c-4885-1e67-08d9ba64b561 X-Microsoft-Antispam-Message-Info: phZqX6pHrwfG6kWGA1+NHgBUpNOK3QSUGmPWxwzIYrd567wmiBY8Dz/he/lLXsD0pyx7jn6oSqWY/BUNaio0XnQaJWFh4yd9Jl+Gd7E6ZmRGCXyiHWi2RXy2n91giRC5cX7FKEQdPkNLyNegOn6855rdReC34Ia/2KjcjW1AfIEi+a/Uxh0nuQHBAZGmeZc0QUpsyC8JdUhCfbC9g69uv6o0djcvS50PLDNWNtOhEeiRJGPNcgJ6a1BaTmfrg3FfwRB6wxKns9z9TDaCu6bccrmwMgUU4rNtgGhOtutrAvaSa6KxxMR9KK13OcxwMGRueMnJYCEtWb1kJ27gyYBcVKNzybqsNXBt+ELfJd4NVGRojRmOxZIfjquQMThODdQaOCaEgsGmOdmeQWOuRdaKkQxNrCIjFCdXVjxBNqtCLjEUvbO9fwMizEI/+yWiWlEnCLDFrrmj5Bghd47kKcrzwxGbfAj9RTJa037Ivxgi09OO9UhXAHfdTh7Ry29EUasfbyxOpHWron1H5frNJOw9lQsUZdrbOmCy3eWUR/WaZE25gI2+hebjsy+8Y7FsAoRW7SpWeau9MsHpaPxRImh5hflGmgVAb/QnLqz5RANPILYxogBCKQyriZbERP22yvtdryt9rHsK5859GU4ENBhqi8oWMHNjXBCNWqjnseEXG3YF357VlibnK0CkYRmA1ZhFJCP8mLfS2Wkwn9Ezu6QpbLd886xB63huZDsElQVbB7QXrsvslIWk0OelLybAnV+Q8EPXYIb8XO/NuCGNU60AZgetcEodvIMqwUzvvV4zS6Y= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 16:06:51.4835 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2dbf03c2-ced9-4618-afb8-08d9ba64bf1c 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: AM5EUR03FT047.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2281 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: hwiSSzRmiaBx0jlLAlk8a16lx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1638979626; bh=LgopTYAS/OKhrtlcAPCuBH/5lp4WbHeXOqidIXH6shY=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=GaM+LNBIdrkCsQKrWHU1L0oqpyoDzBEVA7CnkzR3tbakn4W26IcA9CNhjE27BvztuT0 TG+IbpHEW11Bc0zZXyU1J4PMu6rnT/2dFov4mBI5sCONDaWZxLxitM4CQBmXZyPbwLsEN X0BFwH+ANmGvZOTZfzf/C94cRSil/oqgui4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1638979627674100001 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 Reviewed-by: Liming Gao Reviewed-by: Sami Mujawar --- 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 ff3cb441c215550f7cc635ced0f58e00d6510163..a79b7f2eaae16b47c17a89a16c6= d67fcaaad4cbf 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 (#84516): https://edk2.groups.io/g/devel/message/84516 Mute This Topic: https://groups.io/mt/87591338/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 Sun May 5 20:11:25 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+84515+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 16389796223961010.6071166244742; Wed, 8 Dec 2021 08:07:02 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id EDjJYY1788612xf9EsDXqPbN; Wed, 08 Dec 2021 08:07:02 -0800 X-Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.52]) by mx.groups.io with SMTP id smtpd.web12.15004.1638979620856925664 for ; Wed, 08 Dec 2021 08:07:01 -0800 X-Received: from AM7PR02CA0001.eurprd02.prod.outlook.com (2603:10a6:20b:100::11) by AM8PR08MB6563.eurprd08.prod.outlook.com (2603:10a6:20b:315::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Wed, 8 Dec 2021 16:06:48 +0000 X-Received: from AM5EUR03FT008.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:100:cafe::af) by AM7PR02CA0001.outlook.office365.com (2603:10a6:20b:100::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12 via Frontend Transport; Wed, 8 Dec 2021 16:06:48 +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+84515+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 AM5EUR03FT008.mail.protection.outlook.com (10.152.16.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:48 +0000 X-Received: ("Tessian outbound 1cd1a01725a6:v110"); Wed, 08 Dec 2021 16:06:48 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: da6a126c009c0338 X-CR-MTA-TID: 64aa7808 X-Received: from 93344bb47ac0.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id B03245CF-0F58-4022-89FE-671737014C5D.1; Wed, 08 Dec 2021 16:06:38 +0000 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 93344bb47ac0.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 08 Dec 2021 16:06:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UN8Z82faCZMgFISMSOyj0yVxQGtaItXg/1eWZyA0ULQFQFnQx/NjXvzIQ3dKOGTMbWwS97yV/HdsqXd92lHsjV5PnB+wYeVDnK6IRDTBFyN/dn7Ehp3czJaVGz+HaIpMauiRoUMEtCU9uhqTIRciPCSvCDjx5XoLWRZYtPZSRYRJUmHk5vnDKSjp6Zkkfx1ZqhFNEPws9mjIKw9rn14PHfmka1YOLvyxmKG/hBRJOGngd7T83nUMG3JoUCK1n7URmdOTm8xsdXbLSvJ9HKtKeK4eVl8lZN5F6U9WvcZe+VHNp1XB/Jmydve0tW8eh2jNYeE8Aa3/QKsrWUUg9RhmNA== 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=PquZSi3nBij8ji55s6ttb6dXZxoLODM29PcYrtsVU04=; b=csEwTkCVPY0xLEYr8YV+ych9NJ23fmn9MzVZwBWiODPxOqXeVhpn0p02eomX0dbUGhM2YapXLwutPGTB99ykRA5QTVis2MUZiXu9E3xHcqFFPVC8Ogqr5jjRfc0p0/E5Oor2ZgS1xLG9T+5L1kVARUt5YOcwIdbXiDFdz7mZj73VRLmRaRibIHP3+8x3cxKL7/KyBwUnHSSao+qfgdFBiqRhyxBtYXS/6T8r/fGYzsAi0CgopLstVD/AoMD4X8gKmifPiCPlHHPT2kdTMjqiEoG3OYP3VoMUsuVpeBsqgmaMLn0ad/0SfGWnfXdaHPdWVPMYjOvbfwUbb2zr7NTl+Q== 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 AM7PR02CA0015.eurprd02.prod.outlook.com (2603:10a6:20b:100::25) by AM8PR08MB5553.eurprd08.prod.outlook.com (2603:10a6:20b:1da::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.11; Wed, 8 Dec 2021 16:06:37 +0000 X-Received: from AM5EUR03FT003.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:100:cafe::88) by AM7PR02CA0015.outlook.office365.com (2603:10a6:20b:100::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.17 via Frontend Transport; Wed, 8 Dec 2021 16:06:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT003.mail.protection.outlook.com (10.152.16.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:37 +0000 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.20; Wed, 8 Dec 2021 16:06:34 +0000 X-Received: from e125153.arm.com (10.57.3.247) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 8 Dec 2021 16:06:34 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v3 3/7] ShellPkg: Update Acpiview PPTT parser to ACPI 6.4 Date: Wed, 8 Dec 2021 16:06:26 +0000 Message-ID: <20211208160630.10923-4-christopher.jones@arm.com> In-Reply-To: <20211208160630.10923-1-christopher.jones@arm.com> References: <20211208160630.10923-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 1e2b78eb-4f00-47d6-98a4-08d9ba64bd86 X-MS-TrafficTypeDiagnostic: AM8PR08MB5553:EE_|AM5EUR03FT008:EE_|AM8PR08MB6563:EE_ 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: zHVWekMtLJAxgh2PzqdrHeoi+4Pmri1XbFxuRLlA3cQOTcRBPW6lsvyPBahEs+FRB3pb5e6AL/X74JslbkdESwzM8keXnYc0Md1JMUIihvlPjf3lcvrkhFyHgXMs6VaX9bsootppzuhhfC3iQTNezsY9HsjUqqSftqey6q4IxLnfASe0uLFO6/2Bc6F/jvvZBwQlT45JwXQdb595KrZ97qKOmrv2TfWSZ8PIVQdkmJS4qs3TpWTbooTdgv8du4L0LToDM+0Hjf+qts4k/u7pdLp06pIQu1Dd5izJ7Fv4JChVHAX09TDw+mzsl1xBJbci/42AdfR9YGDx9Ct41I7r4TQ1cZ7+1GMHUeGM3gtP00ZKezsfv0uE2wNaRSKzABE358zVop8FPVup7QVE71lRvSYwfJi+mm4dS4hrbg+yjnwBJW1AtxOq3GgaIDpIHbPI73UhD3IzvdHibpBZAW11CIdsN304vd44tqz+5q4N8Rag+npjEYdebwSdik2LjH20yx9tEGqGy2yolJju4dDGrSvkiCMIu7VQ+EsYkRC64U1nqsSWc6F6clSOgWfKm2/YsLmpms8TOQSKiCWumxqtaKnzVsf3tAo/uC+FkyeZWs4cnRoNolXXcTtCJsPHa4/x6lXLyOSfX9mPIPcuirrJYqGut3ugZhNa6lBiaoDNfVvy3EqupmNOX6WRbgrM7pxV47T4Bx5SzO8dQQQ0EVNlOtX3MnZwq3Trkci4hopxzPwueVs2mnkZeSLhHl0omg3KhtaHoKgkcoMl1syXnYX2JQbUjJCnRqcNkY5Xxt7t5mabp6f4wm3DfmKy7LfPVxZWGmqIVZToYcj12Gjkz+QK/ugKElftoxJt+VYSSTdJWIuQhtjL76m7sAfZ7ZInVvma X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700001)(508600001)(36756003)(16799955002)(8936002)(6666004)(4326008)(36860700001)(5660300002)(336012)(356005)(83380400001)(82310400004)(6916009)(186003)(7696005)(8676002)(40460700001)(47076005)(426003)(1076003)(70206006)(54906003)(2906002)(81166007)(26005)(70586007)(2616005)(316002)(86362001)(15650500001)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR08MB5553 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT008.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 339549a4-53a4-449e-51d2-08d9ba64b6b3 X-Microsoft-Antispam-Message-Info: kReMpuebpToqCGamHp+0GtGTh7qkDE413kVaDJAl/Fnp2qZtrRCxnNKeQ+/AYfN3/32RqhORxBJZx8hXPN4a679rZOnHLCAPJZcqgLRhIU0TwfDCFsPUDOnC1Dh3WZYbCcslKOHQfxactuOxKmoiJxB/DNdgOUe4+bWdn9f2XJM/V+kLaIy4KTOB1mOy+PTiKpwx8Ccz+qyokdfPJ8Dz/E8SHkFZyLRaTiq9wvnSb8mSXY2D1MGJNRDtTfbAqFHN4I3LHozY+jiPFHrR4sIGagiMtKuejWz+PNYoyeZ0bSCFgTXGLyLUX2nTQhVOL2RA/K4AomqJe86U1brM5LRsfDPOmTSqnxff0hedVC61pe8HsPAyw3sLaPYaWiqg0sTZfc7DYK9Za1LPNBPvo7so8qy9X582cRPwIIRdvtejeWrCA7/bUco3kFjqJeNontCmuYlc+ryW9DcYkAvb3XoVjxmhaMsSCcg8qyrG8c/j2lthUIPlAyGBqzgAM2JRvpobtSyaMtzjgOxn9gnh5SLSMnenFeUQPJSvdS/CQI6gju1s3VZQdf/gQkVyfvafsOe2Dqtn8xsTdE5/zT5ClUPo2ilDzAcqP683EielAAxvUZ9EljMuqIoyNN8sZR3n9DJZiy3jMGq8l6zjfps87iteQcz1j63xF6THLGHfxjn1eOY8/Kzrwos2c7nxPYkJyBk6iWMpVM01b0EQoeGT0+bRrcXrKUP4kfWxTl79oFZFeurEF5T583vNtnifcEYB871pdeUR5ERRrbcMGDPBWdRAUA== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 16:06:48.8221 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1e2b78eb-4f00-47d6-98a4-08d9ba64bd86 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: AM5EUR03FT008.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR08MB6563 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: MeBos2Z1mawSFBi8GvBZvYqox1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1638979622; bh=Rn8AhnAc5l+SncsXN6QvWujz+dT2iQyfHIIfrbpFEIQ=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=mLymuDWxYxu0shaavEb1MSCTgFnGyxCsHgTN38jMoajmql0TyhA3sVvMyAgJSUm8oNn tcBmnrbBuGGnAOmdTcfVXchguKo4cz9bhQ9Y9pT9U3w01jRuyvGK4WtOdGz1RoYMn0lIa WHOLM+qoAr8FDlY9JCi7046bPhwmKEPRu6o= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1638979624259100001 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. Mantis ID for removing PPTT type 2 structure: 2072 (https://mantis.uefi.org/mantis/view.php?id=3D2072) Signed-off-by: Chris Jones Reviewed-by: Zhichao Gao Reviewed-by: Sami Mujawar --- 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 f47b92f8c55ba5a479571a0bea378c75dfde13ed..7be249819e70dee9547c3fecc07= 63f473aa9ce92 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 @@ -161,8 +161,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; =20 Attributes =3D *(UINT8 *)Ptr; @@ -227,22 +227,6 @@ STATIC CONST ACPI_PARSER CacheTypeStructureParser[] = =3D { { L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineS= ize, 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 @@ -340,29 +324,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 @@ -371,7 +332,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 @@ -451,22 +411,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 0ad7bf4c845f3c065764680c01eaa27796b09226..09bdddb56e5bd70dec44bdbdcba= 88373f93daa66 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 (#84515): https://edk2.groups.io/g/devel/message/84515 Mute This Topic: https://groups.io/mt/87591336/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 Sun May 5 20:11:25 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+84510+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 1638979612300419.18861286707306; Wed, 8 Dec 2021 08:06:52 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id uolCYY1788612xEFhzEygQEF; Wed, 08 Dec 2021 08:06:51 -0800 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.75]) by mx.groups.io with SMTP id smtpd.web10.15191.1638979610073084453 for ; Wed, 08 Dec 2021 08:06:51 -0800 X-Received: from AM6P192CA0051.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:82::28) by DB9PR08MB6427.eurprd08.prod.outlook.com (2603:10a6:10:25a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.19; Wed, 8 Dec 2021 16:06:47 +0000 X-Received: from AM5EUR03FT019.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:82:cafe::ec) by AM6P192CA0051.outlook.office365.com (2603:10a6:209:82::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.17 via Frontend Transport; Wed, 8 Dec 2021 16:06: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+84510+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 AM5EUR03FT019.mail.protection.outlook.com (10.152.16.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:47 +0000 X-Received: ("Tessian outbound c61f076cbd30:v110"); Wed, 08 Dec 2021 16:06:47 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: a68815b48a507215 X-CR-MTA-TID: 64aa7808 X-Received: from f524d828564f.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id F13A6DD5-15DD-45EC-AE82-079D58F6E3B5.1; Wed, 08 Dec 2021 16:06:40 +0000 X-Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id f524d828564f.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 08 Dec 2021 16:06:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=boCUR3erojB4SbuduWpTUD0lVCIP1AS1L6tMF1XHtKR8xR+CBlPv7S6VJVeDUpYEhqZOffukBRDDUBiDT49DURpRfQ/szxjsqvyymugOrGLS2dg2mpa5Krqrmc36KYfCVHh8AWeW0Hj58M/XbH3mTTscf2RxOH0TlOwl2ECNrUea9pMRi5KVXcpxK2rAh7tXmLqs/exPjxhpBdIh35kl1HfzCDSaNCb3SsYF1s6oJ8tp2wK/EvPGKRdHBjfbzR/QRW/O9qt0Cb3+dzvjv8eha7e5YIB1dNcuElDmArkM7bUlbeBhZLFQ8VdbGmuq4TcKHnmL0+lUPX8iAU8HqIwX3Q== 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=jvd1WEP3K4G9ttsjDt2bJLCc0S1VbUOT8+oftiWFAz8=; b=XmCHCP3OHa2X9GiOcbn9tdtCzyJFJPjaPVBU57alAyKb4CTIBy998yxsC2jb4tU8Xb75KZLWxwrVHkzeAE16Y1Hw7+nfIlJwkOSDQPNqp4fU+NJw2EVSok+1EA+z/N+YbS1l9vC7qIIqeZvS3qiJk8HBUxJdwXnB3MDnEJ6wBxeI0Xp1cX7htzrddWOYnZhgHXkNtLW4cWq5kOEWXyq1bmhEnr1oLaeW18FKcyl1eXxgkvSW+Tt3XwBjWDFv+zLMZ3hwpQ0f+fGuRsOSDUvJMhmUic/ShTqQpY5+whKUXlhk899pROl7SuWxzx8Gt3nTogmJsrNF5XJ+y+cixVfk+g== 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 AM7PR02CA0004.eurprd02.prod.outlook.com (2603:10a6:20b:100::14) by DBBPR08MB4282.eurprd08.prod.outlook.com (2603:10a6:10:ce::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Wed, 8 Dec 2021 16:06:38 +0000 X-Received: from AM5EUR03FT003.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:100:cafe::84) by AM7PR02CA0004.outlook.office365.com (2603:10a6:20b:100::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.19 via Frontend Transport; Wed, 8 Dec 2021 16:06:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT003.mail.protection.outlook.com (10.152.16.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:37 +0000 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.20; Wed, 8 Dec 2021 16:06:36 +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.20; Wed, 8 Dec 2021 16:06:35 +0000 X-Received: from e125153.arm.com (10.57.3.247) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 8 Dec 2021 16:06:35 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v3 4/7] ShellPkg: Add Cache ID to PPTT parser Date: Wed, 8 Dec 2021 16:06:27 +0000 Message-ID: <20211208160630.10923-5-christopher.jones@arm.com> In-Reply-To: <20211208160630.10923-1-christopher.jones@arm.com> References: <20211208160630.10923-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 5c942629-d368-48ef-e384-08d9ba64bca3 X-MS-TrafficTypeDiagnostic: DBBPR08MB4282:EE_|AM5EUR03FT019:EE_|DB9PR08MB6427:EE_ 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: gRXzHBCRrt0yq73qpqbTw8EYa9hRBNR4RgQWG5IA4uigHYeUzAxR2YhvazlA79P10PSk+Yrof5upxCmbKdqXDPmoLnFPYNDyOzXWYICREc6SI06dZF64ATYVWZ4CDIU49LyvU4/GQCWwWKIxdzW1Ty/KyboQfIdcGfzFd1c9OitSFfNPmBuE2ii2uAQDDB0DkMphT1YzrFOBAYlAQCTI7tV5Rc63M3tivRqTFCv92AkW9P2tpNv0xEJ5gep8aGE820G0I1550kJnJUllH4vWCYGRuh6YLu4rMRDdC08iTTcglxs6MstqhDt/NDdyrBLMW6ZHHbqaaMwWIlYKaQBcpUpQL7XmoL6JOKt5pCSc5C4RWxt4nSj3NT1PnLFBQOtUNlJVNI72Hy/7pW5Az2h05YGrRXw8L3ZPjevTrL4YsF2QqMRuZ607eJnpQmqntUhDkfUoDAcnqjCB1iWl3FA/jjve1+0+gmsy0+AbQz95Jp+1cqJamLBtfnRggFLEhuC/1D7YRrBn2G3SztfKJEIrww35PdGTpY9cKMPz8PFqaV3DihxkPEb5CLIxm40qvyfY0cIgH9J1RedtXzXh1U7+J/nkMqSGCufE71fUxPE3Fw6mTrO+kiWhpB9Vc4pF/1carQBSoSu2WDXnmdPFebus8SEF+CRQFMsXJHXVQsqktfe3bhSUlZoVHWPmlpgrh75jxEB7n7Lsqg+YY70Rlic/zc1MPdmaTHTd98x4GmLURTVYaMFkR3ytAAlHmByccIcQmA9gmnaJpU2VzkmsoRWaGDHuFHyS1g7jgf+rNCsjypb3gmt5rGKg072BZc99Ijz5t4WoUAwKmhrKIWoAFaAA/a00jBMFZ4vzcqkREQlveg7hW27H21VHO1cxUc5vmw2Y 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)(40470700001)(83380400001)(40460700001)(6666004)(54906003)(82310400004)(2616005)(7696005)(2906002)(426003)(1076003)(4326008)(70206006)(356005)(36756003)(47076005)(336012)(8676002)(6916009)(81166007)(5660300002)(508600001)(316002)(26005)(186003)(70586007)(86362001)(36860700001)(8936002)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4282 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT019.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 4c06f705-258c-4f37-fd9d-08d9ba64b701 X-Microsoft-Antispam-Message-Info: hsMdTN8TvI+2/hZCYB9xC/MFw4og9V23iAwuxzzQJKq3E/SIK+6ZVINsKnyP6G7J3IH8blilWNQteKi/XiVe2gkp6KizcUuXBoD1IIz32ShrtHYfTHdgwM5TpZzlpl7bcHVUW8AaQZFKFNa9kUtamJfFDr8Ca6MM+Uy4A3sRMLojFQgLd5AP10LSKQyI8kpGhbnLp+op0UuvJOKp3/nGRPIAoKPPiHFyb5FoRiTMstZRmNu8GeHgENAQ12IUNvNG7gOUhWY173XnVlM5RyPZTRowDNvuf1vlhCBfO6RZ0bTHBnXq0pY+C+K0qSlCuuvzHYNPvzTUaw02lxfDlz1gGGL56jMZKtbHOMNC9PyjLX5SUZOUIrcOZkgT92VXsrPOkxHnJDJPcdy5fGCnhfopx6Uz5hhMd9csueTkwrSMgwOq7wo/1xNGGs2FeDqAf4wO0kiLr1ynL1T8MAw7ZS3ObKJjdAeA7/GcjvuxSgBRlvzXs65VxfhhA/twCnvc8bEfj6rqYbDy+lliSFaOdeFUnpA2MoH9sK7JickADCjfpLLWNUVzhVHKwtBfrK5JgC9gauQS0DjC0drhSFkzc8RTdV4xTQX3WbtZXTwyHvoJ6NVgTYaWcFCA8gfvnpk4TDBsbUbHbfqmagoDHF6k3Q5g4DuwsdmsPm7SdfeMOMEOUBkDyLZkedH8QitQlt8Ai3HG8oeCirgHfqjoWpdIq/Dk3tX7udHwfpbB3tCpAqWudwQlgBSHG7o3/eGpAW9MPGAOU72k0vSIJ50j9gIZ/z6RfvmTqRDnyyCH+8UcWH+K5T9u6lm2ogm/xLQCa/m7xLFnIr029Egfb608wGa6KUpAxTL4T4mgdjPvIXaLlazuyGc= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 16:06:47.3207 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5c942629-d368-48ef-e384-08d9ba64bca3 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: AM5EUR03FT019.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6427 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: vNUMMubvBM3xHnhtm6lsbP7tx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1638979611; bh=T+g7tIl286l21RqJNYPEzExTzlfMqk0YeHTe1zp9vAQ=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=sCuUC2aAoybIvaVa5AQCa5ZepzHVVQDHlzJgVsO5q5wnPWQ+Pnsa2N1Z8WW50jPCqkX 2NrMxLKWxmMqdJz68VfYijSASu7hW5UKOc3Ds98oDapTUUNBknmdm1jez+RiM1NA9xdua VIVTodb/xf0E/qHVc2dACxspiTfij5avfMs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1638979613740100006 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 Reviewed-by: Sami Mujawar --- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c | 1= 53 ++++++++++++++++++-- 1 file changed, 139 insertions(+), 14 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/Pptt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttPa= rser.c index 7be249819e70dee9547c3fecc0763f473aa9ce92..8b12809f8a155b0ee0a4ad5c63d= 620b48d97f4b0 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c @@ -17,10 +17,94 @@ #include "PpttParser.h" =20 // Local variables -STATIC CONST UINT8 *ProcessorTopologyStructureType; -STATIC CONST UINT8 *ProcessorTopologyStructureLength; -STATIC CONST UINT32 *NumberOfPrivateResources; -STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo; +STATIC CONST UINT8 *ProcessorTopologySt= ructureType; +STATIC CONST UINT8 *ProcessorTopologySt= ructureLength; +STATIC CONST UINT32 *NumberOfPrivateReso= urces; +STATIC CONST EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE_FLAGS *CacheFlags; +STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo; + +/** + 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 +} =20 /** This function validates the Cache Type Structure (Type 1) 'Number of set= s' @@ -145,6 +229,45 @@ 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 @@ -214,17 +337,19 @@ STATIC CONST ACPI_PARSER ProcessorHierarchyNodeStruc= tureParser[] =3D { An ACPI_PARSER array describing the Cache Type Structure - Type 1. **/ STATIC CONST ACPI_PARSER CacheTypeStructureParser[] =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"Type", 1, 0, L"0x%x", NULL, NULL, NU= LL, NULL }, + { L"Length", 1, 1, L"%d", NULL, NULL, NU= LL, NULL }, + { L"Reserved", 2, 2, L"0x%x", NULL, NULL, NU= LL, NULL }, =20 - { L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, = 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, ValidateCacheNumbe= rOfSets, NULL }, - { L"Associativity", 1, 20, L"%d", NULL, NULL, ValidateCacheAssoc= iativity, NULL }, - { L"Attributes", 1, 21, L"0x%x", NULL, NULL, ValidateCacheAttri= butes, NULL }, - { L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineS= ize, NULL } + { L"Flags", 4, 4, L"0x%x", NULL, (VOID **)&CacheFlags, Va= lidateCacheFlags, + NULL }, + { L"Next Level of Cache", 4, 8, L"0x%x", NULL, NULL, NU= LL, NULL }, + { L"Size", 4, 12, L"0x%x", NULL, NULL, NU= LL, NULL }, + { L"Number of sets", 4, 16, L"%d", NULL, NULL, Va= lidateCacheNumberOfSets, NULL }, + { L"Associativity", 1, 20, L"%d", NULL, NULL, Va= lidateCacheAssociativity, NULL }, + { L"Attributes", 1, 21, L"0x%x", NULL, NULL, Va= lidateCacheAttributes, NULL }, + { L"Line size", 2, 22, L"%d", NULL, NULL, Va= lidateCacheLineSize, NULL }, + { L"Cache ID", 4, 24, L"%d", NULL, NULL, Va= lidateCacheId, 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 (#84510): https://edk2.groups.io/g/devel/message/84510 Mute This Topic: https://groups.io/mt/87591328/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 Sun May 5 20:11:25 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+84511+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 1638979614445221.3969320890136; Wed, 8 Dec 2021 08:06:54 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id iBy8YY1788612xJ2SqrM6yVP; Wed, 08 Dec 2021 08:06:54 -0800 X-Received: from EUR02-AM5-obe.outbound.protection.outlook.com (EUR02-AM5-obe.outbound.protection.outlook.com [40.107.0.71]) by mx.groups.io with SMTP id smtpd.web09.15284.1638979612133774047 for ; Wed, 08 Dec 2021 08:06:53 -0800 X-Received: from AS9P194CA0014.EURP194.PROD.OUTLOOK.COM (2603:10a6:20b:46d::25) by AS8PR08MB6533.eurprd08.prod.outlook.com (2603:10a6:20b:33e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 16:06:49 +0000 X-Received: from AM5EUR03FT030.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:46d:cafe::4f) by AS9P194CA0014.outlook.office365.com (2603:10a6:20b:46d::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11 via Frontend Transport; Wed, 8 Dec 2021 16:06:49 +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+84511+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 AM5EUR03FT030.mail.protection.outlook.com (10.152.16.117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:49 +0000 X-Received: ("Tessian outbound a33f292be81b:v110"); Wed, 08 Dec 2021 16:06:49 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 04d7d5a724b1be68 X-CR-MTA-TID: 64aa7808 X-Received: from 4f8dcdcdff01.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 1CD334FC-3940-4969-9096-4360F01FE20A.1; Wed, 08 Dec 2021 16:06:41 +0000 X-Received: from EUR02-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 4f8dcdcdff01.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 08 Dec 2021 16:06:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DYvMi7Q4ymr4aDhJw7pDE1znK6bbiHhjfNMKu368tbwVSWC6BIXDfkfkYkyHjGVuFcBDFDWL2v05uXsGamjOvqsu+1U7UxiaY5IqubbgniV2Cgy9qaSmfydz60ZVlPnwzoNSnSik3+F3Dv655PIRpqP8nU1bn8xOqL8DJljEs0x9wEbmhwlfdpB5AI/hdJ38yOJ32uAvd/XnAqHUg/uYFfda3aT0Zg3/5/n4erJKTtAVlRBLjHEsUakcmZR4cdc2nE4JV6bITWYNxn6CzS9oDLyBBv1rF6uClkksCwGDtni8OpEUMH7LLSzPKgysn0cOQgXPZ0TbztWqCWIQj4Sc6g== 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=Lc8JX6sjgAfiwH7vO0v5y7FOigVKquDKhJms8SRWcbI=; b=J6wnxCazEminPKWcZqXaZQlikrCLmDTrZrhuGTflbwIp4PdgBTDyDBfvtT6SBmXEhXwczEAC/faE5Szw4RG5e7ZRWA7DbLAXMyZkqPKh905kHEaKkce51gtcILms8YA8XIqvdWNlz3RYZVdvKgPcIHDQjp8LmdLvKr+e3Y9xbOAUE29FyiUMu7Jd/S0EbTH0UFzEC1CUXJXXb9k7ttHwPLEHrYq/y+YGQkVvTlD8/x+0/Sey48SAJ6rpIWnUNk4XFbob7XQCYgDcbSpUWud034Tys5N2gYSI5SG36lDgqq9APBcz4zGGWRFK5MwpTiPOH9GI3RXMd1PW2QxaDTnXhg== 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 AM7PR02CA0015.eurprd02.prod.outlook.com (2603:10a6:20b:100::25) by VE1PR08MB5631.eurprd08.prod.outlook.com (2603:10a6:800:1ab::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Wed, 8 Dec 2021 16:06:39 +0000 X-Received: from AM5EUR03FT003.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:100:cafe::df) by AM7PR02CA0015.outlook.office365.com (2603:10a6:20b:100::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.17 via Frontend Transport; Wed, 8 Dec 2021 16:06:39 +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 AM5EUR03FT003.mail.protection.outlook.com (10.152.16.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:38 +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.20; Wed, 8 Dec 2021 16:06:36 +0000 X-Received: from e125153.arm.com (10.57.3.247) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 8 Dec 2021 16:06:35 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v3 5/7] DynamicTablesPkg: Remove PPTT ID structure from ACPI 6.4 generator Date: Wed, 8 Dec 2021 16:06:28 +0000 Message-ID: <20211208160630.10923-6-christopher.jones@arm.com> In-Reply-To: <20211208160630.10923-1-christopher.jones@arm.com> References: <20211208160630.10923-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 7181e551-ca96-40a0-96a7-08d9ba64bdee X-MS-TrafficTypeDiagnostic: VE1PR08MB5631:EE_|AM5EUR03FT030:EE_|AS8PR08MB6533:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:7691;OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: NfbnQGAwTlotjSBAHhtnIB7+eMCytp6QwvovI0F2V+ueVMrNepihgBIckvvdl4+u4cdXnnV+1/sU9iqEsm7TR7sq0nvFyRecxgXdH4nTX0/g4p0G2yOHMFVnXPLHDoa5Wku9OYVQpjmtsugASIBFVxXhBxVMUvVOEan48bnrC+MMR1lhnwiK++xfeeeEkaXANoxwnibMgJaqtWGoCPgSlL0YIQ7rAWBbiO1Gay9X/wzepYGO/LAg0ciuDOhhRGRx5ZO7gTJLY10cgFTLPSVSIMpCzc0dmPdYYzuufeoC1CMYneTMEiYC5fBy59dyfFTuwC8b1cNu23VbbfMoKbUiQUxcku/lwoDjqLuRGUm/v8NNlA/JnzayGri0Rl9AsieMzN55HKXvO0fd28rAC5AHthOIwBM52OTnuQZIwMGtJAtDQ1VDyamuH+mqfd3uItJMGSslwdwIoz6ctNuCd+06Smm5nv70veCY7mhu2jKpEbQmgl1bU3xCWtj2A4arUjfDIRuK92MfI9YILi3iDvWf74UW+ntUagoTAjd68Kr/R6b++BfD6USX6pRQeQTA7lKb2xZYEpdn6r90usGrXLi57IV90EEkrZi7NWlp2CdS/x0O60mLfVuDrki+NnSup3pDhfoiw1ebsCDEH4Kl0H9YFyRAQTz5WfPnxhg7aDO81G/lr4aIE9gscneZZBXzurCCkDF/5tp2+H/NHQ+BGXPE2bf22CuRFOxj6256w6WepS0Abu2gLFnEEONm6+b+Mm8JWAokz2XcIln2BEX5N0GSJr2WiRhN+K1upkzk5sJmiN89ywrP/0todt0gMXL0J9SMBWIAzPKpwhXLC2MHiTJLs8v05xvL0ow+28haWuxoCgZua0WCDm/Jh1rOHpMHhnnI X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700001)(356005)(7696005)(1076003)(8676002)(426003)(2616005)(6666004)(186003)(6916009)(336012)(30864003)(81166007)(86362001)(83380400001)(2906002)(8936002)(47076005)(16799955002)(40460700001)(5660300002)(508600001)(26005)(70586007)(36756003)(70206006)(82310400004)(4326008)(36860700001)(316002)(54906003)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB5631 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT030.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 785c0c8e-a7f3-4a32-7c14-08d9ba64b7a6 X-Microsoft-Antispam-Message-Info: wfVEDz0zhyXKpyF8YtG39MuxSEVIvVZZcq+4v9pl1se0LIQbQVRvw9kHgYLJWb8rPaltiux7s6Wb+6xqhhhePJBhhf8AuUAvuZnlsvY9jXC+US9J50lG9/IxTEEpLMFl7tLUjoHH9fx1gZhVSzHQ17pywxit9bpiLqF26/Mf3VjAauw7G8sx9zVRrEv8yBmS1S7IjOPzdqPf4pzUapTPiID87LPGNhFz4blgo9p4uZTTn/dlxuYogsUJXCSpchI9rGF8qcf95q2Zbfu8gwYmp03CzDkC6B/N5E5u+/YHVeXQMzx4YRki0MWQLnfYKnbT8iNVjyb7eujKY37ECXwPnlJMSHIXGxGu77qCGDTwIAhrjkTC2cpZoeZCTIaz1v2nx7ZJ0tzomeqfyKOwrCbEEL18HX6wB0DD6Qw8pF21iPNAhAHc1RLQ/rX1gRoUy+x15sDO/sIHt5dn8QxO55FeAYhOgBvJ7w4sTSqJ7xTZnk2CUj4g93KRoPVXXU8HxWq5WW9e46vtNTrv+rTq6BOItHSNn02tcWFExgJlqv3aH0mNaJ3eW9y1PMVjXp/j4deF8T9nUvRAXT9+bnc+BKlwYwC6E3Kq1ZyGiZ47BnjjYKR/mpxlG7Kr/rd3iLODnd9TnwoQ8q952+rLW9hjBGsAnUKSNU+dN9IDbbdIPV4vzE8SUdjonVNOkxsDBmnsqOJ4GWQNmDqf4ohnuumaV9XfASHFbKw3HRyV+cgB8vIMi95tBVma+aNzee/f5Ht6CBj+FoU7kHZRmNfX5APhDfK3FKaDvKzTc5JLF9q1twZBu1NLliQv15KxxzrOcpQIHBwGuw9XefcbzG4FgHxYPzrqJA== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 16:06:49.4880 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7181e551-ca96-40a0-96a7-08d9ba64bdee 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: AM5EUR03FT030.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6533 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: kPk2t9WdzQb5EHMWWLRviqGIx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1638979614; bh=iP0QW7cIi6sJu+m/GEOhO+ffgMVo6Up7iff+yvO5Du8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=E7sUEGWPw5s3fT43caI5aLWjZJa2TzHGW6HKV2bNI/ILGtixcbq1aTmD+QCFsQC/7Vk k2oIOJ0u7Qq8Lg4a2/OYo8ekwo2lwrDlTZFS+jW9TNK++yvqlMQ17ZtWoG0Ig6H8ewVhN pOtKctaP2J4uWTlS3dEGfsbiwyGxajE5vsA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1638979616454100001 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. Mantis ID for removing PPTT type 2 structure: 2072 (https://mantis.uefi.org/mantis/view.php?id=3D2072) Signed-off-by: Chris Jones Reviewed-by: Sami Mujawar --- DynamicTablesPkg/Include/ArmNameSpaceObjects.h | 23 +-- DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c | 154 +--= ----------------- DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h | 4 - 3 files changed, 3 insertions(+), 178 deletions(-) diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTables= Pkg/Include/ArmNameSpaceObjects.h index 22b37edfabd1f6a1d1a3015f4a0249c28489367c..3246e8884723ac85340bf880a38= 59800726be3c1 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 @@ -747,27 +747,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 f78bbed7c1beee4211752bba94ce531a84e84f10..58ad338d339f7f2cf506df961f0= 16edb160f0edc 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. @@ -373,8 +353,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 - @@ -969,71 +949,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 Gener= ator, - IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMg= rProtocol, - IN CONST EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER *Pptt, - IN CONST UINT32 Nodes= StartOffset - ) -{ - 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 + NodesSta= rtOffset); - - IdStructIterator =3D Generator->IdStructIndexedList; - NodeCount =3D Generator->IdStructCount; - while (NodeCount-- !=3D 0) { - ProcIdInfoNode =3D (CM_ARM_PROC_NODE_ID_INFO *)IdStructIterator->Objec= t; - - // 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 @@ -1072,15 +987,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 @@ -1155,27 +1067,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) * @@ -1241,27 +1132,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" \ @@ -1347,24 +1217,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)) { @@ -1488,8 +1340,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 f587e67e9f8bf51511c6187ba0384e1cb60661d5..15b0a9871c3d555a62b79595c31= 7e6597f6ead05 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 (#84511): https://edk2.groups.io/g/devel/message/84511 Mute This Topic: https://groups.io/mt/87591330/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 Sun May 5 20:11:25 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+84514+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 163897961777312.954604336675175; Wed, 8 Dec 2021 08:06:57 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id NnoZYY1788612xlxQnZT1AAT; Wed, 08 Dec 2021 08:06:57 -0800 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.78]) by mx.groups.io with SMTP id smtpd.web08.15036.1638979616074839826 for ; Wed, 08 Dec 2021 08:06:56 -0800 X-Received: from DB9PR05CA0022.eurprd05.prod.outlook.com (2603:10a6:10:1da::27) by AM9PR08MB6658.eurprd08.prod.outlook.com (2603:10a6:20b:303::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Wed, 8 Dec 2021 16:06:53 +0000 X-Received: from DB5EUR03FT029.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:1da:cafe::11) by DB9PR05CA0022.outlook.office365.com (2603:10a6:10:1da::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Wed, 8 Dec 2021 16:06:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+84514+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 DB5EUR03FT029.mail.protection.outlook.com (10.152.20.131) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:52 +0000 X-Received: ("Tessian outbound 1cd1a01725a6:v110"); Wed, 08 Dec 2021 16:06:52 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 0ee6c4d3ac257dee X-CR-MTA-TID: 64aa7808 X-Received: from 4fd9857b6f15.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id B994E48D-8EE7-4C70-9D4A-08DC52C49B47.1; Wed, 08 Dec 2021 16:06:40 +0000 X-Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 4fd9857b6f15.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 08 Dec 2021 16:06:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NAkE9QdchzyWyJP4kyvaPhKrLgOUYBrpfeo3zGr4RQA/SpCrTeGsBaH5ZJoWQcM94WkFakZCTjdHX+mFOIizPAURVxNiRGiLnOKKJb1NlnypExGGzmqfNaus0XMldqjx3CCbv2fA8i+86DtvjX0uyQblgQ1DwgAVFK6Y5TYXLcdT4qUziENf7jmee5fYO09gGMceWCbuzAAoDPk/b44Go49J9eICbNSLnjLCNEJnUH49BJ4qA5SHLfXabxa5obLaHF5X48uZ/l1lmXBTcrl51atrkjUvTcwNG4E6QTEExssbWYWmvrDcrYJSEQy3CdiGDa0lJk+vMpVBie518Yi8Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yzlj5PbVY85htt/yJvwThjuVCF516Yv15vXftGcmozI=; b=kJ/8TPzYOYGOnbgt5pXDCZZzvfViPHoYghoSHr+R2z1fK6mvuOJYg6qVjZGTq+l/eFJNdhg5T3vPJBwtM0EOF3HxWH8ZqibO4la7rUsFrdXHOT0s5UAio71z5zZqmKPGm4LfEi2KsOMWv2viYtz0kKcTzuoftaJgrZJvWaqeSd6nW1ZbV2dSPSxfSrbA2znPGtPF4TZ7BPyMXNhKov1x/3pIYlPsqaStx76tej+Lfoc4Lng7PgwPcWyiRNBgxh8nhe0508b8Tps5CQvW8n8jVHqaLT9oUG3i9WCDwptCPAEmv6gkBSA6PZ2mFno08dNqO0t7o0wqWij7FrG0CuDTkg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from DB6PR0301CA0089.eurprd03.prod.outlook.com (2603:10a6:6:30::36) by HE1PR08MB2810.eurprd08.prod.outlook.com (2603:10a6:7:37::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.28; Wed, 8 Dec 2021 16:06:37 +0000 X-Received: from DB5EUR03FT038.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:30:cafe::c6) by DB6PR0301CA0089.outlook.office365.com (2603:10a6:6:30::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12 via Frontend Transport; Wed, 8 Dec 2021 16:06:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; X-Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT038.mail.protection.outlook.com (10.152.21.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:37 +0000 X-Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.20; Wed, 8 Dec 2021 16:06:37 +0000 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.20; Wed, 8 Dec 2021 16:06:36 +0000 X-Received: from e125153.arm.com (10.57.3.247) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 8 Dec 2021 16:06:36 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v3 6/7] DynamicTablesPkg: Update PPTT generator to ACPI 6.4 Date: Wed, 8 Dec 2021 16:06:29 +0000 Message-ID: <20211208160630.10923-7-christopher.jones@arm.com> In-Reply-To: <20211208160630.10923-1-christopher.jones@arm.com> References: <20211208160630.10923-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 6f83e092-56fe-4f74-9451-08d9ba64bfef X-MS-TrafficTypeDiagnostic: HE1PR08MB2810:EE_|DB5EUR03FT029:EE_|AM9PR08MB6658:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:7691;OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: oglMEy488y81QOMxqDcXyJZGwUHCXmHUO7S0KflmNs9Fk4fb9RPXfDPzv5H2Xd+IWOPqSU1Rqca/IJ2IEP/gM/TZIWRLPKeAbQamWbo+Q9Xeev48yQhkq75MOjhNsFmw6dC3PdNoMxmM7Z73DUCWMVoeGDPX2UPT/2RKfJpZ6448mXA7lX/NbhJjnWtObYiEUkRkPy9aIyt/mn4vj1oOUnok2nRlwznSVx0E2a2c6A+dFB2Zgm5AeepCQYpVg4iEj97TQ8nPdo6yQFROwBZ1WkSs6OWjrMNzzyuWXFAfaMDBQ5xeO87OGdFhDdd4z7RBTA6bddgvBeIE4RBXLbk2MO0jVUBWCD1PwbRseVHu5CrBGMmFNRH3HhsIF3NWw0JsY8Cvzu48+zF7SWwm8VQBt7ylel/y4N2m0P+W5cV9r4TVdRN1+DU+GiRDu8fNkuAUeBalb4P0yWMBW4+alJ9Lo6K/no4SRq4VzOfAWORVLDrTaMEl/PTALAxorz3qSDmWP9NXI241jJskjSnrDoY5pxDhyYiFMP/r7bNye+2mN8XUKYFlzfMZSBEmtkZvpdma/NxNgxd6F44g2s4DUNXJMH6XMRVRzSE0hotdIKpHcAqhOBx76CR+PbIrLM0ARZibcaOnHF/1zco7S2zRqc8NKu+O81UbmDKgZuSLb0E5ej2gZezPQBRqGnstqfnGKIKjhtqGfFLZwEFEFCj7htZq1WeR6TheixANI44oDTo20XpN8kvTBjy5Mqwb2TvYG4smYaGrV/eR2HEOoZs3voxflPp23o15VHLKpPq0dxEPmTi3rhSsVlymS664n0pihlLMZw2sORO9tloaWNUqqaBi8H4UhWYJvcdmskxVOTM957k9sgiR2DfiTsmv6QQrhp1y X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700001)(47076005)(26005)(2906002)(7696005)(186003)(336012)(2616005)(86362001)(36860700001)(6916009)(83380400001)(4326008)(426003)(36756003)(1076003)(356005)(6666004)(40460700001)(70586007)(70206006)(508600001)(8936002)(82310400004)(15650500001)(81166007)(5660300002)(54906003)(316002)(8676002)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR08MB2810 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT029.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 35a412ec-b4e9-4b7e-a7ad-08d9ba64b6cb X-Microsoft-Antispam-Message-Info: DqDA8wPFDqtHJD8Xnutf45ar3BiGMGTVake8T88wYC5k2mex+aqSfI2OnhZq06L6A/Q1dCQrL6AZD8UrGiWLfIla6yfe6JWiz8EVY1h9J8PSvC+mIu9Qw+nt5v26XgRYh3s8cCOvL+nv5aBjj2da1GMgBk3xbwPO3wB923jz+qI2t71svOT69kvx7mVRhmtpVGV7afni/y0drCIEN2ZCGBZ9qwikH+2uIqkzmHGEYKDfWQpxGhXTU+9G3HypnVzPD7/TOBvzeRl9Okb3w5WixdmsQutZuit2scs/JidDrZSOk7F7LTK5XBVctHAg8R+p+WnBJndHRyz2iphGbuvpGKhkk9KwiV9Bsq8KWYhk3MNUn6J1r6XGIUlt0S4etyEt1VowtmV4nMG/WEO3xNS4xq/wiCadf7uw6sWoDxKrPtXtDYUqEz0TxbMOftYOrj4ERlq5eVNlXI/dHCOLNsc6oMiPjHZHszm4cXiQtIWn3xqGXwYRK3OHfdUkhyB60QxKoDUIZ7lIFkneD3Vt2JaCzLj2B8NhRPzbM7+SnKDEbme8N0PLhwbVheQ2ZFP+V3330BXT3Y4TQS7UW3ZA4IUNGSOy60dn6BH+fqWCUT1e9Sm3ADP5dtDrIBcHg+zGP45D+AxiPQHoUZeomdUZu1f90bS2nExQgDVugniL9nh4QcrZFJVmkDRCpPSS/NRUUMgs22AF3Bv+SWh2ocW/9c4itCVax6kKB8J0cZRJ7c8rDKQr7shyjsD0jR1IiJAYBLjPYe2ZSd9tmr4UDH2PH5nZrUfIoy8E8OKKoD0gwXqiKym30e7vrU6G+x6NTRhs5bSqjpzVNxFnsBPXKKjYgGn5ICpYKxAlZscvyPIyZanffPM= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 16:06:52.9191 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6f83e092-56fe-4f74-9451-08d9ba64bfef X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT029.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR08MB6658 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: kAr0UuJZWVQN2IFcudbguymRx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1638979617; bh=Jd9cjX1ZA5h9S1nTxzKhBZR4Keq6CKPI52ITBtbxtj0=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=XXU0GNmVntXxYPqW7G0JGZuLkxcPsOFlO2KIXoYWRx6WzfXqTH/FSBb3GQX6wFYAe/5 9pNRNWH0YzcR9ug+ahYnEGPPmhwm6NJpgkLp5E8soFNNPWlRK7VKP1RNa57WSmc7o5CYt UfYUTwy649hv2eRdGXHuy9OVOyIz4uQVdh4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1638979618559100013 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 Reviewed-by: Sami Mujawar --- DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c | 44 ++++= ++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator= .c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c index 58ad338d339f7f2cf506df961f016edb160f0edc..3d416ca78ec16a1929ede87abbe= 4f8f4464ef0cf 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 @@ -468,12 +468,12 @@ EFI_STATUS AddProcHierarchyNodes ( IN CONST ACPI_PPTT_GENERATOR *CONST Gener= ator, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMg= rProtocol, - 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 Nodes= StartOffset ) { EFI_STATUS Status; - EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR *ProcStruct; + EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR *ProcStruct; UINT32 *PrivateResources; BOOLEAN IsGicCTokenDuplicated; =20 @@ -494,7 +494,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; @@ -538,7 +538,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; @@ -661,7 +661,7 @@ AddProcHierarchyNodes ( =20 ProcStruct->NumberOfPrivateResources =3D ProcInfoNode->NoOfPrivateReso= urces; PrivateResources =3D (UINT32 *)((UINT8 *)ProcStruc= t + - 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 @@ -684,7 +684,7 @@ AddProcHierarchyNodes ( } =20 // Next Processor Hierarchy Node - ProcStruct =3D (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR *)((UINT8 *)Proc= Struct + + ProcStruct =3D (EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR *)((UINT8 *)Proc= Struct + ProcStruct->Len= gth); ProcNodeIterator++; } // Processor Hierarchy Node @@ -748,12 +748,12 @@ EFI_STATUS AddCacheTypeStructures ( IN CONST ACPI_PPTT_GENERATOR *CONST Gener= ator, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMg= rProtocol, - 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 Nodes= StartOffset ) { EFI_STATUS Status; - EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE *CacheStruct; + EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE *CacheStruct; PPTT_NODE_INDEXER *PpttNodeFound; CM_ARM_CACHE_INFO *CacheInfoNode; PPTT_NODE_INDEXER *CacheNodeIterator; @@ -765,7 +765,7 @@ AddCacheTypeStructures ( (Pptt !=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; @@ -775,13 +775,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; @@ -941,7 +941,7 @@ AddCacheTypeStructures ( CacheStruct->LineSize =3D CacheInfoNode->LineSize; =20 // Next Cache Type Structure - CacheStruct =3D (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE *)((UINT8 *)CacheSt= ruct + + CacheStruct =3D (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE *)((UINT8 *)CacheSt= ruct + CacheStruct->Lengt= h); CacheNodeIterator++; } // Cache Type Structure @@ -999,7 +999,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) && @@ -1087,7 +1087,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) { @@ -1155,7 +1155,7 @@ BuildPpttTable ( goto error_handler; } =20 - Pptt =3D (EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER *)*Tab= le; + Pptt =3D (EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER *)*Tab= le; =20 DEBUG (( DEBUG_INFO, @@ -1312,9 +1312,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 (#84514): https://edk2.groups.io/g/devel/message/84514 Mute This Topic: https://groups.io/mt/87591334/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 Sun May 5 20:11:25 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+84512+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 1638979614860300.5093741078721; Wed, 8 Dec 2021 08:06:54 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id o47zYY1788612xR3JlMrPNH0; Wed, 08 Dec 2021 08:06:54 -0800 X-Received: from EUR03-DB5-obe.outbound.protection.outlook.com (EUR03-DB5-obe.outbound.protection.outlook.com [40.107.4.71]) by mx.groups.io with SMTP id smtpd.web12.14998.1638979612617470754 for ; Wed, 08 Dec 2021 08:06:53 -0800 X-Received: from DBBPR09CA0001.eurprd09.prod.outlook.com (2603:10a6:10:c0::13) by DB6PR0801MB1864.eurprd08.prod.outlook.com (2603:10a6:4:74::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Wed, 8 Dec 2021 16:06:49 +0000 X-Received: from DB5EUR03FT050.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:c0:cafe::59) by DBBPR09CA0001.outlook.office365.com (2603:10a6:10:c0::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Wed, 8 Dec 2021 16:06:49 +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+84512+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 DB5EUR03FT050.mail.protection.outlook.com (10.152.21.128) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:49 +0000 X-Received: ("Tessian outbound f493ab4f1fb8:v110"); Wed, 08 Dec 2021 16:06:49 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: c2968633760a69df X-CR-MTA-TID: 64aa7808 X-Received: from 5e2e6c599e81.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 6A97D5E8-964D-48C5-A7EE-1255296DF05D.1; Wed, 08 Dec 2021 16:06:43 +0000 X-Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 5e2e6c599e81.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 08 Dec 2021 16:06:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jIKilIx2dO7IMDbzuwIPj6OggEPtbMuoFGVcsfjL3JqewM3eorJBf//pF2V7lZoaynVdw/063pWDNzDfHjNNqfzzkqwfUp3+QlLZkYi5ILntMFQQdnGQQoSjRRaNUSYElH04KGO+yfvvsnaiLaVmT02+B8xsYjV7O02kEOYAVBQqSvVXBcZzBk02PpUCba/ECKZGcISPqa30p5H1QJFxBacm22TqdSCXPAgAezjXnQj9vqgBtBiarww5vnClceHAHnOpV+u2YH1G+9cp8Kl517Bp/N4rTLSLMrk7toYuBDjdp+IbYWckz7xhvk46caOS8TNOXuIjDypd8p65aqhuPA== 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=4hPF7qKlRB8hLkXvfl3aWKPCw+6r6IaCDKA4tfCg9jk=; b=HapC8sWLfuU5CHCPjZ5gUUhKPTrrs3kI5I+R0L83x0zG75NgrO/hxODXCFKbj4R8HE3CIpgV7mKlbeUD3pJJMogdUm8xQWOgmwOJQSseDZGDQ8gZ+tpVPURt5QPKDNx+exFx435VbcgVy6f0hseoGPa7J46eZ1ngmCODOlOrqqQM8yRlFXylOPqYINNXsxG0sLfJ0/xRF3Zh4ytnkvEuZ11UmB3Esk9B7XPw2qxg16dDjYmTxArUTHbyq4Qz/qynScGlNYZZ1XDmhPQeDojVnNXUWTAiKkcmEjx92aoBHeyjSQsPNvTwcmyO3uc8Xf09jwApouCYYwt/vbtg81E39w== 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 AM7PR02CA0027.eurprd02.prod.outlook.com (2603:10a6:20b:100::37) by VE1PR08MB4974.eurprd08.prod.outlook.com (2603:10a6:803:111::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Wed, 8 Dec 2021 16:06:40 +0000 X-Received: from AM5EUR03FT003.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:100:cafe::9a) by AM7PR02CA0027.outlook.office365.com (2603:10a6:20b:100::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11 via Frontend Transport; Wed, 8 Dec 2021 16:06:40 +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 AM5EUR03FT003.mail.protection.outlook.com (10.152.16.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 16:06:40 +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.20; Wed, 8 Dec 2021 16:06:37 +0000 X-Received: from e125153.arm.com (10.57.3.247) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 8 Dec 2021 16:06:36 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v3 7/7] DynamicTablesPkg: Add CacheId to PPTT generator Date: Wed, 8 Dec 2021 16:06:30 +0000 Message-ID: <20211208160630.10923-8-christopher.jones@arm.com> In-Reply-To: <20211208160630.10923-1-christopher.jones@arm.com> References: <20211208160630.10923-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 3df39f4d-454e-4abe-9453-08d9ba64bde2 X-MS-TrafficTypeDiagnostic: VE1PR08MB4974:EE_|DB5EUR03FT050:EE_|DB6PR0801MB1864:EE_ 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: dkDEOyRcCZGav8qZYhnTqDK7zYWzBA0rFe+ab6h6DDQfKD7HEf2+StM+wm/jk9ukKFmN0sl+EeOxDhQBlp3nlmeGgV4Ts1RK1sH4/p0xZu9JEKiJsJnmP2XaSF2SqcneaHgOVyQog6cmfSTfghCIhepAN7EJ1SoqpXtCZP7H1OoN81LIpUHwhXbYsARW2tUu/92ws996V5Z87kn1AWO4vfB+SXbk7k20GlI0elLAQbsABkfubYwrGqKri0J7gdx6QcDUjS52IAgFfjFxI2nunOvccZGdfq7EMBNKH65ZXh0UPU5imvGzeFn+c/6qmpsKc8McqRsH6Iv+BdVFlMNhr02Er+wqc3xXp+alyUVo/tURO5m8bNU9xDxBLs9mlgs0rqfWbhq/voTfkZY4sUk+1UgZ0TA1Q53elv7sJsMgsJO6cB5+STXImzhKglBphu72rLHle+bMkmgeLU/gmlTCbn5GP50WggRJsRAyySnXZF8CzkJ6r5eNEA5LAThx+IOtrs7N/rTwk/8hm/1DsIzodPv+Ii+wD5iWpmlQkweCl+61wqd0JlN8DqEpL7YHC3dX6Y3Hmh4rJ9R0Ox6Ofj8hF4foKepV8Et8IpOLLeyV8UhQpab1NVFfx7be6O3qevQKbnEn11A6gvdDd5r1KBmAHe8PojbCVHOcBfowhc9pcvMbMRbxYobC990TKXJF22oW9BrB9pzMX8RnpaZtk4dRz7ybW7I4NR1GG53pZHmvN7qTnpkdP5nIImTj3hnxZrRUpi3juL+UvFjWK81qgBeixW3x5F2GmpQ6VxqVYgvkEcRgDeBFuoyjhBESad1LQWRnBKFJIMFvptktKpZi0mxHOzu35ARu8p+Dxz8XS0r6dUYv/x9U22uPgW3Ra9hzJX76 X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700001)(6666004)(81166007)(26005)(83380400001)(4326008)(426003)(186003)(5660300002)(8676002)(1076003)(36860700001)(2906002)(2616005)(70586007)(7696005)(54906003)(316002)(82310400004)(356005)(8936002)(40460700001)(336012)(6916009)(86362001)(70206006)(508600001)(47076005)(36756003)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB4974 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT050.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: c43b575f-d0b0-439d-1f30-08d9ba64b871 X-Microsoft-Antispam-Message-Info: z37NWyLWw3igS/+lJG5zz7FJsL6/Zn5Ahvgp6s2cu+XSM3yqpwyeFC4XZPjIqlp1vbxY0EV9uD1MlKPHyw8SVVsOcD4jJg8QDRNKVyaOpHUrURN5N+7gaw6QgMAYHDJYOhb3ZP8maEj8L0PGcHYVH4AGbLhBSgEqY7xac7zEuWxRvJpr5//NO08NvoNWKk8w+t1viTeJhd0hPl5NCZAEGWje8SAGiq2PBN+oms1qnbnSX/+f+VRHwwK3M6MDHnAus+4euo+WHEJoaIckU+UzSLXkkyZfJ2l4XXLaQkwuG0RNpitVP68qLWS82qUAkxt6VZXYrCLeFkutMJzkS/iXqytztBsQ4+J1DHPh+2x5vuD0X9jktPFHk0JkQxkLO4T2C6oagUJE+5KaapstcNLJhYQPmVwOZJxsv+KO1hj+p1Q/vqeSUMH58FxyWSZ6AbJcUT9ZbWVkyn2NzIZj1CpQhEOh9zfqY+WJPwkhyry/tUurT1p7T1bT7RJsAA1dAfXijuqWDBu16lXAimdfYwZZGWOEeg/MF2Cs23dgISvLcnj7cacNsdYfC5V0nPHBXDXwtrqfKAYkSKPNYvXWZd6atmkJSfKzTpag9ZJeeRLlaW4Pt0b2OeAdij4LzXfzeeEd3lZyoFpFuaMy94BFymFKhxIhGNfJyHkGMs24afPJ5dMQYaHFe1RbA+PW+IUAKZVCE3MyH5BBvfzLfhQl0teTR2i2DQ6dNdKB78WeFD3JL4+xb1lsR6EaVNXBXTASUgzt+yeinUj01Q1k5MSN3TZp51u6/ZgLXP72kBHy8Wc3kuiZPUy1+KHi8xcCvlMMtMYJCJLZxP6kl/S0GNpEKousGpQSiHX+ZDIJDe6Mb2AMqtQ= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 16:06:49.4874 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3df39f4d-454e-4abe-9453-08d9ba64bde2 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: DB5EUR03FT050.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1864 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: EmHLMfDtPYPSRqr3aH4a1R71x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1638979614; bh=O/x8kHbNABq2BMHcrKHMEiToTvlNH19MIKnqB7u6H6k=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=NfKOsp8hrzs0ViNiIjoX39Hoel6lkjUwzFF2UHjktRwzgfpO1IGnxe5KAt55GDpXZa2 WotCL5lw7Sxt2mMwyO3fHdsK9HB5m9kTPBQ2MByw4kZtKXEkKqPNnsGN5e/tkfNvX+ok9 nL7z1OuJLyaaI/XLUsklG0+ohxUb9Ak/DVc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1638979616704100006 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 Reviewed-by: Sami Mujawar --- 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 3246e8884723ac85340bf880a3859800726be3c1..6ea03fca487b96577b8fd8105bc= 3d22047ff5697 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -741,10 +741,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 3d416ca78ec16a1929ede87abbe4f8f4464ef0cf..6b74572ea2dd8478f14d013e6cb= 7394216e45d8d 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c @@ -726,6 +726,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 @@ -738,10 +767,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 @@ -749,7 +780,8 @@ AddCacheTypeStructures ( IN CONST ACPI_PPTT_GENERATOR *CONST Gener= ator, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMg= rProtocol, IN CONST EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER *Pptt, - IN CONST UINT32 Nodes= StartOffset + IN CONST UINT32 Nodes= StartOffset, + IN CONST UINT32 Revis= ion ) { EFI_STATUS Status; @@ -758,6 +790,9 @@ AddCacheTypeStructures ( CM_ARM_CACHE_INFO *CacheInfoNode; PPTT_NODE_INDEXER *CacheNodeIterator; UINT32 NodeCount; + BOOLEAN CacheIdUnique; + UINT32 TotalNodeCount; + UINT32 *FoundCacheIds; =20 ASSERT ( (Generator !=3D NULL) && @@ -770,6 +805,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; @@ -789,6 +831,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 @@ -811,7 +854,7 @@ AddCacheTypeStructures ( CacheInfoNode->Token, Status )); - return Status; + goto cleanup; } =20 // Update Cache Structure with the offset for the next level of cache @@ -835,7 +878,7 @@ AddCacheTypeStructures ( CacheInfoNode->NumberOfSets, Status )); - return Status; + goto cleanup; } =20 if (CacheInfoNode->NumberOfSets > PPTT_ARM_CACHE_NUMBER_OF_SETS_MAX) { @@ -862,7 +905,7 @@ AddCacheTypeStructures ( CacheInfoNode->Associativity, Status )); - return Status; + goto cleanup; } =20 // Validate the Associativity field based on the architecture specific= ation @@ -881,7 +924,7 @@ AddCacheTypeStructures ( CacheInfoNode->Associativity, Status )); - return Status; + goto cleanup; } =20 if (CacheInfoNode->Associativity > PPTT_ARM_CACHE_ASSOCIATIVITY_MAX) { @@ -923,7 +966,7 @@ AddCacheTypeStructures ( CacheInfoNode->LineSize, Status )); - return Status; + goto cleanup; } =20 if ((CacheInfoNode->LineSize & (CacheInfoNode->LineSize - 1)) !=3D 0) { @@ -935,18 +978,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 *)CacheSt= ruct + CacheStruct->Lengt= h); CacheNodeIterator++; } // Cache Type Structure =20 - return EFI_SUCCESS; + Status =3D EFI_SUCCESS; + +cleanup: + FreePool (FoundCacheIds); + + return Status; } =20 /** @@ -1205,7 +1288,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 (#84512): https://edk2.groups.io/g/devel/message/84512 Mute This Topic: https://groups.io/mt/87591331/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-