From nobody Sun May 5 12:51:30 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+82230+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 1634569871275617.120856034397; Mon, 18 Oct 2021 08:11:11 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Bj5zYY1788612xzOCzoLp9Ev; Mon, 18 Oct 2021 08:11:10 -0700 X-Received: from EUR01-HE1-obe.outbound.protection.outlook.com (EUR01-HE1-obe.outbound.protection.outlook.com [40.107.13.48]) by mx.groups.io with SMTP id smtpd.web08.38311.1634569869462006670 for ; Mon, 18 Oct 2021 08:11:10 -0700 X-Received: from AM6PR0202CA0059.eurprd02.prod.outlook.com (2603:10a6:20b:3a::36) by PAXPR08MB7003.eurprd08.prod.outlook.com (2603:10a6:102:202::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Mon, 18 Oct 2021 15:11:04 +0000 X-Received: from AM5EUR03FT051.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:3a:cafe::2e) by AM6PR0202CA0059.outlook.office365.com (2603:10a6:20b:3a::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18 via Frontend Transport; Mon, 18 Oct 2021 15:11:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; 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+82230+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 AM5EUR03FT051.mail.protection.outlook.com (10.152.16.246) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:04 +0000 X-Received: ("Tessian outbound 16951d3c485e:v103"); Mon, 18 Oct 2021 15:11:04 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 9ee4449e391c4a5d X-CR-MTA-TID: 64aa7808 X-Received: from b727a4f311a2.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 12113A15-A8A4-49B5-95A9-497601080BD8.1; Mon, 18 Oct 2021 15:10:52 +0000 X-Received: from EUR04-DB3-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id b727a4f311a2.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 18 Oct 2021 15:10:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vk9389tChVhs+En4vW6Ks7sk7y9KMsrrcLx3V9zxH01oKLncAyLBIbKQmKdGgWjxdd8LJLXsVoIj1vaGT4Ay9c9vfRJrWGvm559RkFgukXaH183DPMYkkEAnIvz+8jGm4gx5a2fiNJSj1JVK6i1Lf/kQcqGpYgIfqI/R4KQTzImBPJcNkhEC+siV/Bicrt3kUtdnwW8+JrKZcIbOmKb7aM7ynjjyJzRlr6CtJ2cxam15xOk75lLb9N76s6dVa8XvCkyUcDv4tsr40U6cWuRUyaCvWm9i2xmlojx+9jtyJTcYzU+SSowrf/D4L3aAs+hc8U1oyQmwhDaj+yPIxGfCdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KgBBtvHSHCczagWeXZtsYRwLNI3gIGIdpD54Ra8tPUM=; b=Mo+Vsr6MVsmRRfGoiaAXxkPrKcg/pAyjhAeq0U32JmrGbSgG98ui3sOkkpajYv3tamBh5KVwmQzY5S01oBJTVXrATSJ+m/UsoQGrHE7Gava7MCX3PsnHRdvHHcv5hk9/GOF6mc9V7gnZsg9XhUq4KHI3cb49+r0OwVISM5cgmcumgNUDQ/ckfG0jX00X7QCGjAD6eVMlFkAYw7UEX3rFV3mP6mC/uCXJqz5ARf0FGbajqMgFaaHRuT5SvW7kpgSJbhA2hFUX7Ju60qeJGbhzgQT7PMTkAplHIq2VbEgLh0Gy5jta4/W25bhR8mUeW+agZqnLpmzOrHJMS1f0AsDmkA== 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 AM5PR0201CA0022.eurprd02.prod.outlook.com (2603:10a6:203:3d::32) by AM5PR0802MB2418.eurprd08.prod.outlook.com (2603:10a6:203:9f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Mon, 18 Oct 2021 15:10:50 +0000 X-Received: from AM5EUR03FT049.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:3d:cafe::ba) by AM5PR0201CA0022.outlook.office365.com (2603:10a6:203:3d::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:10:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT049.mail.protection.outlook.com (10.152.17.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:10:49 +0000 X-Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.14; Mon, 18 Oct 2021 15:10:48 +0000 X-Received: from e125153.arm.com (10.57.27.61) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Mon, 18 Oct 2021 15:10:47 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v1 1/7] MdePkg: Add missing Cache ID (in)valid define Date: Mon, 18 Oct 2021 16:10:40 +0100 Message-ID: <20211018151046.31232-2-christopher.jones@arm.com> In-Reply-To: <20211018151046.31232-1-christopher.jones@arm.com> References: <20211018151046.31232-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fbb4da47-a05b-417d-32aa-08d992498134 X-MS-TrafficTypeDiagnostic: AM5PR0802MB2418:|PAXPR08MB7003: 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: Y9DjxfDgOS1EVqSrofTX83kBvXYRi8SeRQtltQ5CoRwqB86e8LCg5uy+B+v3Po5+cTBIwQQM43f7ppKS96CrfI4fh4AZHluTWnoeEXUwkV/sNFFjDouCoNAODLuBRdV/PoKfnpXnzpCwAdChJdxKdTJ5jgcftn6gpZOeF9EeaiYF4r17ciuIhB2Skz+QwYX3ga5a/xL0oCfsodCiY3Mg7ywfvRWtLDbZLajvDZISXGT7cYmLndWC43i4avksIOB3+fsscok8LLKHi6OTvLO8iismz6fmkl8xm9tJtJSvyC3JFzuwjZ88yr3Gr0sKMq9YujBwd9iKOQgsPdOisqi9duXadPU+6wK8iVNkfcmA1eSmRpNbOSmaaVn6H0hVJWeEapYZd485x6S3LYiWuHF7FLlzH71lGwxQeN6yvu4cVdn0n4Dyi4s6xCxVylB7btxda07SoB0MwsVOiaqiEUfkg4MBc5JZ5hiF034v5CijkaFLRidm0V2UbundXs77HprPZQXLRof3kfaWlvMktzSqMXp/BZKtm5T22ZnJkBAx1Ov/m2XaLtBMq0wZ7ZTIKbiynVUQ91wPH2+lw5Eh29SSYPoQmVFYJYBBdQDXhoPnRD9RXxx4kOXlrD6BH15anNAaE0uU/gvbtWae+i3LMGupumYjWJrhAs2uvmbcCwzR8I4M0HNDl2vydP4IemW1waM0gJFzsBcQkEza1/Ed+3O06b4T4pVFk47lZCRy7Kis112RbA/b70hdVR8rJmF9dJTVyhilHL7Ya7vjv+4L6obejyjvjYyo6+EQGg0h2ibzRCzHiG2X84w6G7sObLFo6mkj 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)(508600001)(47076005)(81166007)(6666004)(36756003)(5660300002)(8676002)(8936002)(36860700001)(426003)(26005)(7696005)(186003)(2906002)(82310400003)(70206006)(70586007)(86362001)(19627235002)(4326008)(6916009)(2616005)(336012)(316002)(54906003)(356005)(1076003)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0802MB2418 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT051.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: d524203d-97c6-497a-651f-08d992497832 X-Microsoft-Antispam-Message-Info: auVXLcLbTjxpnLStVYx6tsHvarpeqty2QeRyzayFmL4TWXhZdC0PniNcIpHmMP0pOXJ0Ri2n/GOpP8gXeafCp/M0aQWuuoi/EHR4csAJ6N4lYrleC+eY2ZFfdcgIBuf/abP0VQ4IvTuG+AphwuAj4/WD7NSaFhX8t5jE4+2jDlRKaLKZ1A3BgmZcBYBJsGKcPvpH50r6bhMM9ExdwIIHbsH20ICoaWsTu4gJ6H8kxAOzvicFegeDuwv+mZdFB/5fjTr/2Dg5UwlREA7I0ztMc2/tJTd0ayGgbTaKO0lRJ5SfGXX0KLuu1UZlvx+n6EOMqq8P0TR6Z9qQaKCz+pmpi/h4h+cwzT5MZiMXvvNL12LfpJrH00/QfsmOifN9KhN+B0CgvuvRCxLhd4OSP8unCwFIrtaFJQKT+JmW2teNv6xJMZhrUvMjNW0ANBdFRu1KZEK5XMu8gd2qLRfqIBBchf8fzaJLHVhWWeEbdredC1UbPU3vtfQ6mgDZc1FGoiNKmHTeUvegqeUhgAGV0aEiEtqOX/qG7xZrbY31qstXQyobXR6o75QVCxPy5dHGs93BCcDL1/7o+NJCmI8OQiOlKIywCdrnFg8ZUTJ/7eNKwfmF7JxOl/moXyRD/VtXEGkLfdt9KsvHr9s9TEPTHQgy4TKMCS3fJ9pCulNnvvN5AVxAXHQ8EP/LUBmEJ0kg6h1hzDjur8zSkxnINm+vZnx2aLHF3rR//5CsD4KCJlg17ayZt2WNll/kbUO/pHHiljW4juJIRc4v2w5AtHMX4LSH/0VAA47iIhSNTEcNX737mMo= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 15:11:04.6965 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fbb4da47-a05b-417d-32aa-08d992498134 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: AM5EUR03FT051.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB7003 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: qv2Y6pfpmO3uyaNsTs44Ty3Bx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634569870; bh=6snR+gNHMH/q606uAHb1Nc4BDB3LyfZDlbUWz9yHW8w=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=xGzyanOrmF89dF7EiyXVuFqQZUXYdGI3d+3vz9rkPtV0e7bCGDgNw0abUWxUiEHOQ6E 988cT0Or+3q/8dI3hb8Wsri4Ilcmf1eHcw9XXjKqYPcb6m7wWlgs8tTPTUu0yRAk63J4J VA+jojJcfqNzhJwsfYCrQPfXcwj+qu1qcnQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634569873397100001 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 --- MdePkg/Include/IndustryStandard/Acpi64.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MdePkg/Include/IndustryStandard/Acpi64.h b/MdePkg/Include/Indu= stryStandard/Acpi64.h index 3a91302f8c0e71d4951d27aac35322073219c836..625504ba77b4000c0a0b540299d= 2e0e42c768400 100644 --- a/MdePkg/Include/IndustryStandard/Acpi64.h +++ b/MdePkg/Include/IndustryStandard/Acpi64.h @@ -2680,6 +2680,8 @@ typedef struct { #define EFI_ACPI_6_4_PPTT_WRITE_POLICY_VALID 0x1 #define EFI_ACPI_6_4_PPTT_LINE_SIZE_INVALID 0x0 #define EFI_ACPI_6_4_PPTT_LINE_SIZE_VALID 0x1 +#define EFI_ACPI_6_4_PPTT_CACHE_ID_INVALID 0x0 +#define EFI_ACPI_6_4_PPTT_CACHE_ID_VALID 0x1 =20 /// /// Cache Type Structure flags --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#82230): https://edk2.groups.io/g/devel/message/82230 Mute This Topic: https://groups.io/mt/86416268/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 12:51:30 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+82228+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 1634569865530402.7180668482971; Mon, 18 Oct 2021 08:11:05 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id gcmYYY1788612x6u1dJ6oLog; Mon, 18 Oct 2021 08:11:03 -0700 X-Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.84]) by mx.groups.io with SMTP id smtpd.web12.38078.1634569861733471026 for ; Mon, 18 Oct 2021 08:11:02 -0700 X-Received: from AM5PR0201CA0013.eurprd02.prod.outlook.com (2603:10a6:203:3d::23) by PAXPR08MB6335.eurprd08.prod.outlook.com (2603:10a6:102:12c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Mon, 18 Oct 2021 15:10:58 +0000 X-Received: from AM5EUR03FT049.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:3d:cafe::27) by AM5PR0201CA0013.outlook.office365.com (2603:10a6:203:3d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.14 via Frontend Transport; Mon, 18 Oct 2021 15:10:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; 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+82228+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 AM5EUR03FT049.mail.protection.outlook.com (10.152.17.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:10:58 +0000 X-Received: ("Tessian outbound d5def7722ff7:v103"); Mon, 18 Oct 2021 15:10:58 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: a040ee8654dfa048 X-CR-MTA-TID: 64aa7808 X-Received: from 163dac102379.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 2239C6A3-3C09-4D10-BE33-9DD7BFF2CEF2.1; Mon, 18 Oct 2021 15:10:52 +0000 X-Received: from EUR02-AM5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 163dac102379.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 18 Oct 2021 15:10:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jW3xuRUwbOBzzF8jscUt9dM6HCb7dU7osX6CMe1rYStXR0L3v/9S0JmycqbCc7KcOXHmk2aGuoIJFMi9ckc0L8wCNiRXFLGKpm63Tu2XUfyT7T1Nnzq/M27WtANqO9VMvlpdMJwc70vonG4CNWfBk07LfELtv0TLcHZy4pI6clci4dBBLEovWLTyfx5dciAYec0xYQczbc2gjoiirGCjMLytfd11xJHgwp7+tiFSFp72n5FRwFytZT4qwoLTOJeNcywIRrALvoIHmbYrE3ZfqYmpHNc9F36vR5U86tvgHtyZ5kUYsBatsy42jVrUoqXhC++SthQLbD9oN6EXbFJqMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+trzKFDBWh3f8c/B83CHEVrt22LlYezEfIJSacjVHM0=; b=SzBSxZa13Zxo6uPftwfIHKlMap4wmIXnYRUMOnQ9DAIYptlIf8PYTRVfO1Ukw+bPj1Rpil6X1bTouDJ2SgK7qlsK9RNCWINdBuQUNi1c4XBSctpJpSUXCr/F+KwF9RZInF1Y46yuQgK1xOvEns494vdLGQofGVqTZiALicZ2HwgCR0kdBMaRY0JqyvNtLRj0hMXf+gUM4emvJyPBKlLTzXByH+crxUrO9aU7wI1w1fjj5+dT91zJbd+jhirQnjhFRTXUPcpKwmYZOvoK3T/Z98PRf7V9CQCVEfFxCE1OGuxzeiZFtNaQYMjYtOTdDuFJTH3ERM4MgsxD8Pn+E/D+xQ== 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 AS9PR06CA0005.eurprd06.prod.outlook.com (2603:10a6:20b:462::26) by PR2PR08MB4716.eurprd08.prod.outlook.com (2603:10a6:101:28::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Mon, 18 Oct 2021 15:10:50 +0000 X-Received: from AM5EUR03FT004.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:462:cafe::89) by AS9PR06CA0005.outlook.office365.com (2603:10a6:20b:462::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:10:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT004.mail.protection.outlook.com (10.152.16.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:10:50 +0000 X-Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.14; Mon, 18 Oct 2021 15:10:48 +0000 X-Received: from e125153.arm.com (10.57.27.61) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Mon, 18 Oct 2021 15:10:48 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v1 2/7] MdePkg: Remove PPTT ID type structure Date: Mon, 18 Oct 2021 16:10:41 +0100 Message-ID: <20211018151046.31232-3-christopher.jones@arm.com> In-Reply-To: <20211018151046.31232-1-christopher.jones@arm.com> References: <20211018151046.31232-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e7ae670-8d4e-4f29-9264-08d992497da0 X-MS-TrafficTypeDiagnostic: PR2PR08MB4716:|PAXPR08MB6335: 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: BzITeY+U/MB9Kr+wNMFH+VoHvVoiCCmTeXVJX9BuWkj73NFi7l4g35Lv7t0VAFI7ZdyBAN/PK97LXEYnAf1P2+2xm5Bcrps6sorn40y1keCTvxq0TaBennsKeSzIWAdJ4qOCswtjeDS/ARqQoiJEilqKt6phtnDQ9DzMG2KdPJkFXPQpRmO++3+HZcgPXixCOZCcumiVn2zEpKsslrYWhhzOy91aS3JG75LP5ZKyIyV/LbsaZ82PPSVY/Fz+mEGceuqdVz7NKC3xWKLqqtZx3GdkXV0ZubXr7B5DXxHSK4AzfotYgXW4Ls4NcVBHfYxd42sRzmZx9JewOtu4uUVdtpiC+YymXHuoZVkm9VgbFz68Kh1actiyCazTwmz1WSs2auqwVc1Qltx5CooTnMc/ajcN59tVNOg7V+3YkCFUcpvJL8uch3PnRt8bwQqoOpsKKspvdutMBdN6NXyubkudVMAP1M/reybIpeDu0BdvhE5URVEqzGnYAgCaIOk9fFB6RYEtsNfl8sWM+u9LrfMH03E+LcQ9iPsEThFSHvdZukxjl4OABhf8l/2j9ydvTWkEier7dttdd2T0llCso4Vk8wH2svDsncweLWhv/lIWtTZRgbTNvR7fp4hFlUWlTmHtnW7Ei3yhdQYA82a9hsB2bcQBAjUiDrHpbue5AF2iuuBw0BWknXLQYKA4X4sq/ICP7XchNmP/Q/XsrXUozr6BDLTxdXH6cso5u0wubm3kx7TL3vbe6z2vlJD7KlNaloCIKK0GnMAw5fpTQT8uegGxwyJzqtWqrK09pf43RomRASXNYmW0g/1VUK4KVn6QAxj7 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)(6666004)(16799955002)(508600001)(356005)(36756003)(426003)(70206006)(36860700001)(5660300002)(336012)(8936002)(83380400001)(2906002)(70586007)(86362001)(1076003)(8676002)(186003)(82310400003)(19627235002)(81166007)(2616005)(6916009)(47076005)(7696005)(4326008)(54906003)(316002)(26005)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR2PR08MB4716 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT049.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 6bc82919-b03c-4ec1-218a-08d9924978d9 X-Microsoft-Antispam-Message-Info: 5bhrNwi+3pFcmvWUToSOR0Yn48uq9DcpGTZ4R5nzBvlxGUSjKJpXNt8De5LFVVme9dfkRPoA3GW8CzzAtGOk2MPlJxNsom5G2zGIkjaIPr31uNF0LUi6yOlwGzmZdLNQCC3A3PD3eyNTceOoWVTXB816T1c+Xkgrs2TnOIuSZhOLtuWE7Iq9kVprMi2QusONcgy02J3Fr10tEItsVzQZbEYb87lSrTc2h9dXLCi87MoNS0fzyrKGle5cbh2nzzeWysN7CcpGaLl1qDRAd2ZbUeMxIQWeUp7IFH2BRDWMHgterhSisvcbTTPOJG4glv2KsqhEARsZ5q0VaLRN6gHMHsXB3CnTedmf1+qSVvckVV/YpQ2kN7NGCuMtZm93d3+fBoFwNWXRePcAOIFbKIK9+HNVrsgMYizWRa/vPKkNwlCJXwQaJPeiQ9S/5Hk0yDIlnSEn/r/wekreVtqSeTDOBUW3/hkP0w7Ia+Mfg+zA4cYPe7HtudKKj16Xcz4Yhdub8I+aikQ+Ghqo9fRaGdLqwCUAuFqEm6hFLcic4trQF8UznO7SKoeBnCoX7+JqRR1hTaBQ58vH/hU3L8cspiBO4+A7u58MfR8OZjZ/RkX08iTYhfVXNvT75JB1YL59lOnFktrpe1YBxTS2twH3kYCidJ+kzdLX5OH5lHpbrmlaQgkJCM0SV3InOdpZ9FphCpfZ7Uk8foIIfJRR8KAvL/CUomxC0gjxOeE62M9nM1MGb2fveblHg5AJCZy/n/3NA9xXriIcyr8FcuWZnyGN3oZ3IztXDSwqG6567V4/AhKsxw8= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 15:10:58.7019 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7e7ae670-8d4e-4f29-9264-08d992497da0 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: AM5EUR03FT049.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6335 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: cf1H4qOq8V21fkNElDJbuQxWx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634569863; bh=W1NpJmVQLEq7DEmWSBXnB62DfnOGZl9GYz9RenMS5qA=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=dBgVFjQsnTMFkVgz9ts43BrQs7UYZd00fW1nIBrW+HmHSAU1uUGlf33E7Vyr1h5jo9Z +1GHL2ZNs1zFNWqtR813VFDJbffyOBnTJpinpYJR6CEVvvglCZ6LN1BTdo05NLbNqaxu0 vUODS2lxd+BUWDPVpe3ZtBNztyXNXs/e0t0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634569868775100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3697) The ACPI 6.3A specification deprecated the PPTT ID type structure (type 2) therefore remove it from Acpi64.h. Mantis ID: 2072 (https://mantis.uefi.org/mantis/view.php?id=3D2072) Signed-off-by: Chris Jones --- MdePkg/Include/IndustryStandard/Acpi64.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/MdePkg/Include/IndustryStandard/Acpi64.h b/MdePkg/Include/Indu= stryStandard/Acpi64.h index 625504ba77b4000c0a0b540299d2e0e42c768400..bc1522722424156f0381e848c26= 17760f2d31aba 100644 --- a/MdePkg/Include/IndustryStandard/Acpi64.h +++ b/MdePkg/Include/IndustryStandard/Acpi64.h @@ -2613,7 +2613,6 @@ typedef struct { /// #define EFI_ACPI_6_4_PPTT_TYPE_PROCESSOR 0x00 #define EFI_ACPI_6_4_PPTT_TYPE_CACHE 0x01 -#define EFI_ACPI_6_4_PPTT_TYPE_ID 0x02 =20 /// /// PPTT Structure Header @@ -2737,21 +2736,6 @@ typedef struct { UINT32 CacheId; } EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE; =20 -/// -/// ID structure -/// -typedef struct { - UINT8 Type; - UINT8 Length; - UINT8 Reserved[2]; - UINT32 VendorId; - UINT64 Level1Id; - UINT64 Level2Id; - UINT16 MajorRev; - UINT16 MinorRev; - UINT16 SpinRev; -} EFI_ACPI_6_4_PPTT_STRUCTURE_ID; - /// /// Platform Health Assessment Table (PHAT) Format /// --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#82228): https://edk2.groups.io/g/devel/message/82228 Mute This Topic: https://groups.io/mt/86416264/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 12:51:30 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+82233+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 1634569877552234.15975446046002; Mon, 18 Oct 2021 08:11:17 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 0I4jYY1788612xg0G32ZBenu; Mon, 18 Oct 2021 08:11:17 -0700 X-Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.51]) by mx.groups.io with SMTP id smtpd.web10.37666.1634569875648429399 for ; Mon, 18 Oct 2021 08:11:16 -0700 X-Received: from AS9PR0301CA0019.eurprd03.prod.outlook.com (2603:10a6:20b:468::29) by AM4PR08MB2931.eurprd08.prod.outlook.com (2603:10a6:205:9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Mon, 18 Oct 2021 15:11:11 +0000 X-Received: from AM5EUR03FT013.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:468:cafe::87) by AS9PR0301CA0019.outlook.office365.com (2603:10a6:20b:468::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; 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+82233+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 AM5EUR03FT013.mail.protection.outlook.com (10.152.16.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:10 +0000 X-Received: ("Tessian outbound 8e26f7114b75:v103"); Mon, 18 Oct 2021 15:11:10 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 4711a7739e94f039 X-CR-MTA-TID: 64aa7808 X-Received: from dd6fc9c01b01.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id E3D5F042-1973-45C2-96C4-6A362F30A054.1; Mon, 18 Oct 2021 15:11:04 +0000 X-Received: from EUR02-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id dd6fc9c01b01.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 18 Oct 2021 15:11:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oGE71LaiEUN9ZSUKG8qt1JMaOtfMgeDkxxo8qT1jbi2RXHerxWrkVwsvdB8IfMtvyZGVhHE1f1n0AQZCv7yOJ/mI8iJEzUa7w5q3jcqNM/p5uaAs/jznM4COHmjt58Husr4+/Tk5z6mvMOxy1e/+9p7cex8iDxGmhi74pVIl7zrd+HXDbQlaF/rV5VNFV+OoQADDW6XeGej2ZM3EUG9rted/jhHuQnXwqY7cLoDsZgm+ntHG1XMWmkjInGgeOn043QZoY5JSrsKb6Z7lApB2jWHmsxi1qkt9RJS/liChHJf2SmaVkvAakNr2ph8o5qkIrIPZICEyQzUqBPOTZGs01A== 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=tL9IIW07lU1YrnaODhhwDmK2vGKD9I3BpcHZSoEUeCc=; b=Zf+E03Ip4H0qNDVMCrPfE7/wg0Ln7aNe3R9gdUOqiZdN2pj60HlosQTG2t1mlKpNozjhILvfbhJ1sEV5npBSzyY3kHMR42ddskDvEjL2tw3xscjbqgNACFQaq188+x9W+hkeE0zS7VGrwI9K+45HAIekTqZU8bk4l73H7t+qYgtOR3QMysSQ2HeYwwCIhnsLzKdQaqx78irVDEUDsabuyWPInCc8P3UmhfMDQFm2JvlWatbNudFLOt1sCTlcvc4qywD6PPoCu7QQwTZm0jGb6mFa6FXtEwlYkBN3+AUs+f4/CFrsTxtGKEDMsOtYH+sfpkI7Q34l5oN79PhxMHt5mQ== 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 AS8P251CA0019.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:2f2::22) by AM0PR08MB3874.eurprd08.prod.outlook.com (2603:10a6:208:108::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Mon, 18 Oct 2021 15:11:00 +0000 X-Received: from AM5EUR03FT042.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:2f2:cafe::48) by AS8P251CA0019.outlook.office365.com (2603:10a6:20b:2f2::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Mon, 18 Oct 2021 15:11:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; 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 AM5EUR03FT042.mail.protection.outlook.com (10.152.17.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:00 +0000 X-Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.14; Mon, 18 Oct 2021 15:10:49 +0000 X-Received: from e125153.arm.com (10.57.27.61) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Mon, 18 Oct 2021 15:10:48 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v1 3/7] ShellPkg: Update Acpiview PPTT parser to ACPI 6.4 Date: Mon, 18 Oct 2021 16:10:42 +0100 Message-ID: <20211018151046.31232-4-christopher.jones@arm.com> In-Reply-To: <20211018151046.31232-1-christopher.jones@arm.com> References: <20211018151046.31232-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 02125a1f-47fb-4650-4862-08d9924984e0 X-MS-TrafficTypeDiagnostic: AM0PR08MB3874:|AM4PR08MB2931: 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: AqusAAHUjCQHAt6rUnWZJFbvzSkETaemkarvPuQUlixCrnIJnefHbviEht0rZ6u12OmQASfrOHE9LLtIr5b7M9BwkILEallUgRKl+pT1wpTtAoqeYCV0yIiJoOLS7CPp6O1VhCi6dqI5T99rwhVZHHi8QIEJPH3i+mbkUwTcQB7NrEhQwiwLqBxF2h77Lzrn53aIFNY1pnbuzy9iCy3rj+janqE66oTP/u2gCphn4CvxOBmyPlpkwBx6r1DK4DYwCWAInpDG7PmXCuPt3oyc38BP2ATrsx0/MCMxy+K2tKDOpLeIxVStecSvKt3bb4yA8X846ZBCrvFm0VXPvlp7SGgJii9HT8sJTSeTzPspbOlE34Tkf1MHwgMthwe9X7uX+kzfrsv+4vjWsrfrUrT+TFp7EMiDwVd91mR7fSvVr/txUpXDF/0S+F/JhYUVSi7NVbdXHypVbEmZDrghWAeaKyfOHbV9KX5TxPg8aIkHyL+9Wh+HA29GQTz7d/Rlfilm96MzLTBlrOZXQ+VDzUj3dVUag3uBPDeu0qx195u6K4xTXgRT7CjHja1FxfmnKHyxkzdTpMAknU1Dul3YrNyg4m2IRc2EA7fTi7HY/FZ15AOFQef5Kcl0f9diy1wR6dIuKHEJ2v7Eq05vULpBNDStrr5Zc2YDkec1NJkc9VhDHrIHKwiuMHnTpB8v8irejOHWsZnzvfb2/BoMXlVw7SaIZFAIwyB4LEWWJdqgMhw3ydU35d/DMEbATANOhWBzyqZWhUonUSeootXX5HeHX0mmFsgl/5jJCJe64bvh0jeYfU10uCMaZCAX9Z2Z74jdLWUb 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)(186003)(70206006)(36756003)(82310400003)(26005)(508600001)(6916009)(54906003)(356005)(2906002)(5660300002)(7696005)(8676002)(36860700001)(86362001)(8936002)(336012)(6666004)(1076003)(81166007)(47076005)(83380400001)(2616005)(426003)(316002)(70586007)(4326008)(15650500001)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3874 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT013.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: bac7660a-29c6-4bdd-188c-08d992497e90 X-Microsoft-Antispam-Message-Info: L28zcZ6iyIRQMRXjqSxmS3rYyei8HLYzg1XE4WuKMZkcJE2qndXLSx8wdeiKNYJ6gwpIsG2ADku0ZCFCnadI7Fv87WYmjbvgKPfyNelr4kVaKCoz2i+OWfCd1g0Wca8aZUG5N5URjSevAqDWYifBm8LOHPzLiDUV992AaK+vzVJtTkVh0963DDFAagSPGlpvrFw+ktRxWGWLuCYFt7mCBooSNyxcmjSfiq74RiU8OvhlkEnohiB2qWQ0eSEJ/505X2ZVsdTS4GLU/dgPqiyjusKcVLTg5xlB0l/LdmQIVHcQ1rWVc8RgAm3ws8jcpCee7tA5UdbfeLKZP83SDKGqOZRhSefiyp9+tA7CWM9kUnfuIoz2RKR2iaqriE9zmk5KKvkfRE1MqOSdqr/Jw8YaYnMG672pUS9TIPibrTpnIY+e4hx5GSpfebhF3Bx4K2Mm/kaiCnomSuejRJjZksX9HR7Uw3AVEYNlURQmbW4GbSWI2RZzDfx8BhbVXMJyDyrGoj7eNmCaBWkPYuFiCrtFhSePEh/TV4rm2qiH7pusWTwktiUwI8OqoRoEWty/ffWQModgo2EPWppqSs+wU2Bk4upC+sE2YAzWnY19njgFLjPMAsTHRpCLPd2R4D4xf8QLL7u2ZuhEozygtu4lqG4Yx85+FuXeYmy8p+X96b1rgYcA8qgNXC6UPXSnIEfjWmE5Ckxz5jOwgRQWg5k3kCZQlZREccTtAH5LevPtp2qBHNRXVh3+PNZi59Zukifs1a4ebqg0pkMhdsJkA5ptF2eEXT3dybnFG9Fu4qJDP4A4RX8= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 15:11:10.8635 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 02125a1f-47fb-4650-4862-08d9924984e0 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: AM5EUR03FT013.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR08MB2931 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: gi5R91GU0vVdnxRaZ22CnTRRx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634569877; bh=MxLA7DI5lE/+7OfM7t7ku+ZGSkY7R6m7bFCmTkPLn9E=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=sBwTGVdr8s560wqLKWRa/nVLNOISTyeldf7dR/DFLhsnUsWPBujDyir3xbEAgHOIPdA FmLnT2+Wy/cc9tmjLuBtuAoSlN8+REa0bcShVRx0NmyRJonc1I0GgJpmGWFvHqDL/mHuQ KHRuVOQMS2oo4ABqL6AVhAmH8XNTZRtH7po= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634569878246100008 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3697) Update the Acpiview PPTT parser to use Acpi64.h. As part of the changes, remove support for parsing PPTT type 2 ID structure. Signed-off-by: Chris Jones --- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c = | 61 ++++---------------- ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c= | 2 +- 2 files changed, 12 insertions(+), 51 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/Pptt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttPa= rser.c index acd2b81bb3258c7322aa10d2c0e0d842d89e358b..bce9edcedde50e53035059e6da5= 7b9449209a674 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c @@ -1,11 +1,11 @@ /** @file PPTT table parser =20 - Copyright (c) 2019 - 2020, ARM Limited. All rights reserved. + Copyright (c) 2019 - 2021, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent =20 @par Reference(s): - - ACPI 6.3 Specification - January 2019 + - ACPI 6.4 Specification - January 2021 - ARM Architecture Reference Manual ARMv8 (D.a) **/ =20 @@ -157,8 +157,8 @@ ValidateCacheAttributes ( ) { // Reference: Advanced Configuration and Power Interface (ACPI) Specific= ation - // Version 6.2 Errata A, September 2017 - // Table 5-153: Cache Type Structure + // Version 6.4, January 2021 + // Table 5-140: Cache Type Structure UINT8 Attributes; Attributes =3D *(UINT8*)Ptr; =20 @@ -222,22 +222,6 @@ STATIC CONST ACPI_PARSER CacheTypeStructureParser[] = =3D { {L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineSize, NULL} }; =20 -/** - An ACPI_PARSER array describing the ID Type Structure - Type 2. -**/ -STATIC CONST ACPI_PARSER IdStructureParser[] =3D { - {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL}, - {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL}, - {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL}, - - {L"VENDOR_ID", 4, 4, NULL, Dump4Chars, NULL, NULL, NULL}, - {L"LEVEL_1_ID", 8, 8, L"0x%x", NULL, NULL, NULL, NULL}, - {L"LEVEL_2_ID", 8, 16, L"0x%x", NULL, NULL, NULL, NULL}, - {L"MAJOR_REV", 2, 24, L"0x%x", NULL, NULL, NULL, NULL}, - {L"MINOR_REV", 2, 26, L"0x%x", NULL, NULL, NULL, NULL}, - {L"SPIN_REV", 2, 28, L"0x%x", NULL, NULL, NULL, NULL}, -}; - /** This function parses the Processor Hierarchy Node Structure (Type 0). =20 @@ -335,29 +319,6 @@ DumpCacheTypeStructure ( ); } =20 -/** - This function parses the ID Structure (Type 2). - - @param [in] Ptr Pointer to the start of the ID Structure data. - @param [in] Length Length of the ID Structure. -**/ -STATIC -VOID -DumpIDStructure ( - IN UINT8* Ptr, - IN UINT8 Length - ) -{ - ParseAcpi ( - TRUE, - 2, - "ID Structure", - Ptr, - Length, - PARSER_PARAMS (IdStructureParser) - ); -} - /** This function parses the ACPI PPTT table. When trace is enabled this function parses the PPTT table and @@ -366,7 +327,6 @@ DumpIDStructure ( This function parses the following processor topology structures: - Processor hierarchy node structure (Type 0) - Cache Type Structure (Type 1) - - ID structure (Type 2) =20 This function also performs validation of the ACPI table fields. =20 @@ -444,22 +404,23 @@ ParseAcpiPptt ( Print (L"0x%x\n", Offset); =20 switch (*ProcessorTopologyStructureType) { - case EFI_ACPI_6_2_PPTT_TYPE_PROCESSOR: + case EFI_ACPI_6_4_PPTT_TYPE_PROCESSOR: DumpProcessorHierarchyNodeStructure ( ProcessorTopologyStructurePtr, *ProcessorTopologyStructureLength ); break; - case EFI_ACPI_6_2_PPTT_TYPE_CACHE: + case EFI_ACPI_6_4_PPTT_TYPE_CACHE: DumpCacheTypeStructure ( ProcessorTopologyStructurePtr, *ProcessorTopologyStructureLength ); break; - case EFI_ACPI_6_2_PPTT_TYPE_ID: - DumpIDStructure ( - ProcessorTopologyStructurePtr, - *ProcessorTopologyStructureLength + case EFI_ACPI_6_3_PPTT_TYPE_ID: + IncrementErrorCount (); + Print ( + L"ERROR: PPTT Type 2 - Processor ID is deprecated and must not b= e" + L"used.\n" ); break; default: diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiView= CommandLib.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiVi= ewCommandLib.c index d725cad14c5d018e2004eb8e33c845aa9c719429..ab9e6c619d70df4f79d78241603= 7d7bef62c92d5 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommand= Lib.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommand= Lib.c @@ -62,7 +62,7 @@ ACPI_TABLE_PARSER ParserList[] =3D { ParseAcpiMcfg}, {EFI_ACPI_6_4_PLATFORM_COMMUNICATIONS_CHANNEL_TABLE_SIGNATURE, ParseAcpiPcct}, - {EFI_ACPI_6_2_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGNATURE, + {EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGNATURE, ParseAcpiPptt}, {RSDP_TABLE_INFO, ParseAcpiRsdp}, {EFI_ACPI_6_2_SYSTEM_LOCALITY_INFORMATION_TABLE_SIGNATURE, ParseAcpiSlit= }, --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#82233): https://edk2.groups.io/g/devel/message/82233 Mute This Topic: https://groups.io/mt/86416274/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 12:51:30 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+82231+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 1634569875218634.5194856252918; Mon, 18 Oct 2021 08:11:15 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id tK2yYY1788612xA2GaUAWB4Q; Mon, 18 Oct 2021 08:11:14 -0700 X-Received: from EUR04-DB3-obe.outbound.protection.outlook.com (EUR04-DB3-obe.outbound.protection.outlook.com [40.107.6.55]) by mx.groups.io with SMTP id smtpd.web10.37665.1634569873464981846 for ; Mon, 18 Oct 2021 08:11:14 -0700 X-Received: from AM0PR02CA0008.eurprd02.prod.outlook.com (2603:10a6:208:3e::21) by AM6PR08MB3640.eurprd08.prod.outlook.com (2603:10a6:20b:4c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Mon, 18 Oct 2021 15:11:10 +0000 X-Received: from VE1EUR03FT060.eop-EUR03.prod.protection.outlook.com (2603:10a6:208:3e:cafe::98) by AM0PR02CA0008.outlook.office365.com (2603:10a6:208:3e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17 via Frontend Transport; Mon, 18 Oct 2021 15:11:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; 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+82231+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 VE1EUR03FT060.mail.protection.outlook.com (10.152.19.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:10 +0000 X-Received: ("Tessian outbound b9598e0ead92:v103"); Mon, 18 Oct 2021 15:11:09 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 2e4e4c832382d945 X-CR-MTA-TID: 64aa7808 X-Received: from a8bac76b4337.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id D737B590-E428-4A2C-B4C1-D42DA01C5334.1; Mon, 18 Oct 2021 15:11:03 +0000 X-Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id a8bac76b4337.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 18 Oct 2021 15:11:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YDJVi9UhdmnGsdAOb70JsoWZwfx+Txrf6tyJ+XiZB8al5Kq7Q2znsodqxUqJDb1Tlu1qR8wPNpQ+bBxNjYYYuKGqkzp3ULNSaJjvpD3YKTtT/XpHpZqwwYM4LjF4RDkOZFwoP7PwsbBZNQkO2ObRu0X+IC7n0I5pvdFmHxH1+TRT3JN/y+nxa46fL+PAp6+uC5d7wfqwW1u0RkekweBLCND9Crcrqj6X4R8slujDjrPgyzMA/gmKBY8PVGmcN7fUoRDzJ4gFlDdStG0VJXSkAmJBnXoYo3IYpp8uzPv7FgND77PQ66ReO19MSuo0iqCEn4+/HBX25GCJBY669qCD4w== 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=aneoWLfb2GxSICI/7+L6//InIU2xPm9vewraM8qgYpw=; b=JAQl4FI/Hyi26/VfwrnIwDRUKVAjgpXngeuxzY+3Lgv8V0bOKqSChmlolup2xTjddF+66WpIGT5Z7WuoyOFfwq70i2/KxAchdYaX77wA3lEe88uTC5nW7PbHkJ7TfJXTmk5M61aV9K6qLWzpJvQalgxzucwSowd7bk2ZVFfSc8impWM9sr11r0+caOgePYTA0zY3aUCHtwnXOmJZcmCCeDLHk42DMEhFzBYDsLGdYG7Q/U5HDfK42OEdFKMrqZ5i6seM4Ca/uWdSE2YKUKT2r/Hss+QVa/QMPL5K78gy0lpGJrqHqmviWiyqMm9lfio1CtMUGYFYl38qnxfAdpyDEQ== 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 AS9PR06CA0019.eurprd06.prod.outlook.com (2603:10a6:20b:462::12) by AS8PR08MB7096.eurprd08.prod.outlook.com (2603:10a6:20b:403::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15; Mon, 18 Oct 2021 15:11:01 +0000 X-Received: from AM5EUR03FT004.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:462:cafe::d5) by AS9PR06CA0019.outlook.office365.com (2603:10a6:20b:462::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT004.mail.protection.outlook.com (10.152.16.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:01 +0000 X-Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.14; Mon, 18 Oct 2021 15:10:49 +0000 X-Received: from e125153.arm.com (10.57.27.61) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Mon, 18 Oct 2021 15:10:49 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v1 4/7] ShellPkg: Add Cache ID to PPTT parser Date: Mon, 18 Oct 2021 16:10:43 +0100 Message-ID: <20211018151046.31232-5-christopher.jones@arm.com> In-Reply-To: <20211018151046.31232-1-christopher.jones@arm.com> References: <20211018151046.31232-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8fdf934e-b9d1-404e-551e-08d99249846e X-MS-TrafficTypeDiagnostic: AS8PR08MB7096:|AM6PR08MB3640: 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: awuODFwcqPkF07+HXQsiW+W+UIsS4ASPFMkiU0ZH1bQDKavKxpXqepgYYOpextbSc42Ovq+Lp8U1DyU7SFwxUSaozEokfduTRZmLD9VGtwVVuTRRH3in1ydfpdjuXZnRsPPNXow12hD45bmnG4/vZTZs2Vri/FKfEfcNtat6Oxw9d9tQSKql5xJTu0c7FhVQrtMJ2HjN0jvnrqlgYXOA1lca9QIKxPbLJBddQTNfXptIDzhd0p2h2DxiHVTdzugy03fGhajhQeJHlAQWUZApBtK/eBVVvhAKJ8KgUcBLb8RJsAF3IMXIP1XmL58QeuQ2QALmjFT+KpDeGpAUDdZTf06GdeWzLFfTAclU6PjCRyecgjmHO9Z1O/lCgc+UIhLUh+58JlSGNFYmZKQEl17TxdIllXfAbus7wsZdqnY5dwKvFWduoXtA2E6lijjZ6zJ21RyYDHH34algm1aeO6c+A2UhpSH3sIb3vbOU4Is4pB/2xN6VuKbs/SNaGXP9OftAV5PB0wjmCCTGQOHIRM/E5iyUHdoKF1/JQK/st29gf2sDOXjkZ5hx1f0TvZD0Y16ucNnzUuM1zABIivoZUbCVR2+A0dW3Ewos/agtcnsFABd2HRKJLaQYTF1VdVLrjkOL8JdysH+SdDNYgDYMtE7/WJCcG/76Fj2ln8/smqI8+t8pkeIzMQOfyJa3WaZxcAFxQA8FOamPxYLYr9WrAHzm4LB9rE9Cp7VVNjoGFZyD9DL8Tl+K1T82w6XupSrOk5UCivOn4133l3soNUS4KrIl9ZkeZkYaWtKWl5Uv4krFCX5m+sFa0cUge56FWByTZcSo 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)(83380400001)(81166007)(316002)(36756003)(36860700001)(5660300002)(186003)(8676002)(1076003)(7696005)(2906002)(6916009)(508600001)(86362001)(47076005)(70206006)(8936002)(426003)(54906003)(336012)(26005)(70586007)(4326008)(82310400003)(6666004)(356005)(2616005)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB7096 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT060.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: c86756ab-e51c-45a8-ef37-08d992497f34 X-Microsoft-Antispam-Message-Info: Nl4rMYWo6t5/l0TfCoKhS1Hhwx2PiFxCxXockTFBt7GN7bm+ToOuqBptpmECfXR5vUEcTTSl+8aWg61bsY2pTcn6AS2kiudmCqn63OyQYeXScqUFvD3yEnmz4GTsaODj7CCZ/x8b5V/2hqAjtC4rS+OFTAnrPPtGYmd0P+FSYU3ZxBwrcZQCBdakMNvUSc7WOco0bJ1ZRFQ27RtZ7eeVWvpY6icKha6KR8YpSAl1+VEZpvtOLaD+hhHIaXGH4019S9PHyZAzrD5c61rBL0oMba/fR2+/Ol9rYiAhr2RKvgfkHEYo2R+CqpolyigHTvq87gXAVRDqc8LO6hye0hlBsRl6gkIWYDlRU0nKERhGVieOiRdy466yVF/zub8d5nhboP14WsvRLWWEnh6FZv16yML5+2wlIpmZP2QD3K2QOBRT0dXdM10aco6jj6WJ9dzWI/BMmLfstjQ9gjkPTBEAUaP7Ek2F1VBxkWReSibsXi9uDMVQ/hXh46i/S0LHJa8p/sC3Cx+Dc478elyFsS0bZkl7uITCHI1569Y16Q0r8IM9FnlKpZ+gVlO6qWro+s5SYcuaVTSe8d9JBbvROU0BK+UHSuavbr8k9/IGeRQ/73YfbmHarJXkfambQ87jvhAwlLrkpGm7/pZaJkbqu/ZVrvyh9RNAqRbFBejtvZoLmOkPPjhNZmycfAff6yWGhla/HOUD1tQ5yNmzR+Tp18k/BBZMVavnExyCekuN/du3cVsJ5YbqkwLPTpLV1f2poacrajm/VLpoh5OAGB6tiE7H23gPwDT4IrcI1LKKQCupxK8= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 15:11:10.0677 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8fdf934e-b9d1-404e-551e-08d99249846e 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: VE1EUR03FT060.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3640 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: 9Ddserx4q9xmNij0OmmEGVjFx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634569874; bh=Zr+IK+Wh2sN5fwB04dZZ8radG2cwxb2hBewuus763+E=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=qCA00sqy1VIGVgczFlAnoIRi83yuZIpGl9FHlIb1mQizJI+xmFTliSU1r9vONmxOsG9 OtI93h86wEIfAC6V9f0Zz6S22gn2GH6qJIrYDyo4zkpD4qh0yeobyMXWf37lFsp3Cwt8T dMEWAtgIEbFYNhSAYX5OOrZEw+NGZ+BfGO8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634569877327100003 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 --- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c | 1= 18 +++++++++++++++++++- 1 file changed, 116 insertions(+), 2 deletions(-) diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/Pptt= Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttPa= rser.c index bce9edcedde50e53035059e6da57b9449209a674..a6130eae62c4387d2b6037ecec8= db596e4bb6bb1 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c @@ -20,8 +20,82 @@ STATIC CONST UINT8* ProcessorTopologyStructureType; STATIC CONST UINT8* ProcessorTopologyStructureLength; STATIC CONST UINT32* NumberOfPrivateResources; +STATIC CONST EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE_FLAGS* CacheFlags; STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo; =20 +/** + Increment the error count and print an error that a required flag is mis= sing. + + @param [in] FlagName Name of the missing flag. +**/ +STATIC +VOID +EFIAPI +LogCacheFlagError ( + IN CONST CHAR16* FlagName + ) +{ + IncrementErrorCount (); + Print ( + L"\nERROR: On Arm based systems, all cache properties must be" + L"provided in the cache type structure." + L"Missing '%s' flag.", + *FlagName + ); +} + +/** + This function validates the Cache Type Structure (Type 1) Cache Flags fi= eld. + + @param [in] Ptr Pointer to the start of the field data. + @param [in] Context Pointer to context specific information e.g. this + could be a pointer to the ACPI table header. +**/ +STATIC +VOID +EFIAPI +ValidateCacheFlags ( + IN UINT8* Ptr, + IN VOID* Context + ) +{ +#if defined(MDE_CPU_ARM) || defined(MDE_CPU_AARCH64) + if (CacheFlags =3D=3D NULL) { + IncrementErrorCount (); + Print (L"\nERROR: Cache Structure Flags were not successfully read."); + return; + } + + if (CacheFlags->SizePropertyValid =3D=3D EFI_ACPI_6_4_PPTT_CACHE_SIZE_IN= VALID) { + LogCacheFlagError (L"Size Property Valid"); + } + if (CacheFlags->NumberOfSetsValid =3D=3D EFI_ACPI_6_4_PPTT_NUMBER_OF_SET= S_INVALID) { + LogCacheFlagError (L"Number Of Sets Valid"); + } + if (CacheFlags->AssociativityValid =3D=3D EFI_ACPI_6_4_PPTT_ASSOCIATIVIT= Y_INVALID) { + LogCacheFlagError (L"Associativity Valid"); + } + if (CacheFlags->AllocationTypeValid =3D=3D EFI_ACPI_6_4_PPTT_ALLOCATION_= TYPE_INVALID) { + LogCacheFlagError (L"Allocation Type Valid"); + } + if (CacheFlags->CacheTypeValid =3D=3D EFI_ACPI_6_4_PPTT_CACHE_TYPE_INVAL= ID) { + LogCacheFlagError (L"Cache Type Valid"); + } + if (CacheFlags->WritePolicyValid =3D=3D EFI_ACPI_6_4_PPTT_WRITE_POLICY_I= NVALID) { + LogCacheFlagError (L"Write Policy Valid"); + } + if (CacheFlags->LineSizeValid =3D=3D EFI_ACPI_6_4_PPTT_LINE_SIZE_INVALID= ) { + LogCacheFlagError (L"Line Size Valid"); + } + // Cache ID was only introduced in revision 3 + if (*(AcpiHdrInfo.Revision) >=3D 3) { + if (CacheFlags->CacheIdValid =3D=3D EFI_ACPI_6_4_PPTT_CACHE_ID_INVALID= ) { + LogCacheFlagError (L"Cache Id Valid"); + } + } +#endif +} + /** This function validates the Cache Type Structure (Type 1) 'Number of set= s' field. @@ -141,6 +215,44 @@ ValidateCacheLineSize ( #endif } =20 +/** + This function validates the Cache Type Structure (Type 1) Cache ID field. + + @param [in] Ptr Pointer to the start of the field data. + @param [in] Context Pointer to context specific information e.g. this + could be a pointer to the ACPI table header. +**/ +STATIC +VOID +EFIAPI +ValidateCacheId ( + IN UINT8* Ptr, + IN VOID* Context + ) +{ + UINT32 CacheId; + CacheId =3D *(UINT32*)Ptr; + + // Cache ID was only introduced in revision 3 + if (*(AcpiHdrInfo.Revision) < 3) { + return; + } + + if (CacheFlags =3D=3D NULL) { + IncrementErrorCount (); + Print (L"\nERROR: Cache Structure Flags were not successfully read."); + return; + } + + if (CacheFlags->CacheIdValid =3D=3D EFI_ACPI_6_4_PPTT_CACHE_ID_VALID) { + if (CacheId =3D=3D 0) { + IncrementErrorCount (); + Print (L"\nERROR: 0 is not a valid Cache ID."); + return; + } + } +} + /** This function validates the Cache Type Structure (Type 1) Attributes fie= ld. =20 @@ -213,13 +325,15 @@ STATIC CONST ACPI_PARSER CacheTypeStructureParser[] = =3D { {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL}, {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL}, =20 - {L"Flags", 4, 4, L"0x%x", NULL, NULL, NULL, NULL}, + {L"Flags", 4, 4, L"0x%x", NULL, (VOID**)&CacheFlags, ValidateCacheFlags, + NULL}, {L"Next Level of Cache", 4, 8, L"0x%x", NULL, NULL, NULL, NULL}, {L"Size", 4, 12, L"0x%x", NULL, NULL, NULL, NULL}, {L"Number of sets", 4, 16, L"%d", NULL, NULL, ValidateCacheNumberOfSets,= NULL}, {L"Associativity", 1, 20, L"%d", NULL, NULL, ValidateCacheAssociativity,= NULL}, {L"Attributes", 1, 21, L"0x%x", NULL, NULL, ValidateCacheAttributes, NUL= L}, - {L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineSize, NULL} + {L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineSize, NULL}, + {L"Cache ID", 4, 24, L"%d", NULL, NULL, ValidateCacheId, NULL} }; =20 /** --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#82231): https://edk2.groups.io/g/devel/message/82231 Mute This Topic: https://groups.io/mt/86416272/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 12:51:30 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+82232+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 1634569876687277.43086642216326; Mon, 18 Oct 2021 08:11:16 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id tE1NYY1788612x5nj8SLG6Os; Mon, 18 Oct 2021 08:11:16 -0700 X-Received: from EUR01-HE1-obe.outbound.protection.outlook.com (EUR01-HE1-obe.outbound.protection.outlook.com [40.107.13.77]) by mx.groups.io with SMTP id smtpd.web12.38085.1634569875127526988 for ; Mon, 18 Oct 2021 08:11:15 -0700 X-Received: from AM6PR0202CA0052.eurprd02.prod.outlook.com (2603:10a6:20b:3a::29) by AM9PR08MB6707.eurprd08.prod.outlook.com (2603:10a6:20b:305::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Mon, 18 Oct 2021 15:11:10 +0000 X-Received: from AM5EUR03FT051.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:3a:cafe::6) by AM6PR0202CA0052.outlook.office365.com (2603:10a6:20b:3a::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18 via Frontend Transport; Mon, 18 Oct 2021 15:11:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; 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+82232+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 AM5EUR03FT051.mail.protection.outlook.com (10.152.16.246) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:10 +0000 X-Received: ("Tessian outbound a8bfe25d7364:v103"); Mon, 18 Oct 2021 15:11:10 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: a99db736c7a4c285 X-CR-MTA-TID: 64aa7808 X-Received: from 2d4534fee92b.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 52F9C4BC-52AB-41D8-A4E1-63C6767FF73D.1; Mon, 18 Oct 2021 15:11:03 +0000 X-Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 2d4534fee92b.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 18 Oct 2021 15:11:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PlQSira858jC99ywll99Z4lfntYnPrPU+9Bpu+ZaimXX1DdE/gGepq8xjnf/5m83tifjqDDLVP+JBWqYsSuk+0Kj0SBi1K81aDqmiCYqL2rvpxgUlCFYF6J1XPhp2ZYw0DwF6JVvC6pGVDgyhddsMdJPRYg5hFNuRvLx2YfV7usDXM1G9elc/uyL68DhZxtUASWWhB9znTvRua6QrjGZoR/CE+6DllLp2azMKuCBojj3FqxBvkEWsuLH8DF0uTDGDk7eBxm+HANc6QUe/oZOkf9sDfPkLuarXTkGQZZXqfzyBSxwOBr1djf6lMnKkdUnLhDk7ZRTfKG8Qxy/nDpwiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8zr0IQ/krbkZ4NZ2B9Jv6wlHOFJbFXkYxFN82dfiqlY=; b=QXfQGijPXITAnJHTpFKneVF/eItu7mvMX093FLB6tjIcPZzJNopSPvTJw/qwufLkJlfUadDlaYMrNgB+5sjY3wR7Sb1CvwD6GEm7mm1XqI8+7mvppa8qzx7Y+0daUyCsDvawLsAgNcJVkKJs/uWGL5ix+0JvDcrYxZomd3htP+wJBIwRFhzDN2WTCDZBkAIbGWsSbeSCpUN0BVZfzrd0HGHIEWf+zGQmOJsVnKfvqcXco0UjnHZI1RBGTnmAfx1eTwknNWwq74FpbRIbohOwMds5bRameULsZaXixB44I2D0lytT5Di11qGHDCpLXUvZKlh6WrLyuN/aqgL2AbyaWg== 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 AS8P251CA0026.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:2f2::17) by DBAPR08MB5832.eurprd08.prod.outlook.com (2603:10a6:10:1a5::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Mon, 18 Oct 2021 15:11:02 +0000 X-Received: from AM5EUR03FT042.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:2f2:cafe::10) by AS8P251CA0026.outlook.office365.com (2603:10a6:20b:2f2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Mon, 18 Oct 2021 15:11:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; 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 AM5EUR03FT042.mail.protection.outlook.com (10.152.17.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:01 +0000 X-Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.14; Mon, 18 Oct 2021 15:10:50 +0000 X-Received: from e125153.arm.com (10.57.27.61) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Mon, 18 Oct 2021 15:10:49 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v1 5/7] DynamicTablesPkg: Remove PPTT ID structure from ACPI 6.4 generator Date: Mon, 18 Oct 2021 16:10:44 +0100 Message-ID: <20211018151046.31232-6-christopher.jones@arm.com> In-Reply-To: <20211018151046.31232-1-christopher.jones@arm.com> References: <20211018151046.31232-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 362406b7-3be6-4ec1-d001-08d99249849d X-MS-TrafficTypeDiagnostic: DBAPR08MB5832:|AM9PR08MB6707: 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: vPh7v3M9OkGPXdy5gkAc9mT6LahLDdoN6LyBO5kw+yFI4KADnb3UDTt0Dq3S1LqORx3tvgj4ZU9EeUj3MVfAPnG7DxBMJcFz1lJKIWrpma9rBzf93FsCjxvMUlRJ2kt3c40VFZK+Sd5BR7oGaV0qIOyhsiV8PikiwnPuaOTfYvSWFXKF8bjHtI7mFfHO3AW7L8TIxT751zXCLgQEAZWDcUHoguNXRKt3Ayr6Qjc03gr+geSXhvPfVAX9wPqG+u1jCu0tL3cKrJIYVvu17mwIKT6MqCOxnkdSO9KAFz30rAwM2qQmCUcXzzczGbJ3SWv75o+vefWFp0/BHlNXbhCvmYAixNo3rxZWrgIaj7SjPzN0GtBpERCvKQ0oiA8Ie8704mUeRPnASK67qyyGNCQ44NJ3AVf0coa+oXV5R/y8Aa8cgdFaSwNgDP3VDAnS6LrHSM2zRjxVwkpz6zl4QqVKS1W0Hx1igPcR0C1fbyDyBk2PChwGQZ1LV8oWcV4VLx2Se43Scjbtz8+CRnbohg7nSKUGeAdis8bB3m71/O7ZNr5hTg+5ey9pXqlFYmFutlkbNC+xXQFJslbbhhjQk5GZRMnRGnor3gJ3HllBIkeHs8wJrvJsYdhqvV0tnCrl521PelNKXKZIqcoCOXEGBit19ZZ/aWQxQ52EtPHFqkiK7Nn62zcbWNi0+35SYQOBrfpGDwMW/03pHONdxXBrIUEMPJrkvjsNw5geu3aHsH1PJ3RA0PYFz8knRiZbXv5K0W6jts6DfPsnm6Jfi0OOMdJFaGBdF1/v3ycNfrAv3NjlneiEchBkq4y2vcGaMjcF/rJ+ 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)(356005)(81166007)(47076005)(316002)(8936002)(4326008)(2906002)(86362001)(36860700001)(7696005)(426003)(6916009)(83380400001)(26005)(36756003)(1076003)(5660300002)(336012)(508600001)(70586007)(54906003)(8676002)(82310400003)(6666004)(186003)(2616005)(70206006)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR08MB5832 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT051.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: dfdc3109-5165-42df-24e2-08d992497f82 X-Microsoft-Antispam-Message-Info: krNVZvXGoifeRO57bxzbXHxcI2zWlLxKwZ2c7FxuflcbU9V1Lr0lNr7RGBpKe8vztYD5RXo8ZRuAC3BYMiYeNB3lntgDlWB1n1O8uifSjjAiUq8DYh5yVv35Li/1UatGNO/ZcMZR458draTTiC7egH+Avy+EWR/BwWSlfnwznhl3bbWXktt3vIWEBfsXsYFCJS9xwNd/yYBkR59KpBGaA5uK6jQhet4pdjyUjrNHA0xraSknxnAgJSgYZzFJKYXmRUx1AnwA3YIZLQIzielCbNBS5qCx9zQUBucIJk07/pgknd0EiRwU4WqacOPAS+prk8p3iGSVAQc2qCvG5AHQrOLNmQydBaomZXSAOPhOCRAFYbsT27NArnDIsRqI/gPdvtsPdXagqrdFbHxj1dOaG2EIM//0Z1QgQlb/c4GjQ/3PCuhihd8Vvcr9R4aVS76D9uqcm7Cjep+MQiq0s96LnnYECMX3p4+hLr3pdlioievJcvnvd4eGEMLbsGXPYOe3VQqzcnxReY+DuO2CsWOcI9eOrqhA5hEGnqDrrtvDW71zE6E/4vbQj6/Vr6YGsF8tn3pUbPIXbKB4uSw0CRmpN1rLgO2e33D7usWR+iYATw20YcKNuisx7KAvnR4KKliGK35P1vRZmWKxC82jUUk2OqSirlqXQY1Te4aMsAurRSszdYSLxyVD+DRL9fvdvH24VmRb13J+0sbdDeCzsYgr8MizK6lGp95kj0eIGwFKdYset/mWMsbsAaI7j6hEBblYyLHLUvoLX8v27u8WtcA0pg== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 15:11:10.4039 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 362406b7-3be6-4ec1-d001-08d99249849d 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: AM5EUR03FT051.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR08MB6707 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: SkN4OnXIZe9yUr0h5ZqsdV4ux1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634569876; bh=ZAGXpaZ95jGQjXJMjKbZTtXTJWxwTLm5kIEAvWl60EE=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Z/MNGe+W77YW/PtBD6z9oFqbLOSuQv/X5v8ag9AJwHj0+WN7vu1CmUlsbhP7UQyLGsM quvhG0JHMq/YM+XVrR51pl7OS26JLfMah/UuSBFTuDU9e5qnwwVWVIB2SKZIMw7gAR89u YLp4cucIXIyLk1YmyhESC3TNEMeXhC5hAzA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634569877755100005 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3697) ACPI 6.3A deprecated PPTT ID (type 2) structure which was subsequently removed in ACPI 6.4. Therefore remove support for generating PPTT ID structures. Signed-off-by: Chris Jones --- DynamicTablesPkg/Include/ArmNameSpaceObjects.h | 23 +-- DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c | 155 +--= ----------------- DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h | 4 - 3 files changed, 3 insertions(+), 179 deletions(-) diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTables= Pkg/Include/ArmNameSpaceObjects.h index f19c9c70666970bb70b6aa09f064bb10a9a67112..6bc5ab6b2b28424c1afddc26cc8= 9a54b81941aeb 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -50,7 +50,7 @@ typedef enum ArmObjectID { EArmObjSmmuInterruptArray, ///< 26 - SMMU Interrupt Array EArmObjProcHierarchyInfo, ///< 27 - Processor Hierarchy Info EArmObjCacheInfo, ///< 28 - Cache Info - EArmObjProcNodeIdInfo, ///< 29 - Processor Node ID Info + EArmObjReserved29, ///< 29 - Reserved EArmObjCmRef, ///< 30 - CM Object Reference EArmObjMemoryAffinityInfo, ///< 31 - Memory Affinity Info EArmObjDeviceHandleAcpi, ///< 32 - Device Handle Acpi @@ -746,27 +746,6 @@ typedef struct CmArmCacheInfo { UINT16 LineSize; } CM_ARM_CACHE_INFO; =20 -/** A structure that describes the ID Structure (Type 2) in PPTT - - ID: EArmObjProcNodeIdInfo -*/ -typedef struct CmArmProcNodeIdInfo { - /// A unique token used to identify this object - CM_OBJECT_TOKEN Token; - // Vendor ID (as described in ACPI ID registry) - UINT32 VendorId; - /// First level unique node ID - UINT64 Level1Id; - /// Second level unique node ID - UINT64 Level2Id; - /// Major revision of the node - UINT16 MajorRev; - /// Minor revision of the node - UINT16 MinorRev; - /// Spin revision of the node - UINT16 SpinRev; -} CM_ARM_PROC_NODE_ID_INFO; - /** A structure that describes a reference to another Configuration Manager object. =20 diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator= .c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c index d70fc59e754e7d348965b8c3739822a9f1c4b7e6..65d1661c0ec47a4d1631c0dcac7= bcb16dbc619e0 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c @@ -34,7 +34,6 @@ The following Configuration Manager Object(s) are used by this Generat= or: - EArmObjProcHierarchyInfo (REQUIRED) - EArmObjCacheInfo - - EArmObjProcNodeIdInfo - EArmObjCmRef - EArmObjGicCInfo (REQUIRED) */ @@ -59,16 +58,6 @@ GET_OBJECT_LIST ( CM_ARM_CACHE_INFO ); =20 -/** - This macro expands to a function that retrieves the ID information for - Processor Hierarchy Nodes from the Configuration Manager. -*/ -GET_OBJECT_LIST ( - EObjNameSpaceArm, - EArmObjProcNodeIdInfo, - CM_ARM_PROC_NODE_ID_INFO - ); - /** This macro expands to a function that retrieves the cross-CM-object- reference information from the Configuration Manager. @@ -131,15 +120,6 @@ GET_SIZE_OF_PPTT_STRUCTS ( CM_ARM_CACHE_INFO ); =20 -/** This macro expands to a function that retrieves the amount of memory - required to store the ID Structures (Type 2) and updates the Node Inde= xer. -*/ -GET_SIZE_OF_PPTT_STRUCTS ( - IdStructs, - sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_ID), - CM_ARM_PROC_NODE_ID_INFO - ); - /** Search the Node Indexer and return the indexed PPTT node with the given Token. @@ -372,8 +352,8 @@ AddPrivateResources ( } =20 // The Node indexer has the Processor hierarchy nodes at the begining - // followed by the cache structs and Id structs. Therefore we can - // skip the Processor hierarchy nodes in the node indexer search. + // followed by the cache structs. Therefore we can skip the Processor + // hierarchy nodes in the node indexer search. Status =3D GetPpttNodeReferencedByToken ( Generator->CacheStructIndexedList, (Generator->ProcTopologyStructCount - @@ -964,72 +944,6 @@ AddCacheTypeStructures ( return EFI_SUCCESS; } =20 -/** - Update the ID Type Structure (Type 2) information. - - This function populates the ID Type Structures with information from - the Configuration Manager and and adds this information to the PPTT tabl= e. - - @param [in] Generator Pointer to the PPTT Generator. - @param [in] CfgMgrProtocol Pointer to the Configuration Manager - Protocol Interface. - @param [in] Pptt Pointer to PPTT table structure. - @param [in] NodesStartOffset Offset from the start of PPTT table to t= he - start of ID Type Structures. - - @retval EFI_SUCCESS Structures updated successfully. - @retval EFI_INVALID_PARAMETER A parameter is invalid. - @retval EFI_NOT_FOUND A required object was not found. -**/ -STATIC -EFI_STATUS -AddIdTypeStructures ( - IN CONST ACPI_PPTT_GENERATOR * CONST Generator, - IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol, - IN CONST EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt, - IN CONST UINT32 NodesStartOffset - ) -{ - EFI_ACPI_6_3_PPTT_STRUCTURE_ID * IdStruct; - CM_ARM_PROC_NODE_ID_INFO * ProcIdInfoNode; - PPTT_NODE_INDEXER * IdStructIterator; - UINT32 NodeCount; - - - ASSERT ( - (Generator !=3D NULL) && - (CfgMgrProtocol !=3D NULL) && - (Pptt !=3D NULL) - ); - - IdStruct =3D (EFI_ACPI_6_3_PPTT_STRUCTURE_ID*)((UINT8*)Pptt + NodesStart= Offset); - - IdStructIterator =3D Generator->IdStructIndexedList; - NodeCount =3D Generator->IdStructCount; - while (NodeCount-- !=3D 0) { - ProcIdInfoNode =3D (CM_ARM_PROC_NODE_ID_INFO*)IdStructIterator->Object; - - // Populate the node - IdStruct->Type =3D EFI_ACPI_6_3_PPTT_TYPE_ID; - IdStruct->Length =3D sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_ID); - IdStruct->Reserved[0] =3D EFI_ACPI_RESERVED_BYTE; - IdStruct->Reserved[1] =3D EFI_ACPI_RESERVED_BYTE; - IdStruct->VendorId =3D ProcIdInfoNode->VendorId; - IdStruct->Level1Id =3D ProcIdInfoNode->Level1Id; - IdStruct->Level2Id =3D ProcIdInfoNode->Level2Id; - IdStruct->MajorRev =3D ProcIdInfoNode->MajorRev; - IdStruct->MinorRev =3D ProcIdInfoNode->MinorRev; - IdStruct->SpinRev =3D ProcIdInfoNode->SpinRev; - - // Next ID Type Structure - IdStruct =3D (EFI_ACPI_6_3_PPTT_STRUCTURE_ID*)((UINT8*)IdStruct + - IdStruct->Length); - IdStructIterator++; - } // ID Type Structure - - return EFI_SUCCESS; -} - /** Construct the PPTT ACPI table. =20 @@ -1068,15 +982,12 @@ BuildPpttTable ( UINT32 ProcTopologyStructCount; UINT32 ProcHierarchyNodeCount; UINT32 CacheStructCount; - UINT32 IdStructCount; =20 UINT32 ProcHierarchyNodeOffset; UINT32 CacheStructOffset; - UINT32 IdStructOffset; =20 CM_ARM_PROC_HIERARCHY_INFO * ProcHierarchyNodeList; CM_ARM_CACHE_INFO * CacheStructList; - CM_ARM_PROC_NODE_ID_INFO * IdStructList; =20 ACPI_PPTT_GENERATOR * Generator; =20 @@ -1150,27 +1061,6 @@ BuildPpttTable ( ProcTopologyStructCount +=3D CacheStructCount; Generator->CacheStructCount =3D CacheStructCount; =20 - // Get the processor hierarchy node ID info and update the processor top= ology - // structure count with ID Structures (Type 2) - Status =3D GetEArmObjProcNodeIdInfo ( - CfgMgrProtocol, - CM_NULL_TOKEN, - &IdStructList, - &IdStructCount - ); - if (EFI_ERROR (Status) && (Status !=3D EFI_NOT_FOUND)) { - DEBUG (( - DEBUG_ERROR, - "ERROR: PPTT: Failed to get processor hierarchy node ID info. " \ - "Status =3D %r\n", - Status - )); - goto error_handler; - } - - ProcTopologyStructCount +=3D IdStructCount; - Generator->IdStructCount =3D IdStructCount; - // Allocate Node Indexer array NodeIndexer =3D (PPTT_NODE_INDEXER*)AllocateZeroPool ( sizeof (PPTT_NODE_INDEXER) * @@ -1237,27 +1127,6 @@ BuildPpttTable ( )); } =20 - // Include the size of ID Type Structures and index them - if (Generator->IdStructCount !=3D 0) { - IdStructOffset =3D TableSize; - Generator->IdStructIndexedList =3D NodeIndexer; - TableSize +=3D GetSizeofIdStructs ( - IdStructOffset, - IdStructList, - Generator->IdStructCount, - &NodeIndexer - ); - DEBUG (( - DEBUG_INFO, - " IdStructCount =3D %d\n" \ - " IdStructOffset =3D 0x%x\n" \ - " IdStructIndexedList =3D 0x%p\n", - Generator->IdStructCount, - IdStructOffset, - Generator->IdStructIndexedList - )); - } - DEBUG (( DEBUG_INFO, "INFO: PPTT:\n" \ @@ -1343,24 +1212,6 @@ BuildPpttTable ( } } =20 - // Add ID Type Structures (Type 2) to the generated table - if (Generator->IdStructCount !=3D 0) { - Status =3D AddIdTypeStructures ( - Generator, - CfgMgrProtocol, - Pptt, - IdStructOffset - ); - if (EFI_ERROR (Status)) { - DEBUG (( - DEBUG_ERROR, - "ERROR: PPTT: Failed to add ID Type Structures. Status =3D %r\n", - Status - )); - goto error_handler; - } - } - // Validate CM object cross-references in PPTT Status =3D DetectCyclesInTopology (Generator); if (EFI_ERROR (Status)) { @@ -1484,8 +1335,6 @@ ACPI_PPTT_GENERATOR PpttGenerator =3D { 0, // Count of Cache Structures 0, - // Count of Id Structures - 0, // Pointer to PPTT Node Indexer NULL }; diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator= .h b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h index 0a14da502d595e27d87262b1bac681318f1d9ced..59ddd71ac4ef57d748e143afaa6= ac0befb4900e0 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.h @@ -171,8 +171,6 @@ typedef struct AcpiPpttGenerator { UINT32 ProcHierarchyNodeCount; /// Count of Cache Structures UINT32 CacheStructCount; - /// Count of Id Structures - UINT32 IdStructCount; /// List of indexed CM objects for PPTT generation PPTT_NODE_INDEXER * NodeIndexer; /// Pointer to the start of Processor Hierarchy nodes in @@ -180,8 +178,6 @@ typedef struct AcpiPpttGenerator { PPTT_NODE_INDEXER * ProcHierarchyNodeIndexedList; /// Pointer to the start of Cache Structures in the Node Indexer array PPTT_NODE_INDEXER * CacheStructIndexedList; - /// Pointer to the start of Id Structures in the Node Indexer array - PPTT_NODE_INDEXER * IdStructIndexedList; } ACPI_PPTT_GENERATOR; =20 #pragma pack() --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#82232): https://edk2.groups.io/g/devel/message/82232 Mute This Topic: https://groups.io/mt/86416273/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 12:51:30 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+82234+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 1634569883346491.3846389083118; Mon, 18 Oct 2021 08:11:23 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id zhK0YY1788612xdv2Gy0ehmY; Mon, 18 Oct 2021 08:11:23 -0700 X-Received: from EUR01-DB5-obe.outbound.protection.outlook.com (EUR01-DB5-obe.outbound.protection.outlook.com [40.107.15.44]) by mx.groups.io with SMTP id smtpd.web11.37699.1634569881663773459 for ; Mon, 18 Oct 2021 08:11:22 -0700 X-Received: from AS9PR06CA0163.eurprd06.prod.outlook.com (2603:10a6:20b:45c::24) by DBBPR08MB4281.eurprd08.prod.outlook.com (2603:10a6:10:c4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Mon, 18 Oct 2021 15:11:12 +0000 X-Received: from AM5EUR03FT063.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:45c:cafe::2e) by AS9PR06CA0163.outlook.office365.com (2603:10a6:20b:45c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; 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+82234+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 AM5EUR03FT063.mail.protection.outlook.com (10.152.16.226) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:11 +0000 X-Received: ("Tessian outbound e27daf245730:v103"); Mon, 18 Oct 2021 15:11:11 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 03e558f48bdab4fd X-CR-MTA-TID: 64aa7808 X-Received: from 11a0b21f19ef.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id CAAA0E6E-09A5-407D-88DB-18287C50DE35.1; Mon, 18 Oct 2021 15:11:05 +0000 X-Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 11a0b21f19ef.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 18 Oct 2021 15:11:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aBN4AGm4GCK8wCShvTdiFrm0Wn9FrMVOPBqO+bDWAAyfc0KxXkm14vyCQjOxIKIWAjMfW3FevRk0BCTVjRz3bD+Ftu/OaFfiJQdKr4zDi5nkgF44VrugPy58Z8POCrI7Q9n3yKO2B4hx1tyz5wgGa6PLkMuPQFmSI8lAcJgSyucapSBPJqLSt8mXPaSC+3o9+MBniZWZdRIxg52BFxnOMQwYf9fUmrLN2x7nmXm4foP50cC+ls1ACJQcevsVN33KIZFZI4I1e1VuaAd12EWqSPRGmYAt+Rrpw+PGDgMEXrzMcbuDua/WXs9/hTF2PZt3Kjk3yA7FGGT5jJpRDsi0PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=l+4TVY+kzyUN9lUPJ9n+BISkqw1BnVOh6sDDDmDElS8=; b=RZxqEencfIREg4HY1O6plwv/TaI2HOJZ/idGB3AUjFl/jUFPw1dAqRDO5fHP9CTerMpS6KFWBhn/VImW+O57ow/sCvwZuMtsnjXX748Lwwda5tzSSdK7kom930I7XURLjCrU0ImCZZZOWwykExHUlLEiHf3sZImyjS8FBwZbCBRhGfrkyP0bkhYn/fxmINXTOYcO0lYNR+XS0+kKIapuya4qFpSFvqipZ00VRJEBjM+rZSpko6g9QdB2vOIaekL+kIuFsmMKYoNve/lJ1D0h/aMQVTEEZf9EkSduQpVoFb94OqTJjI3dBwxFLkxXYifIBoZ7DvjipAmUyoxrUw9ihw== 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 AS9PR06CA0010.eurprd06.prod.outlook.com (2603:10a6:20b:462::33) by HE1PR0801MB1675.eurprd08.prod.outlook.com (2603:10a6:3:87::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Mon, 18 Oct 2021 15:11:03 +0000 X-Received: from AM5EUR03FT004.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:462:cafe::c9) by AS9PR06CA0010.outlook.office365.com (2603:10a6:20b:462::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT004.mail.protection.outlook.com (10.152.16.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:02 +0000 X-Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.14; Mon, 18 Oct 2021 15:10:51 +0000 X-Received: from e125153.arm.com (10.57.27.61) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Mon, 18 Oct 2021 15:10:50 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v1 6/7] DynamicTablesPkg: Update PPTT generator to ACPI 6.4 Date: Mon, 18 Oct 2021 16:10:45 +0100 Message-ID: <20211018151046.31232-7-christopher.jones@arm.com> In-Reply-To: <20211018151046.31232-1-christopher.jones@arm.com> References: <20211018151046.31232-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 81582369-acd7-4967-2b02-08d992498580 X-MS-TrafficTypeDiagnostic: HE1PR0801MB1675:|DBBPR08MB4281: 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: vyqdVbGB8Luhfr8aYHJjNtCGT4eumZlUjqfkPnqtKjOg1FFjz+UBVxWshsvo1yFQSDsEqCvaqX27wWBcTG6zhH92mv0MPNnkgb+k7OSLYFfkL+tE9RQXRFYKB6AVNb8FXqUEuvEGmaK+ER5CiqVw6HkhPrXNChjb+rpiqZFa1U8Fv3INsw/6iRtD7xrQZP59vTnkwLnbWvjYM9kBHgyXeTSnrm23f3/ZML4tX1Jx6LpVeDqXMPSeD5+77hA5k8Ni717YPvDiC9bKHeSmcIRmILJPsAytTBTtyeLikyB4zAvEqA1wbr5gLloXveq/qtr7FTx+7ml2STULFrSP+lythKIE7dTKJmfvf7S+DRkm5/Itek21B0TiTG//ksw9XjmMZfEY5nuL6JF2F5hQgkHGFsp9/ben1yAYp1egV/7mJj5TaAMpXFJmtN6CFe+Hw54oynPmWQmikpbrgY3/iRgKg1FUO+9AhenOJOe23n1PbXLrhihXuObsVlKsmVQz84SzTIO04gtsIBce8BxO8TBGkn1QIttUEsv5lkzeHXmVBjQfnEdOmUc1DO1oNTWX3av+W0PUrZ6cLWbtQ18OsshJ7YKppYpLsD8+LaOwa6cCvbrGz0oEyWKZa2NFCocj1SMPBhSGtMxoP+TIV+1Eh5bPNTdbYf/K+H9lb9PMw3dHdULXpZ0M30MHiYgMV57svI4vOwLeoJqTiobyvzpfnCkBNM3p5XPow/TsdEM73ZUESR/x5ckJXlNmOB008pKrukPmiRy8CxBHbGwBrxer3V4VeH5msG/CsB8fVGI2ygCXxZu+qnBbA6EJEhL0U5BQGSmn 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)(2906002)(5660300002)(508600001)(7696005)(47076005)(426003)(2616005)(83380400001)(70206006)(54906003)(4326008)(8936002)(70586007)(82310400003)(6666004)(1076003)(26005)(6916009)(316002)(81166007)(186003)(15650500001)(36756003)(356005)(8676002)(86362001)(336012)(36860700001)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1675 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT063.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 06e8d2ab-92ed-46b9-0467-08d992497fed X-Microsoft-Antispam-Message-Info: 1lH6ihePlyae7oJU+/WmsmMF5dBu3h6B2NC4Fi6mSUwDwBr7uGD1PAJq8D1Q1/PXxq6vrkrZ6C6c+Ynvc1++s3hhnBPYEGQW/Q/n18TmFPAgNly5RrvTgaFYOWZLTV+LqjAg3Y0Mx/PuiM+02ibWCH3bIoVj1CnZflWqrrCV2kn5FGTj5nkntFO98u4KNFRu5NyQvAB8A4iu3F+1iMmWxrX1/3JxAWmZD8loB9E7XppYwAF5eujwQ//GRQ1Mew7YC8tWKUtTY5o3tgZ+ft5Mu9k8Ohhqltdm+mNHJbPfBMU5LmQW86qse3zxc7Xz/1rlZUs1Hobw/JHf/k/o1al5GWqfaLcCuLS2643jF9+3PNSBgEv2zLinFVknaK04ASIRVPJkAZLtFTH0PKx0CN2QHKa119f26buBU77O/S+3Gwn5jwvox+E30fokdl5p+rVWqkl5y4WJU1BI08THWz6mt3lCBEDOUSxbyfBLEvJWodu/275lLlKEazA2P6AJmh+iy6IOGrLComssbNR9vFZb3TADxQs1plrpnJmA95zkTyd8/euYiw/v3xXSIL/PPs8EeSpBizCHNUg8e4gqVIKcrh+p/N9LfzH6S7bJi+mwucylpcoUpY3i8vdlIgPb9PHB3BdHvXa61dv2CW7jt3H/rKLDphwes+aSpWC4aLwdTUfh0URn5QLUc4eBvqXv3KD27x2KVMPfkEphZ7jGTuhL4GT15ZYDjB4prqqvXvOZaBg9Zyt5+fvZfnc6n2yZQ9vf3F88lTYMRfp4QFBqvrV60NHEFmNrq1fiGjLELCb9dXg= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 15:11:11.8943 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 81582369-acd7-4967-2b02-08d992498580 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: AM5EUR03FT063.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4281 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: wd50FswmpYKjxYLRPzfda0zNx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634569883; bh=cBBHoNZdGTBzziV6zV8IQypv3ajF3m4wNnr7NsPYp4A=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=wsfkQzvWlUD0VS6qKAZRPD4kW/nEr1OG5dwUuGmRa99791mXlgG4jDcgh3qoXI/h8lG VJIwElnDLukViGYFwSQBhzeLL0uiZWcX+xZo2MmwxZ6bIK0Gm4ddYcl8l7aE+UOLl5ERO oAWnSLAGH5EfxkBf2gwqA76zMxLAwxOwMRw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634569885016100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3697) Update the PPTT generator to use Acpi64.h. Signed-off-by: Chris Jones --- DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c | 44 ++++= ++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator= .c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c index 65d1661c0ec47a4d1631c0dcac7bcb16dbc619e0..18f093998db57ea4698953ed06a= 9826df559c1b7 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c @@ -1,11 +1,11 @@ /** @file PPTT Table Generator =20 - Copyright (c) 2019, ARM Limited. All rights reserved. + Copyright (c) 2021, ARM Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent =20 @par Reference(s): - - ACPI 6.3 Specification, January 2019 + - ACPI 6.4 Specification, January 2021 =20 @par Glossary: - Cm or CM - Configuration Manager @@ -96,7 +96,7 @@ GetProcHierarchyNodeSize ( ASSERT (Node !=3D NULL); =20 // + - return sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR) + + return sizeof (EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR) + (Node->NoOfPrivateResources * sizeof (UINT32)); } =20 @@ -116,7 +116,7 @@ GET_SIZE_OF_PPTT_STRUCTS ( */ GET_SIZE_OF_PPTT_STRUCTS ( CacheTypeStructs, - sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE), + sizeof (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE), CM_ARM_CACHE_INFO ); =20 @@ -466,12 +466,12 @@ EFI_STATUS AddProcHierarchyNodes ( IN CONST ACPI_PPTT_GENERATOR * CONST Generator, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol, - IN CONST EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt, + IN CONST EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt, IN CONST UINT32 NodesStartOffset ) { EFI_STATUS Status; - EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR * ProcStruct; + EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR * ProcStruct; UINT32 * PrivateResources; BOOLEAN IsGicCTokenDuplicated; =20 @@ -492,7 +492,7 @@ AddProcHierarchyNodes ( (Pptt !=3D NULL) ); =20 - ProcStruct =3D (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR*)((UINT8*)Pptt + + ProcStruct =3D (EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR*)((UINT8*)Pptt + NodesStartOffset); =20 ProcNodeIterator =3D Generator->ProcHierarchyNodeIndexedList; @@ -536,7 +536,7 @@ AddProcHierarchyNodes ( } =20 // Populate the node header - ProcStruct->Type =3D EFI_ACPI_6_3_PPTT_TYPE_PROCESSOR; + ProcStruct->Type =3D EFI_ACPI_6_4_PPTT_TYPE_PROCESSOR; ProcStruct->Length =3D (UINT8)Length; ProcStruct->Reserved[0] =3D EFI_ACPI_RESERVED_BYTE; ProcStruct->Reserved[1] =3D EFI_ACPI_RESERVED_BYTE; @@ -657,7 +657,7 @@ AddProcHierarchyNodes ( =20 ProcStruct->NumberOfPrivateResources =3D ProcInfoNode->NoOfPrivateReso= urces; PrivateResources =3D (UINT32*)((UINT8*)ProcStruct + - sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR)); + sizeof (EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR)); =20 if (ProcStruct->NumberOfPrivateResources !=3D 0) { // Populate the private resources array @@ -680,7 +680,7 @@ AddProcHierarchyNodes ( } =20 // Next Processor Hierarchy Node - ProcStruct =3D (EFI_ACPI_6_3_PPTT_STRUCTURE_PROCESSOR*)((UINT8*)ProcSt= ruct + + ProcStruct =3D (EFI_ACPI_6_4_PPTT_STRUCTURE_PROCESSOR*)((UINT8*)ProcSt= ruct + ProcStruct->Length); ProcNodeIterator++; } // Processor Hierarchy Node @@ -744,12 +744,12 @@ EFI_STATUS AddCacheTypeStructures ( IN CONST ACPI_PPTT_GENERATOR * CONST Generator, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol, - IN CONST EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt, + IN CONST EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt, IN CONST UINT32 NodesStartOffset ) { EFI_STATUS Status; - EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE * CacheStruct; + EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE * CacheStruct; PPTT_NODE_INDEXER * PpttNodeFound; CM_ARM_CACHE_INFO * CacheInfoNode; PPTT_NODE_INDEXER * CacheNodeIterator; @@ -761,7 +761,7 @@ AddCacheTypeStructures ( (Pptt !=3D NULL) ); =20 - CacheStruct =3D (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE*)((UINT8*)Pptt + + CacheStruct =3D (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE*)((UINT8*)Pptt + NodesStartOffset); =20 CacheNodeIterator =3D Generator->CacheStructIndexedList; @@ -771,13 +771,13 @@ AddCacheTypeStructures ( CacheInfoNode =3D (CM_ARM_CACHE_INFO*)CacheNodeIterator->Object; =20 // Populate the node header - CacheStruct->Type =3D EFI_ACPI_6_3_PPTT_TYPE_CACHE; - CacheStruct->Length =3D sizeof (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE); + CacheStruct->Type =3D EFI_ACPI_6_4_PPTT_TYPE_CACHE; + CacheStruct->Length =3D sizeof (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE); CacheStruct->Reserved[0] =3D EFI_ACPI_RESERVED_BYTE; CacheStruct->Reserved[1] =3D EFI_ACPI_RESERVED_BYTE; =20 // "On Arm-based systems, all cache properties must be provided in the - // table." (ACPI 6.3, Section 5.2.29.2) + // table." (ACPI 6.4, Section 5.2.29.2) CacheStruct->Flags.SizePropertyValid =3D 1; CacheStruct->Flags.NumberOfSetsValid =3D 1; CacheStruct->Flags.AssociativityValid =3D 1; @@ -936,7 +936,7 @@ AddCacheTypeStructures ( CacheStruct->LineSize =3D CacheInfoNode->LineSize; =20 // Next Cache Type Structure - CacheStruct =3D (EFI_ACPI_6_3_PPTT_STRUCTURE_CACHE*)((UINT8*)CacheStru= ct + + CacheStruct =3D (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE*)((UINT8*)CacheStru= ct + CacheStruct->Length); CacheNodeIterator++; } // Cache Type Structure @@ -994,7 +994,7 @@ BuildPpttTable ( // Pointer to the Node Indexer array PPTT_NODE_INDEXER * NodeIndexer; =20 - EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt; + EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt; =20 ASSERT ( (This !=3D NULL) && @@ -1081,7 +1081,7 @@ BuildPpttTable ( Generator->NodeIndexer =3D NodeIndexer; =20 // Calculate the size of the PPTT table - TableSize =3D sizeof (EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_H= EADER); + TableSize =3D sizeof (EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_H= EADER); =20 // Include the size of Processor Hierarchy Nodes and index them if (Generator->ProcHierarchyNodeCount !=3D 0) { @@ -1150,7 +1150,7 @@ BuildPpttTable ( goto error_handler; } =20 - Pptt =3D (EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER*)*Tabl= e; + Pptt =3D (EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER*)*Tabl= e; =20 DEBUG (( DEBUG_INFO, @@ -1307,9 +1307,9 @@ ACPI_PPTT_GENERATOR PpttGenerator =3D { // Generator Description L"ACPI.STD.PPTT.GENERATOR", // ACPI Table Signature - EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGNATURE, + EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGNATURE, // ACPI Table Revision supported by this Generator - EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_REVISION, + EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_REVISION, // Minimum supported ACPI Table Revision EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_REVISION, // Creator ID --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#82234): https://edk2.groups.io/g/devel/message/82234 Mute This Topic: https://groups.io/mt/86416277/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 12:51:30 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+82235+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 1634569884492485.0179071926402; Mon, 18 Oct 2021 08:11:24 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id IK4RYY1788612x9XCpQQcuIs; Mon, 18 Oct 2021 08:11:24 -0700 X-Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.50]) by mx.groups.io with SMTP id smtpd.web11.37700.1634569882636246996 for ; Mon, 18 Oct 2021 08:11:23 -0700 X-Received: from AM5PR0701CA0054.eurprd07.prod.outlook.com (2603:10a6:203:2::16) by DB6PR0801MB1656.eurprd08.prod.outlook.com (2603:10a6:4:39::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Mon, 18 Oct 2021 15:11:18 +0000 X-Received: from AM5EUR03FT010.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:2:cafe::6b) by AM5PR0701CA0054.outlook.office365.com (2603:10a6:203:2::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.9 via Frontend Transport; Mon, 18 Oct 2021 15:11:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; 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+82235+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 AM5EUR03FT010.mail.protection.outlook.com (10.152.16.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:17 +0000 X-Received: ("Tessian outbound e27daf245730:v103"); Mon, 18 Oct 2021 15:11:17 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: b7edc2078446f6c9 X-CR-MTA-TID: 64aa7808 X-Received: from 2b66d16932d1.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id ED74DE8E-EFCA-424B-9479-B46F53F92952.1; Mon, 18 Oct 2021 15:11:11 +0000 X-Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 2b66d16932d1.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 18 Oct 2021 15:11:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kg9KIA7v0AJzswWVq+GwSStHcdzwgbqmM+notShF2q5oZjvV77JlELCkJ8f4DsY0Nsn5OgVghA9apxuWRL0y9X+8NY54Sp71Nn1j/DF3Y+EOLFItzcFMDw+LSvwpSp+kpbNT+oVmnVnqXaXRxteQ5z+hkLmWqUnovYj0S/gMoTc29qeB9ReR2hGFt6r8dOwXLBpad7ldqm+EVp+aeGG+O1jNarLDO0Mne51hpnGt1TE6ZTfEe7Sl+Apsne9Nb/SBPaDFWcKa7tv+NB2FaxHrdDgbEuft2mY8JGe2qf0zceNG7I5/MVDmneSy+QLGqUReMD7Te+6xATS6ZcR/NN0qkQ== 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=IuiUvsGxTYI7igq/sEFjsLwzV5vcEsg93ggJYevqiAo=; b=VCwwN350razp2P9tP4pmEDfKTjnYxNu5qD4Z99H77p2aBMdIHAEL+5N8xcspxEwLvbrNei0HRBxVG2FkOJlDxZR2kJVd6ecJt4IxO98wPBA7Z86JlVHSYkB96EXVTMn9ymKrmGKqohtta04hGwxpUGVCPELWdX+Y+r+M3UAELU9RDnbFHrubGnLY9yJlglRxvGTFLQL2TGly9cLAns64cZ8IwLf7z9Qi74+YTGmpUoSWvKdX562H9jvtKiXOsX+8/A1f0RJryJGZe3rDx1YjrUG3Mi+7ou3pP6aUP3W+N9emlOUlGzXSAXKlv4Y6QIrJZ2J/zB5OMfy25X9b+YBrAg== 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 AS8P251CA0021.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:2f2::18) by HE1PR0802MB2459.eurprd08.prod.outlook.com (2603:10a6:3:e1::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Mon, 18 Oct 2021 15:11:06 +0000 X-Received: from AM5EUR03FT042.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:2f2:cafe::11) by AS8P251CA0021.outlook.office365.com (2603:10a6:20b:2f2::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Mon, 18 Oct 2021 15:11:06 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; 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 AM5EUR03FT042.mail.protection.outlook.com (10.152.17.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 15:11:05 +0000 X-Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.14; Mon, 18 Oct 2021 15:10:52 +0000 X-Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Mon, 18 Oct 2021 15:10:51 +0000 X-Received: from e125153.arm.com (10.57.27.61) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.14 via Frontend Transport; Mon, 18 Oct 2021 15:10:51 +0000 From: "Chris Jones" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH v1 7/7] DynamicTablesPkg: Add CacheId to PPTT generator Date: Mon, 18 Oct 2021 16:10:46 +0100 Message-ID: <20211018151046.31232-8-christopher.jones@arm.com> In-Reply-To: <20211018151046.31232-1-christopher.jones@arm.com> References: <20211018151046.31232-1-christopher.jones@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 70ebd46b-c4aa-40dd-3669-08d99249890c X-MS-TrafficTypeDiagnostic: HE1PR0802MB2459:|DB6PR0801MB1656: 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: MoZakWjJFezaUzEd2ZVHFQA2mxEIfT0RsSQOkPzSdJb0+Vhb6fbz619Jte8Gl2BQLajwzmDj7RUm56d50pIgIE5fXjOaSou/+XzeBqy0uU3FbVP76HQ6SGrRv5u9zsy4lL4pT1y4i2qJqHao42PIYqo0+Qatmozf/gSUueWqQhqaio62dqWhgCTuxC/ZVR+z0cB5IQwiHl0c1lsDzz4ak8T1gZq41sTnVpzUYc17qkbBhN/caR5noc76U8Ve1bAFdtY07rSWlKqvSkDar3Bqx7YzA1H1TBU2U7DlSPHBhKo1D8prBJFaVsAas8X9nK4pmhdK7GbFOrPaB2dxxQ//a0oYimKlrwaIhw4JhNppMKZazwMF7AFifIKqpITEalfTs6qEMI8enE+DKdcfWC3kUyJcGmGHWPnbODFDlWU4KoM0so9Wkap7o9RxGlQVCPRo8Am6lbwfulUexmDM3ycXZRoDVNpCpce2K0qTKd84qQCEFP+H1S8xUIPDwLBskbvRMFyE33emu1mOR7FiQGM/uwmkjUWL7p44rsBFiaA1Gxm2lAlur/CCkM5GOdq+aVcZ0sgGqepBE+c9Ui65xCltIp09004BEjda7Dmk9dgMuWWCvxthet/MqtFQVGNXoo5+uVNTjfcqRo0KrCiG2SN0DTT62pbrSvFJ5cQBZn3/z9yhAx1xNVhWdvmRjbMjFWVuLkEwEg02wVSkz+8QC2j43X/juO88Kss7yYS0GSstUePoLOiYmVt1279f7uO0K4H/R6XrWamhZiFzNPG90V7P/pjAGEAyWYowKgd3jXHxydKiiHZtLuniB+/xLojPyhZE X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(2906002)(8676002)(336012)(36860700001)(2616005)(4326008)(6666004)(81166007)(1076003)(426003)(6916009)(316002)(8936002)(36756003)(83380400001)(47076005)(86362001)(5660300002)(26005)(7696005)(70206006)(356005)(70586007)(82310400003)(186003)(54906003)(508600001)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2459 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT010.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: d1668c2d-aaf2-44eb-0a64-08d9924981bb X-Microsoft-Antispam-Message-Info: sCieqa3oLTxddS+bWZUZr/+o5nlT2WBO4rgaWmlPFXcA1opgACvI4cF0WYdTe/t4j32+LSEokeOnMldAtYHrIieMEBU0j0x5brBrWkkrT2C5lMfEYfLdupbYdJRTHpF1nhqUN0dcO83y6hlltzw/zPvv5DwENwLswBonrbxveoFS6uEBqwD6MY+GGX6DudLYFkK7iDZ/hZhk5BqCndbQpYE1qwuYP05kab8Kt2VmwUm4HTSqBPV7Es2GNiYD2+/9qO6SJl9hbvXSvWhERg+W2yLz+aboigpupvHf3wr1Z+1ZNnW/dLmm6u1G0CJc9iqBXESpqo+MU+Lt1RJFfYG5giOfASh18PcLFET2kHMUe206LvRTRQyEpPRwZ5XZ1AScZE633PoXV+zYY6rASxZWeWA6rYd8WUdQZl9AjLTySRU4SSky9p2s+XAlXxlAu8VmV1xs0SJujfRtkJTOS/lciFT1VNIFipPIZ53QeTaZFHEOio6HMLbKQ4StSsXubERaY0zaXvxWqTBn3hN4b8wnLfT59ZZRtEU0qE573aHKiH/5vZcRZrn6wj+G8jcKlTRd9VwTth6RP+3EUMD1D/yLHqT532oSPvFS0CwOmYc0tUvYyLg7WE2ftTAekTRDSFC2VLtgpW0FyQLoBuPQzHfnndUNLbSK8JafW0T2hY164wcMTq3oo5ETY89GOy/wCFpj0WTVBy0ON3lIvMTq1YOYINytdGLVEsFCuvvnspD+QkNXbF+EgQZBt3DMJgUrUJ0MF4H6LW3ZOkdFEPj97vXFosd8AaQ1ivxTHpWD/OQ+mjI= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 15:11:17.8602 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 70ebd46b-c4aa-40dd-3669-08d99249890c 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: AM5EUR03FT010.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1656 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: sfVtCq2J54fvOPX7HdPcZMVgx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634569884; bh=gYSDCWMVy8nOKpgIzi+xZYAdctPhsWlZdde28T601ow=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=YU8vHgkHrWqH88H4l31hI4T0RJUjr1p8PU096d9CEq/IzUthon9c21t4QwjIlABVc6a QjghMOWOr3fQYmZ0d3KmGcP8LCBh9YVpduDRCq63r30xDk4836SdhT6y5+GmPuB/rMYtm 4bMcNBu+0npLn0OOnDtgixblr3kU59z/qYU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634569885202100004 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 --- DynamicTablesPkg/Include/ArmNameSpaceObjects.h | 4 +- DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c | 102 +++= +++++++++++++++-- 2 files changed, 96 insertions(+), 10 deletions(-) diff --git a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h b/DynamicTables= Pkg/Include/ArmNameSpaceObjects.h index 6bc5ab6b2b28424c1afddc26cc89a54b81941aeb..6e27158d720947efb22a350a7e5= ffcfdd3005361 100644 --- a/DynamicTablesPkg/Include/ArmNameSpaceObjects.h +++ b/DynamicTablesPkg/Include/ArmNameSpaceObjects.h @@ -740,10 +740,12 @@ typedef struct CmArmCacheInfo { /// PPTT_ARM_CCIDX_CACHE_ASSOCIATIVITY_MAX. Therfore this field /// is 32-bit wide. UINT32 Associativity; - /// Cache attributes (ACPI 6.3 - January 2019, PPTT, Table 5-156) + /// Cache attributes (ACPI 6.4 - January 2021, PPTT, Table 5.140) UINT8 Attributes; /// Line size in bytes UINT16 LineSize; + /// Unique ID for the cache + UINT32 CacheId; } CM_ARM_CACHE_INFO; =20 /** A structure that describes a reference to another Configuration Manager diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator= .c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c index 18f093998db57ea4698953ed06a9826df559c1b7..0c22de11c584cfebfcc1600d862= 90c758a99140a 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiPpttLibArm/PpttGenerator.c @@ -722,6 +722,35 @@ AddProcHierarchyNodes ( return Status; } =20 +/** + Test whether CacheId is unique among the CacheIdList. + + @param [in] CacheId Cache ID to check. + @param [in] CacheIdList List of already existing cache IDs. + @param [in] CacheIdListSize Size of CacheIdList. + + @retval TRUE CacheId does not exist in CacheIdList. + @retval FALSE CacheId already exists in CacheIdList. +**/ +STATIC +EFI_STATUS +IsCacheIdUnique( + IN CONST UINT32 CacheId, + IN CONST UINT32 *CacheIdList, + IN CONST UINT32 CacheIdListSize + ) +{ + UINT32 Index; + + for (Index =3D 0; Index < CacheIdListSize; Index++) { + if (CacheIdList[Index] =3D=3D CacheId) { + return FALSE; + } + } + + return TRUE; +} + /** Update the Cache Type Structure (Type 1) information. =20 @@ -734,10 +763,12 @@ AddProcHierarchyNodes ( @param [in] Pptt Pointer to PPTT table structure. @param [in] NodesStartOffset Offset from the start of PPTT table to= the start of Cache Type Structures. + @param [in] Revision Revision of the PPTT table being reque= sted. =20 @retval EFI_SUCCESS Structures updated successfully. @retval EFI_INVALID_PARAMETER A parameter is invalid. @retval EFI_NOT_FOUND A required object was not found. + @retval EFI_OUT_OF_RESOURCES Out of resources. **/ STATIC EFI_STATUS @@ -745,7 +776,8 @@ AddCacheTypeStructures ( IN CONST ACPI_PPTT_GENERATOR * CONST Generator, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL * CONST CfgMgrProtocol, IN CONST EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_HEADER * Pptt, - IN CONST UINT32 NodesStartOffset + IN CONST UINT32 NodesStartOffset, + IN CONST UINT32 Revision ) { EFI_STATUS Status; @@ -754,6 +786,9 @@ AddCacheTypeStructures ( CM_ARM_CACHE_INFO * CacheInfoNode; PPTT_NODE_INDEXER * CacheNodeIterator; UINT32 NodeCount; + BOOLEAN CacheIdUnique; + UINT32 TotalNodeCount; + UINT32 * FoundCacheIds; =20 ASSERT ( (Generator !=3D NULL) && @@ -766,6 +801,13 @@ AddCacheTypeStructures ( =20 CacheNodeIterator =3D Generator->CacheStructIndexedList; NodeCount =3D Generator->CacheStructCount; + TotalNodeCount =3D NodeCount; + + FoundCacheIds =3D AllocateZeroPool (TotalNodeCount * sizeof (*FoundCache= Ids)); + if (FoundCacheIds =3D=3D NULL) { + DEBUG ((DEBUG_ERROR, "ERROR: PPTT: Failed to allocate resources.\n")); + return EFI_OUT_OF_RESOURCES; + } =20 while (NodeCount-- !=3D 0) { CacheInfoNode =3D (CM_ARM_CACHE_INFO*)CacheNodeIterator->Object; @@ -785,6 +827,7 @@ AddCacheTypeStructures ( CacheStruct->Flags.CacheTypeValid =3D 1; CacheStruct->Flags.WritePolicyValid =3D 1; CacheStruct->Flags.LineSizeValid =3D 1; + CacheStruct->Flags.CacheIdValid =3D 1; CacheStruct->Flags.Reserved =3D 0; =20 // Populate the reference to the next level of cache @@ -807,7 +850,7 @@ AddCacheTypeStructures ( CacheInfoNode->Token, Status )); - return Status; + goto cleanup; } =20 // Update Cache Structure with the offset for the next level of cache @@ -831,7 +874,7 @@ AddCacheTypeStructures ( CacheInfoNode->NumberOfSets, Status )); - return Status; + goto cleanup; } =20 if (CacheInfoNode->NumberOfSets > PPTT_ARM_CACHE_NUMBER_OF_SETS_MAX) { @@ -858,7 +901,7 @@ AddCacheTypeStructures ( CacheInfoNode->Associativity, Status )); - return Status; + goto cleanup; } =20 // Validate the Associativity field based on the architecture specific= ation @@ -877,7 +920,7 @@ AddCacheTypeStructures ( CacheInfoNode->Associativity, Status )); - return Status; + goto cleanup; } =20 if (CacheInfoNode->Associativity > PPTT_ARM_CACHE_ASSOCIATIVITY_MAX) { @@ -918,7 +961,7 @@ AddCacheTypeStructures ( CacheInfoNode->LineSize, Status )); - return Status; + goto cleanup; } =20 if ((CacheInfoNode->LineSize & (CacheInfoNode->LineSize - 1)) !=3D 0) { @@ -930,18 +973,58 @@ AddCacheTypeStructures ( CacheInfoNode->LineSize, Status )); - return Status; + goto cleanup; } =20 CacheStruct->LineSize =3D CacheInfoNode->LineSize; =20 + if (Revision >=3D 3) { + // Validate and populate cache id + if (CacheInfoNode->CacheId =3D=3D 0) { + Status =3D EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: PPTT: The cache id cannot be zero. Status =3D %r\n", + Status + )); + goto cleanup; + } + + CacheIdUnique =3D IsCacheIdUnique ( + CacheInfoNode->CacheId, + FoundCacheIds, + TotalNodeCount + ); + if (!CacheIdUnique) { + Status =3D EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: PPTT: The cache id is not unique. " \ + "CacheId =3D %d. Status =3D %r\n", + CacheInfoNode->CacheId, + Status + )); + goto cleanup; + } + + // Store the cache id so we can check future cache ids for uniqueness + FoundCacheIds[NodeCount] =3D CacheInfoNode->CacheId; + + CacheStruct->CacheId =3D CacheInfoNode->CacheId; + } + // Next Cache Type Structure CacheStruct =3D (EFI_ACPI_6_4_PPTT_STRUCTURE_CACHE*)((UINT8*)CacheStru= ct + CacheStruct->Length); CacheNodeIterator++; } // Cache Type Structure =20 - return EFI_SUCCESS; + Status =3D EFI_SUCCESS; + +cleanup: + FreePool (FoundCacheIds); + + return Status; } =20 /** @@ -1200,7 +1283,8 @@ BuildPpttTable ( Generator, CfgMgrProtocol, Pptt, - CacheStructOffset + CacheStructOffset, + AcpiTableInfo->AcpiTableRevision ); if (EFI_ERROR (Status)) { DEBUG (( --=20 Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#82235): https://edk2.groups.io/g/devel/message/82235 Mute This Topic: https://groups.io/mt/86416278/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-