From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (EUR05-DB8-obe.outbound.protection.outlook.com [40.107.20.71]) by mx.groups.io with SMTP id smtpd.web09.4385.1657101462435545902 for ; Wed, 06 Jul 2022 02:57:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=DzqW2PtO; spf=pass (domain: arm.com, ip: 40.107.20.71, mailfrom: sami.mujawar@arm.com) ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=d7JMzvL3YTzEVilb1VQOZfltuZV3Lz79e/ZzjsDNq2+n1+HShT8q4e5SsjxAj4ifW0nEhdvwc1Ot2fztjfFxNs6E9NMjGFYwszdUMs3D1zGmuxTEnm6zSBBsxri1RhhvKK+yFzC2v4xCyM/LdYpBIpjk6dKbiUQFq1WnRfkVO1OGtbU+KqbCXoHzg0nEeGahLsuIbeA2KeUtXSydhxdy/zuThgj/n/p8mpu4sVCZMocM8Q0wKD2DaSuxBjrzQmJ46jty8fDPSRlXgxg2dqO5/lvh7cSq04AAKYszSqLuqoEtvDPHemdnDxNXPu6FEyKOdncPK5bjR+vIv28wg4Auxg== ARC-Message-Signature: i=2; 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=f/qUUehoc1HyfkmJVuRX47/ZXtMd9lR8hqlBfIXJYFs=; b=awbzGd/GrtPWF8Fqlhh9mkEZgaru3VI04zih5jYYFiVabkneL/Oj603TLkwyh3Ukfb25pjqFFVYwrqZFVsZdjRt+IXKbY6lGu8hH5DStgDlW74A9HwcpqKDF9Vcg/krFtNYQOgwDqtIIGvbwlBfrmRcGTvG8Oz36nDjLJUiPokb7D22+iUqee1MWzlR2ampDVPz5aRbV16DQDW4IPDWYsTkP64Nn+gtLcjaFQD+4gyktJk0BGzwAXWUcp9kiIMOmrICdBwsjNFKihp+Ci052afbeG2VaOK7IX8YcZDXpwaS23POAPJBdJ3zdOa5N5D6uys8sqw4UgmpmIWn1Dmc5QA== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dmarc=[1,1,header.from=arm.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=f/qUUehoc1HyfkmJVuRX47/ZXtMd9lR8hqlBfIXJYFs=; b=DzqW2PtOSetYCwYgtvBcOwDabgG3HjGV5tHwzo5WUgBk/ka+jJnMGGPYXfZAS5UZWOiak45ueOW8MxT8x5Q0etXLPi4CZpFnOEa00nxgFyMklqUs8LGEQKs/h6sowML7frAyYoVSIS4C2Nhlyn7+HcFJhSLDsNoFGWSHrWrRa94= Received: from AS8P250CA0021.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:330::26) by AS8PR08MB6904.eurprd08.prod.outlook.com (2603:10a6:20b:394::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.15; Wed, 6 Jul 2022 09:57:38 +0000 Received: from AM5EUR03FT049.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:330:cafe::4b) by AS8P250CA0021.outlook.office365.com (2603:10a6:20b:330::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15 via Frontend Transport; Wed, 6 Jul 2022 09:57:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (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; pr=C 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.5417.15 via Frontend Transport; Wed, 6 Jul 2022 09:57:38 +0000 Received: ("Tessian outbound afad550a20c6:v122"); Wed, 06 Jul 2022 09:57:38 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 0d7b427f01ad9dd3 X-CR-MTA-TID: 64aa7808 Received: from abc80f3510a3.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id E85A66EA-F6F0-4CF5-AA27-1115F1F50B27.1; Wed, 06 Jul 2022 09:57:31 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id abc80f3510a3.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 06 Jul 2022 09:57:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JLFgft75MPFvTk8uL7+pmSlTnirBkM/C1rf/hC4bZdwpUsV1d7FTQGiDcZK1+FwA3Qky+wi2WDnxQ5PWOqX8Zo1o8C2tz9cGFVQoJt3O9Bzwj/QCA33BIhCIwNnJhkmMWJIeLM+sA8yCafDRMCXQ8fxoP463aj12EXirZ/v4mV4zL8/fRxOCtm1Pw81+Pobf2nSpXpVT7DFHynkPC4wQjAAH92Kai6IwzhZO1ZobOgcAw87x6MC5jKzIGZN0ApWO/1NDgTBzJXQqawO4TZtRLmlQRnRZjopqUEmPd0XTmhsi0rO1th9TZLHjVAkFXM1cIK7Jfv3Wv4RFOLJp3UtahQ== 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=f/qUUehoc1HyfkmJVuRX47/ZXtMd9lR8hqlBfIXJYFs=; b=W0IPuldkB9fWpyHTS92R2EPPJ9pesoT78mIGIdVFeaBBVxDW1D0Z0SM51sV2wQlQ58EoEL9D8BTQQduGa50idyKjd7bZ3yx653iJLu61FeXDLcoC2guyjcamITSImF/0e5mZi/iPUsOqDZgVJcho4N3j89A2vlLnDwdDYH5CNzwnI9mgh6iVA8mPMqVq0mhKhHdgOa/RV7lzIRp06ImZJnJN+F73DAU83HaD3a+N8e6L8uKbl8Lfdw4qfPBVN7gxxVXE8xYwTUBkvfMqGl9g6tLHL8XXRfNdnzo4YF6UocoYRgqZffNRoPT70BoEuxda50kDsBmGJfGq8MMwKBvgKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=f/qUUehoc1HyfkmJVuRX47/ZXtMd9lR8hqlBfIXJYFs=; b=DzqW2PtOSetYCwYgtvBcOwDabgG3HjGV5tHwzo5WUgBk/ka+jJnMGGPYXfZAS5UZWOiak45ueOW8MxT8x5Q0etXLPi4CZpFnOEa00nxgFyMklqUs8LGEQKs/h6sowML7frAyYoVSIS4C2Nhlyn7+HcFJhSLDsNoFGWSHrWrRa94= Received: from AM7PR04CA0021.eurprd04.prod.outlook.com (2603:10a6:20b:110::31) by DB9PR08MB6747.eurprd08.prod.outlook.com (2603:10a6:10:26e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15; Wed, 6 Jul 2022 09:57:25 +0000 Received: from VE1EUR03FT039.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:110:cafe::e9) by AM7PR04CA0021.outlook.office365.com (2603:10a6:20b:110::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15 via Frontend Transport; Wed, 6 Jul 2022 09:57:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; pr=C Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT039.mail.protection.outlook.com (10.152.19.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5395.14 via Frontend Transport; Wed, 6 Jul 2022 09:57:24 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9; Wed, 6 Jul 2022 09:56:37 +0000 Received: from E114225.Arm.com (10.1.196.36) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.9 via Frontend Transport; Wed, 6 Jul 2022 09:56:37 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , , , Subject: [PATCH 8/8] DynamicTablesPkg: IORT generator updates for Rev E.d spec Date: Wed, 6 Jul 2022 10:56:31 +0100 Message-ID: <20220706095631.27196-9-sami.mujawar@arm.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20220706095631.27196-1-sami.mujawar@arm.com> References: <20220706095631.27196-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: fc80a544-0e9d-4615-4985-08da5f35f5c9 X-MS-TrafficTypeDiagnostic: DB9PR08MB6747:EE_|AM5EUR03FT049:EE_|AS8PR08MB6904:EE_ x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 5GsahuXQLOB07BMQU8qY60vWK8Af/jfWtZqqVpNnK8bD2T6dYt0/Ae5ixErHNyPxpErXw6ASRZkVwzaFqmuw+TESBToC5VVStGIKC4ZRrmiZnD4+RytZ/L7Mqwrne60/H2D8Zv/hlQRg6Y0t9xxIE78vcYZ1cZkr/aru+uR5Ci3PtBvqqGv72c5aY55fqMGViwMdlZ8WE9Wn8s4Y8/GhlZqwXz0yFisiTp9/srypuc7tlVor3UMvpf8AlgCgAXCaubbLaj9es+Bo0Gi/JPPTixfpYo1sw6xxtdjBd4kQVR8dI5+Cw3O/FRYVW1++F25tA03zbEv+w3CWwCkRoDCx/ANCuat+3eob/EqkvBpCYUZLfKK4NDwkBQzuv4By6AEKSx53SiJ/aqzuky81RbkwOD8NqV85z6Y1misrg3ll6Jyi077pIzLMhN4WwijY5ilWfFAXBDIsOXe5QDQ6zabe6Wvz8HhBURQamO4VnQNTfLWVOz0zzaEGb2z4dNHFfLEXfeZwzfCxHwSNKSatCJDkF6R517cxPzy8njaDQSN3VyL0cxMfoKyB1TYX+QTDPcfW/RKZcZWKLf8yv5o2peT+/orYasnNCSGA1XVxfmQaRl5aJLd0eT18iHdJSJw9X/Kr9RVFWHKCw6vBYzmKu8H6Y8ztmcr3kzDC0AqRbXbBiDyeNKU+FET2aBDyzX7ezMpKf6BbuphuwfzZGJW2PHMz6uJjhNvyt9qMjAO2fpmNX2wCppz8fq+gqh3dsXZZo3C19/7aWv1pTDolZ2Bv20rXbXVm6rSOfowiaKQ+qsCG6aSr49tvq+Y3RPUmtlsUYwRRHD+lnfXH0dPj73ITCtWfowwyT2UKzE9W6ioY8Xwhw9HYXdN5L7zprzwyS0aNRTdi3JDLOAdgjY6L0lO1yp4va25mz6HIzf+B15Wl7c0N37c= 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:(13230016)(4636009)(376002)(39860400002)(346002)(396003)(136003)(46966006)(40470700004)(36840700001)(2906002)(36860700001)(41300700001)(15650500001)(2616005)(6666004)(40480700001)(1076003)(82310400005)(316002)(19627235002)(36756003)(426003)(54906003)(6916009)(7696005)(70586007)(70206006)(8676002)(4326008)(86362001)(47076005)(478600001)(186003)(83380400001)(336012)(82740400003)(81166007)(356005)(26005)(40460700003)(966005)(8936002)(5660300002)(44832011)(30864003)(36900700001)(579004);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6747 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT049.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 91d4d989-e2d3-4b68-94dd-08da5f35ed5b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hfT/bajNj4E57gAHtxR56OEsCdFyrUwJRNtf3hkqWlc4TkMvLQpyxWvZK28NLiNR8R7JdtqzSTYSnWMYP+nu1ReO/CZluukyE2WqdnuSZZXwfgBTA85y+LeeFOt9W3ZI4NzOZ1a6FFmEbHNnjWquZOFUCHpWnTLV/6lE1lzkL5fY4IDJDH7aV8PeQbu7+5GsoihSdSyh1lnb+2tYxM3MJSHfbvCuqWRSfXkA5DAXHFPZcrPuIPo3obFbSsnNUwK+tTNV1aDQZuG6KmmPwgLgFtCXMWPeVaOVXKeBeC2Cly/Bt/rFA1WiDEFg6KQDMleI9yw5jIOhbYhMK62ojc4Lm+wUOkAvwZ/0vUct5YeIbjOQ+UDrdtUAlZ8AxVO8EY0F414j3mwqDJaMcaRUi9fmuYlDDPeVY8WE+RHAY+pce5XXLjuVQFEbmVZ/kNfXXNSMMReHtlB5nQkz2OhXzAI/fDGVIb/RhrwCkNyYfey6Achgr9+n6ZmUu6OcDXFwdFR0iRSDFM8UCAvlsAb1cAQnENPgG4lPUq5Y0+U2dR0EKCre1AbTXXJgpYt5bzjjw5tlLmkjN4Ak7bIlfzL9awT8F0hyinjSsnZrXgzJaxgReyI2J6/eqGZlTNd8GG+/YQPHQx6e3DJ2g5yhwHxVHg/ARuWOrpSpC/UXPNEWxbTbDm2T4UFOdMCQ+Vrba+zBDlbM3lWEP66QDJq9DDYNjIIKn1iLxXGMnoAcySiXxaubKQ7MPjjjg+TXTAsAtLrnc+uK2PRUAk4i3pncoJBGrOZhAXo7JIDdH+H5BjHclRKoiBo4Npefa7YKKTv3zwuVTEXUdvhM8N2KzfdXcfx09sVapEP30Vf2VODlL0Cj8NeDeEve5p6cXDfQj3xwGMPBm7gujSYYfJhZneVj7Hk5jqfEeA== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230016)(4636009)(396003)(346002)(376002)(136003)(39860400002)(46966006)(40470700004)(36840700001)(36756003)(40460700003)(26005)(7696005)(2616005)(186003)(83380400001)(82740400003)(336012)(478600001)(1076003)(40480700001)(44832011)(15650500001)(2906002)(966005)(4326008)(8676002)(70586007)(30864003)(70206006)(54906003)(82310400005)(41300700001)(86362001)(8936002)(81166007)(5660300002)(426003)(36860700001)(6666004)(6916009)(47076005)(19627235002)(316002)(579004);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2022 09:57:38.6923 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fc80a544-0e9d-4615-4985-08da5f35f5c9 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: AS8PR08MB6904 Content-Type: text/plain Bugzilla: 3458 - Add support IORT Rev E.d specification updates (https://bugzilla.tianocore.org/show_bug.cgi?id=3458) The IO Remapping Table, Platform Design Document, Revision E.d, Feb 2022 (https://developer.arm.com/documentation/den0049/) introduces the following updates, collectively including the updates and errata fixes to Rev E, Rev E.a, Rev E.b, Rev E.c: - increments the IORT table revision to 5. - updates the node definition to add an 'Identifier' field. - adds definition of node type 6 - Reserved Memory Range node. - adds definition for Memory Range Descriptors. - adds flag to indicate PRI support for root complexes. - adds flag to indicate if the root complex supports forwarding of PASID information on translated transactions to the SMMU. - adds flag to indicate if the root complex supports PASID. - adds flags to define access privilege and attributes for the memory ranges. Therefore, update the IORT generator to: - increment IORT table revision count to 5. - populate Identifier filed if revision is greater than 4. - add support to populate Reserved Memory Range nodes and the Memory range descriptors. - add validation to check that the Identifier field is unique. - Populate the PASID capabilities and Flags field of the Root complex node. Signed-off-by: Sami Mujawar --- Notes: v4: - Update IORT generator to support spec revision E.d [SAMI] - Populate the PASID capabilities and Flags field of the [SAMI] Root complex node. v3: - Move error handling for IdMappingToken. [PIERRE] - Moved error handling for IdMappingToken in a separate [SAMI] patch in v3 series. Ref: https://edk2.groups.io/g/devel/topic/83600726#76661 v2: - The macro EFI_ACPI_IO_REMAPPING_TABLE_REVISION was set to [SAMI] Rev 0 as setting to Rev 3 will break existing platforms. Therefore, set the max supported IORT generator revision to 3. DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c | 630 ++++++++++++++++++-- DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.h | 5 +- 2 files changed, 583 insertions(+), 52 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c index abef9e5a7f90a38e1d697227d3cd2c110db364a4..a3700cd31b72151ed287568277971e7ed8c57295 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c @@ -5,8 +5,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent @par Reference(s): - - IO Remapping Table, Platform Design Document, - Document number: ARM DEN 0049D, Issue D, March 2018 + - IO Remapping Table, Platform Design Document, Revision E.d, Feb 2022 + (https://developer.arm.com/documentation/den0049/) **/ @@ -37,9 +37,11 @@ Requirements: - EArmObjSmmuV1SmmuV2 - EArmObjSmmuV3 - EArmObjPmcg + - EArmObjRmr - EArmObjGicItsIdentifierArray - EArmObjIdMappingArray - - EArmObjGicItsIdentifierArray + - EArmObjSmmuInterruptArray + - EArmObjMemoryRangeDescriptor */ /** This macro expands to a function that retrieves the ITS @@ -96,6 +98,24 @@ GET_OBJECT_LIST ( CM_ARM_PMCG_NODE ); +/** This macro expands to a function that retrieves the + RMR node information from the Configuration Manager. +*/ +GET_OBJECT_LIST ( + EObjNameSpaceArm, + EArmObjRmr, + CM_ARM_RMR_NODE + ); + +/** This macro expands to a function that retrieves the + Memory Range Descriptor Array information from the Configuration Manager. +*/ +GET_OBJECT_LIST ( + EObjNameSpaceArm, + EArmObjMemoryRangeDescriptor, + CM_ARM_MEMORY_RANGE_DESCRIPTOR + ); + /** This macro expands to a function that retrieves the ITS Identifier Array information from the Configuration Manager. */ @@ -174,16 +194,19 @@ GetSizeofItsGroupNodes ( Size = 0; while (NodeCount-- != 0) { - (*NodeIndexer)->Token = NodeList->Token; - (*NodeIndexer)->Object = (VOID *)NodeList; - (*NodeIndexer)->Offset = (UINT32)(Size + NodeStartOffset); + (*NodeIndexer)->Token = NodeList->Token; + (*NodeIndexer)->Object = (VOID *)NodeList; + (*NodeIndexer)->Offset = (UINT32)(Size + NodeStartOffset); + (*NodeIndexer)->Identifier = NodeList->Identifier; DEBUG (( DEBUG_INFO, - "IORT: Node Indexer = %p, Token = %p, Object = %p, Offset = 0x%x\n", + "IORT: Node Indexer = %p, Token = %p, Object = %p," + " Offset = 0x%x, Identifier = 0x%x\n", *NodeIndexer, (*NodeIndexer)->Token, (*NodeIndexer)->Object, - (*NodeIndexer)->Offset + (*NodeIndexer)->Offset, + (*NodeIndexer)->Identifier )); Size += GetItsGroupNodeSize (NodeList); @@ -248,16 +271,19 @@ GetSizeofNamedComponentNodes ( Size = 0; while (NodeCount-- != 0) { - (*NodeIndexer)->Token = NodeList->Token; - (*NodeIndexer)->Object = (VOID *)NodeList; - (*NodeIndexer)->Offset = (UINT32)(Size + NodeStartOffset); + (*NodeIndexer)->Token = NodeList->Token; + (*NodeIndexer)->Object = (VOID *)NodeList; + (*NodeIndexer)->Offset = (UINT32)(Size + NodeStartOffset); + (*NodeIndexer)->Identifier = NodeList->Identifier; DEBUG (( DEBUG_INFO, - "IORT: Node Indexer = %p, Token = %p, Object = %p, Offset = 0x%x\n", + "IORT: Node Indexer = %p, Token = %p, Object = %p," + " Offset = 0x%x, Identifier = 0x%x\n", *NodeIndexer, (*NodeIndexer)->Token, (*NodeIndexer)->Object, - (*NodeIndexer)->Offset + (*NodeIndexer)->Offset, + (*NodeIndexer)->Identifier )); Size += GetNamedComponentNodeSize (NodeList); @@ -320,16 +346,19 @@ GetSizeofRootComplexNodes ( Size = 0; while (NodeCount-- != 0) { - (*NodeIndexer)->Token = NodeList->Token; - (*NodeIndexer)->Object = (VOID *)NodeList; - (*NodeIndexer)->Offset = (UINT32)(Size + NodeStartOffset); + (*NodeIndexer)->Token = NodeList->Token; + (*NodeIndexer)->Object = (VOID *)NodeList; + (*NodeIndexer)->Offset = (UINT32)(Size + NodeStartOffset); + (*NodeIndexer)->Identifier = NodeList->Identifier; DEBUG (( DEBUG_INFO, - "IORT: Node Indexer = %p, Token = %p, Object = %p, Offset = 0x%x\n", + "IORT: Node Indexer = %p, Token = %p, Object = %p," + " Offset = 0x%x, Identifier = 0x%x\n", *NodeIndexer, (*NodeIndexer)->Token, (*NodeIndexer)->Object, - (*NodeIndexer)->Offset + (*NodeIndexer)->Offset, + (*NodeIndexer)->Identifier )); Size += GetRootComplexNodeSize (NodeList); @@ -398,16 +427,19 @@ GetSizeofSmmuV1V2Nodes ( Size = 0; while (NodeCount-- != 0) { - (*NodeIndexer)->Token = NodeList->Token; - (*NodeIndexer)->Object = (VOID *)NodeList; - (*NodeIndexer)->Offset = (UINT32)(Size + NodeStartOffset); + (*NodeIndexer)->Token = NodeList->Token; + (*NodeIndexer)->Object = (VOID *)NodeList; + (*NodeIndexer)->Offset = (UINT32)(Size + NodeStartOffset); + (*NodeIndexer)->Identifier = NodeList->Identifier; DEBUG (( DEBUG_INFO, - "IORT: Node Indexer = %p, Token = %p, Object = %p, Offset = 0x%x\n", + "IORT: Node Indexer = %p, Token = %p, Object = %p," + " Offset = 0x%x, Identifier = 0x%x\n", *NodeIndexer, (*NodeIndexer)->Token, (*NodeIndexer)->Object, - (*NodeIndexer)->Offset + (*NodeIndexer)->Offset, + (*NodeIndexer)->Identifier )); Size += GetSmmuV1V2NodeSize (NodeList); @@ -470,16 +502,19 @@ GetSizeofSmmuV3Nodes ( Size = 0; while (NodeCount-- != 0) { - (*NodeIndexer)->Token = NodeList->Token; - (*NodeIndexer)->Object = (VOID *)NodeList; - (*NodeIndexer)->Offset = (UINT32)(Size + NodeStartOffset); + (*NodeIndexer)->Token = NodeList->Token; + (*NodeIndexer)->Object = (VOID *)NodeList; + (*NodeIndexer)->Offset = (UINT32)(Size + NodeStartOffset); + (*NodeIndexer)->Identifier = NodeList->Identifier; DEBUG (( DEBUG_INFO, - "IORT: Node Indexer = %p, Token = %p, Object = %p, Offset = 0x%x\n", + "IORT: Node Indexer = %p, Token = %p, Object = %p," + " Offset = 0x%x, Identifier = 0x%x\n", *NodeIndexer, (*NodeIndexer)->Token, (*NodeIndexer)->Object, - (*NodeIndexer)->Offset + (*NodeIndexer)->Offset, + (*NodeIndexer)->Identifier )); Size += GetSmmuV3NodeSize (NodeList); @@ -542,16 +577,19 @@ GetSizeofPmcgNodes ( Size = 0; while (NodeCount-- != 0) { - (*NodeIndexer)->Token = NodeList->Token; - (*NodeIndexer)->Object = (VOID *)NodeList; - (*NodeIndexer)->Offset = (UINT32)(Size + NodeStartOffset); + (*NodeIndexer)->Token = NodeList->Token; + (*NodeIndexer)->Object = (VOID *)NodeList; + (*NodeIndexer)->Offset = (UINT32)(Size + NodeStartOffset); + (*NodeIndexer)->Identifier = NodeList->Identifier; DEBUG (( DEBUG_INFO, - "IORT: Node Indexer = %p, Token = %p, Object = %p, Offset = 0x%x\n", + "IORT: Node Indexer = %p, Token = %p, Object = %p," + " Offset = 0x%x, Identifier = 0x%x\n", *NodeIndexer, (*NodeIndexer)->Token, (*NodeIndexer)->Object, - (*NodeIndexer)->Offset + (*NodeIndexer)->Offset, + (*NodeIndexer)->Identifier )); Size += GetPmcgNodeSize (NodeList); @@ -562,6 +600,84 @@ GetSizeofPmcgNodes ( return Size; } +/** Returns the size of the RMR node. + + @param [in] Node Pointer to RMR node. + + @retval Size of the RMR node. +**/ +STATIC +UINT32 +GetRmrNodeSize ( + IN CONST CM_ARM_RMR_NODE *Node + ) +{ + ASSERT (Node != NULL); + + /* Size of RMR node + + Size of ID mapping array + + Size of Memory Range Descriptor array + */ + return (UINT32)(sizeof (EFI_ACPI_6_0_IO_REMAPPING_RMR_NODE) + + (Node->IdMappingCount * + sizeof (EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE)) + + (Node->MemRangeDescCount * + sizeof (EFI_ACPI_6_0_IO_REMAPPING_MEM_RANGE_DESC))); +} + +/** Returns the total size required for the RMR nodes and + updates the Node Indexer. + + This function calculates the size required for the node group + and also populates the Node Indexer array with offsets for the + individual nodes. + + @param [in] NodeStartOffset Offset from the start of the + IORT where this node group starts. + @param [in] NodeList Pointer to RMR node list. + @param [in] NodeCount Count of the RMR nodes. + @param [in, out] NodeIndexer Pointer to the next Node Indexer. + + @retval Total size of the RMR nodes. +**/ +STATIC +UINT64 +GetSizeofRmrNodes ( + IN CONST UINT32 NodeStartOffset, + IN CONST CM_ARM_RMR_NODE *NodeList, + IN UINT32 NodeCount, + IN OUT IORT_NODE_INDEXER **CONST NodeIndexer + ) +{ + UINT64 Size; + + ASSERT (NodeList != NULL); + + Size = 0; + while (NodeCount-- != 0) { + (*NodeIndexer)->Token = NodeList->Token; + (*NodeIndexer)->Object = (VOID *)NodeList; + (*NodeIndexer)->Offset = (UINT32)(Size + NodeStartOffset); + (*NodeIndexer)->Identifier = NodeList->Identifier; + DEBUG (( + DEBUG_INFO, + "IORT: Node Indexer = %p, Token = %p, Object = %p," + " Offset = 0x%x, Identifier = 0x%x\n", + *NodeIndexer, + (*NodeIndexer)->Token, + (*NodeIndexer)->Object, + (*NodeIndexer)->Offset, + (*NodeIndexer)->Identifier + )); + + Size += GetRmrNodeSize (NodeList); + (*NodeIndexer)++; + NodeList++; + } + + return Size; +} + /** Returns the offset of the Node referenced by the Token. @param [in] NodeIndexer Pointer to node indexer array. @@ -713,6 +829,7 @@ AddIdMappingArray ( @param [in] This Pointer to the table Generator. @param [in] CfgMgrProtocol Pointer to the Configuration Manager Protocol Interface. + @param [in] AcpiTableInfo Pointer to the ACPI table info structure. @param [in] Iort Pointer to IORT table structure. @param [in] NodesStartOffset Offset for the start of the ITS Group Nodes. @@ -729,6 +846,7 @@ EFI_STATUS AddItsGroupNodes ( IN CONST ACPI_TABLE_GENERATOR *CONST This, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol, + IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo, IN CONST EFI_ACPI_6_0_IO_REMAPPING_TABLE *Iort, IN CONST UINT32 NodesStartOffset, IN CONST CM_ARM_ITS_GROUP_NODE *NodeList, @@ -765,11 +883,17 @@ AddItsGroupNodes ( // Populate the node header ItsGroupNode->Node.Type = EFI_ACPI_IORT_TYPE_ITS_GROUP; ItsGroupNode->Node.Length = (UINT16)NodeLength; - ItsGroupNode->Node.Revision = 0; - ItsGroupNode->Node.Reserved = EFI_ACPI_RESERVED_DWORD; ItsGroupNode->Node.NumIdMappings = 0; ItsGroupNode->Node.IdReference = 0; + if (AcpiTableInfo->AcpiTableRevision < EFI_ACPI_IO_REMAPPING_TABLE_REV5) { + ItsGroupNode->Node.Revision = 0; + ItsGroupNode->Node.Identifier = EFI_ACPI_RESERVED_DWORD; + } else { + ItsGroupNode->Node.Revision = 1; + ItsGroupNode->Node.Identifier = NodeList->Identifier; + } + // IORT specific data ItsGroupNode->NumItsIdentifiers = NodeList->ItsIdCount; ItsIds = (UINT32 *)((UINT8 *)ItsGroupNode + @@ -820,6 +944,7 @@ AddItsGroupNodes ( @param [in] This Pointer to the table Generator. @param [in] CfgMgrProtocol Pointer to the Configuration Manager Protocol Interface. + @param [in] AcpiTableInfo Pointer to the ACPI table info structure. @param [in] Iort Pointer to IORT table structure. @param [in] NodesStartOffset Offset for the start of the Named Component Nodes. @@ -836,6 +961,7 @@ EFI_STATUS AddNamedComponentNodes ( IN CONST ACPI_TABLE_GENERATOR *CONST This, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol, + IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo, IN CONST EFI_ACPI_6_0_IO_REMAPPING_TABLE *Iort, IN CONST UINT32 NodesStartOffset, IN CONST CM_ARM_NAMED_COMPONENT_NODE *NodeList, @@ -871,10 +997,16 @@ AddNamedComponentNodes ( // Populate the node header NcNode->Node.Type = EFI_ACPI_IORT_TYPE_NAMED_COMP; NcNode->Node.Length = (UINT16)NodeLength; - NcNode->Node.Revision = 2; - NcNode->Node.Reserved = EFI_ACPI_RESERVED_DWORD; NcNode->Node.NumIdMappings = NodeList->IdMappingCount; + if (AcpiTableInfo->AcpiTableRevision < EFI_ACPI_IO_REMAPPING_TABLE_REV5) { + NcNode->Node.Revision = 2; + NcNode->Node.Identifier = EFI_ACPI_RESERVED_DWORD; + } else { + NcNode->Node.Revision = 4; + NcNode->Node.Identifier = NodeList->Identifier; + } + ObjectNameLength = AsciiStrLen (NodeList->ObjectName) + 1; NcNode->Node.IdReference = (NodeList->IdMappingCount == 0) ? 0 : ((UINT32)(sizeof (EFI_ACPI_6_0_IO_REMAPPING_NAMED_COMP_NODE) + @@ -955,6 +1087,7 @@ AddNamedComponentNodes ( @param [in] This Pointer to the table Generator. @param [in] CfgMgrProtocol Pointer to the Configuration Manager Protocol Interface. + @param [in] AcpiTableInfo Pointer to the ACPI table info structure. @param [in] Iort Pointer to IORT table structure. @param [in] NodesStartOffset Offset for the start of the Root Complex Nodes. @@ -971,6 +1104,7 @@ EFI_STATUS AddRootComplexNodes ( IN CONST ACPI_TABLE_GENERATOR *CONST This, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol, + IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo, IN CONST EFI_ACPI_6_0_IO_REMAPPING_TABLE *Iort, IN CONST UINT32 NodesStartOffset, IN CONST CM_ARM_ROOT_COMPLEX_NODE *NodeList, @@ -1004,12 +1138,20 @@ AddRootComplexNodes ( // Populate the node header RcNode->Node.Type = EFI_ACPI_IORT_TYPE_ROOT_COMPLEX; RcNode->Node.Length = (UINT16)NodeLength; - RcNode->Node.Revision = 1; - RcNode->Node.Reserved = EFI_ACPI_RESERVED_DWORD; RcNode->Node.NumIdMappings = NodeList->IdMappingCount; RcNode->Node.IdReference = (NodeList->IdMappingCount == 0) ? 0 : sizeof (EFI_ACPI_6_0_IO_REMAPPING_RC_NODE); + if (AcpiTableInfo->AcpiTableRevision < EFI_ACPI_IO_REMAPPING_TABLE_REV5) { + RcNode->Node.Revision = 1; + RcNode->Node.Identifier = EFI_ACPI_RESERVED_DWORD; + } else { + RcNode->Node.Revision = 4; + RcNode->Node.Identifier = NodeList->Identifier; + RcNode->PasidCapabilities = NodeList->PasidCapabilities; + RcNode->Flags = NodeList->Flags; + } + // Root Complex specific data RcNode->CacheCoherent = NodeList->CacheCoherent; RcNode->AllocationHints = NodeList->AllocationHints; @@ -1019,8 +1161,6 @@ AddRootComplexNodes ( RcNode->PciSegmentNumber = NodeList->PciSegmentNumber; RcNode->MemoryAddressSize = NodeList->MemoryAddressSize; RcNode->Reserved1[0] = EFI_ACPI_RESERVED_BYTE; - RcNode->Reserved1[1] = EFI_ACPI_RESERVED_BYTE; - RcNode->Reserved1[2] = EFI_ACPI_RESERVED_BYTE; if (NodeList->IdMappingCount > 0) { if (NodeList->IdMappingToken == CM_NULL_TOKEN) { @@ -1135,6 +1275,7 @@ AddSmmuInterruptArray ( @param [in] This Pointer to the table Generator. @param [in] CfgMgrProtocol Pointer to the Configuration Manager Protocol Interface. + @param [in] AcpiTableInfo Pointer to the ACPI table info structure. @param [in] Iort Pointer to IORT table structure. @param [in] NodesStartOffset Offset for the start of the SMMU v1/v2 Nodes. @@ -1151,6 +1292,7 @@ EFI_STATUS AddSmmuV1V2Nodes ( IN CONST ACPI_TABLE_GENERATOR *CONST This, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol, + IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo, IN CONST EFI_ACPI_6_0_IO_REMAPPING_TABLE *Iort, IN CONST UINT32 NodesStartOffset, IN CONST CM_ARM_SMMUV1_SMMUV2_NODE *NodeList, @@ -1187,8 +1329,6 @@ AddSmmuV1V2Nodes ( // Populate the node header SmmuNode->Node.Type = EFI_ACPI_IORT_TYPE_SMMUv1v2; SmmuNode->Node.Length = (UINT16)NodeLength; - SmmuNode->Node.Revision = 0; - SmmuNode->Node.Reserved = EFI_ACPI_RESERVED_DWORD; SmmuNode->Node.NumIdMappings = NodeList->IdMappingCount; SmmuNode->Node.IdReference = (NodeList->IdMappingCount == 0) ? 0 : (sizeof (EFI_ACPI_6_0_IO_REMAPPING_SMMU_NODE) + @@ -1197,6 +1337,14 @@ AddSmmuV1V2Nodes ( (NodeList->PmuInterruptCount * sizeof (EFI_ACPI_6_0_IO_REMAPPING_SMMU_INT))); + if (AcpiTableInfo->AcpiTableRevision < EFI_ACPI_IO_REMAPPING_TABLE_REV5) { + SmmuNode->Node.Revision = 1; + SmmuNode->Node.Identifier = EFI_ACPI_RESERVED_DWORD; + } else { + SmmuNode->Node.Revision = 3; + SmmuNode->Node.Identifier = NodeList->Identifier; + } + // SMMU v1/v2 specific data SmmuNode->Base = NodeList->BaseAddress; SmmuNode->Span = NodeList->Span; @@ -1340,6 +1488,7 @@ AddSmmuV1V2Nodes ( @param [in] This Pointer to the table Generator. @param [in] CfgMgrProtocol Pointer to the Configuration Manager Protocol Interface. + @param [in] AcpiTableInfo Pointer to the ACPI table info structure. @param [in] Iort Pointer to IORT table structure. @param [in] NodesStartOffset Offset for the start of the SMMUv3 Nodes. @param [in] NodeList Pointer to an array of SMMUv3 Node Objects. @@ -1354,6 +1503,7 @@ EFI_STATUS AddSmmuV3Nodes ( IN CONST ACPI_TABLE_GENERATOR *CONST This, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol, + IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo, IN CONST EFI_ACPI_6_0_IO_REMAPPING_TABLE *Iort, IN CONST UINT32 NodesStartOffset, IN CONST CM_ARM_SMMUV3_NODE *NodeList, @@ -1386,12 +1536,18 @@ AddSmmuV3Nodes ( // Populate the node header SmmuV3Node->Node.Type = EFI_ACPI_IORT_TYPE_SMMUv3; SmmuV3Node->Node.Length = (UINT16)NodeLength; - SmmuV3Node->Node.Revision = 2; - SmmuV3Node->Node.Reserved = EFI_ACPI_RESERVED_DWORD; SmmuV3Node->Node.NumIdMappings = NodeList->IdMappingCount; SmmuV3Node->Node.IdReference = (NodeList->IdMappingCount == 0) ? 0 : sizeof (EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE); + if (AcpiTableInfo->AcpiTableRevision < EFI_ACPI_IO_REMAPPING_TABLE_REV5) { + SmmuV3Node->Node.Revision = 2; + SmmuV3Node->Node.Identifier = EFI_ACPI_RESERVED_DWORD; + } else { + SmmuV3Node->Node.Revision = 4; + SmmuV3Node->Node.Identifier = NodeList->Identifier; + } + // SMMUv3 specific data SmmuV3Node->Base = NodeList->BaseAddress; SmmuV3Node->Flags = NodeList->Flags; @@ -1469,6 +1625,7 @@ AddSmmuV3Nodes ( @param [in] This Pointer to the table Generator. @param [in] CfgMgrProtocol Pointer to the Configuration Manager Protocol Interface. + @param [in] AcpiTableInfo Pointer to the ACPI table info structure. @param [in] Iort Pointer to IORT table structure. @param [in] NodesStartOffset Offset for the start of the PMCG Nodes. @param [in] NodeList Pointer to an array of PMCG Node Objects. @@ -1483,6 +1640,7 @@ EFI_STATUS AddPmcgNodes ( IN CONST ACPI_TABLE_GENERATOR *CONST This, IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol, + IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo, IN CONST EFI_ACPI_6_0_IO_REMAPPING_TABLE *Iort, IN CONST UINT32 NodesStartOffset, IN CONST CM_ARM_PMCG_NODE *NodeList, @@ -1517,12 +1675,18 @@ AddPmcgNodes ( // Populate the node header PmcgNode->Node.Type = EFI_ACPI_IORT_TYPE_PMCG; PmcgNode->Node.Length = (UINT16)NodeLength; - PmcgNode->Node.Revision = 1; - PmcgNode->Node.Reserved = EFI_ACPI_RESERVED_DWORD; PmcgNode->Node.NumIdMappings = NodeList->IdMappingCount; PmcgNode->Node.IdReference = (NodeList->IdMappingCount == 0) ? 0 : sizeof (EFI_ACPI_6_0_IO_REMAPPING_PMCG_NODE); + if (AcpiTableInfo->AcpiTableRevision < EFI_ACPI_IO_REMAPPING_TABLE_REV5) { + PmcgNode->Node.Revision = 1; + PmcgNode->Node.Identifier = EFI_ACPI_RESERVED_DWORD; + } else { + PmcgNode->Node.Revision = 2; + PmcgNode->Node.Identifier = NodeList->Identifier; + } + // PMCG specific data PmcgNode->Base = NodeList->BaseAddress; PmcgNode->OverflowInterruptGsiv = NodeList->OverflowInterrupt; @@ -1589,6 +1753,274 @@ AddPmcgNodes ( return EFI_SUCCESS; } +/** Update the Memory Range Descriptor Array. + + This function retrieves the Memory Range Descriptor objects referenced by + MemRangeDescToken and updates the Memory Range Descriptor array. + + @param [in] This Pointer to the table Generator. + @param [in] CfgMgrProtocol Pointer to the Configuration Manager + Protocol Interface. + @param [in] DescArray Pointer to an array of Memory Range + Descriptors. + @param [in] DescCount Number of Id Descriptors. + @param [in] DescToken Reference Token for retrieving the + Memory Range Descriptor Array. + + @retval EFI_SUCCESS Table generated successfully. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object was not found. +**/ +STATIC +EFI_STATUS +AddMemRangeDescArray ( + IN CONST ACPI_TABLE_GENERATOR *CONST This, + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol, + IN EFI_ACPI_6_0_IO_REMAPPING_MEM_RANGE_DESC *DescArray, + IN UINT32 DescCount, + IN CONST CM_OBJECT_TOKEN DescToken + ) +{ + EFI_STATUS Status; + CM_ARM_MEMORY_RANGE_DESCRIPTOR *MemRangeDesc; + UINT32 MemRangeDescCount; + + ASSERT (DescArray != NULL); + + // Get the Id Mapping Array + Status = GetEArmObjMemoryRangeDescriptor ( + CfgMgrProtocol, + DescToken, + &MemRangeDesc, + &MemRangeDescCount + ); + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Failed to get Memory Range Descriptor array. Status = %r\n", + Status + )); + return Status; + } + + if (MemRangeDescCount < DescCount) { + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Failed to get the required number of Memory" + " Range Descriptors.\n" + )); + return EFI_NOT_FOUND; + } + + // Populate the Memory Range Descriptor array + while (DescCount-- != 0) { + DescArray->Base = MemRangeDesc->BaseAddress; + DescArray->Length = MemRangeDesc->Length; + DescArray->Reserved = EFI_ACPI_RESERVED_DWORD; + + DescArray++; + MemRangeDesc++; + } + + return EFI_SUCCESS; +} + +/** Update the RMR Node Information. + + This function updates the RMR node information in the IORT table. + + @param [in] This Pointer to the table Generator. + @param [in] CfgMgrProtocol Pointer to the Configuration Manager + Protocol Interface. + @param [in] AcpiTableInfo Pointer to the ACPI table info structure. + @param [in] Iort Pointer to IORT table structure. + @param [in] NodesStartOffset Offset for the start of the PMCG Nodes. + @param [in] NodeList Pointer to an array of PMCG Node Objects. + @param [in] NodeCount Number of PMCG Node Objects. + + @retval EFI_SUCCESS Table generated successfully. + @retval EFI_INVALID_PARAMETER A parameter is invalid. + @retval EFI_NOT_FOUND The required object was not found. +**/ +STATIC +EFI_STATUS +AddRmrNodes ( + IN CONST ACPI_TABLE_GENERATOR *CONST This, + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtocol, + IN CONST CM_STD_OBJ_ACPI_TABLE_INFO *CONST AcpiTableInfo, + IN CONST EFI_ACPI_6_0_IO_REMAPPING_TABLE *Iort, + IN CONST UINT32 NodesStartOffset, + IN CONST CM_ARM_RMR_NODE *NodeList, + IN UINT32 NodeCount + ) +{ + EFI_STATUS Status; + EFI_ACPI_6_0_IO_REMAPPING_RMR_NODE *RmrNode; + EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE *IdMapArray; + EFI_ACPI_6_0_IO_REMAPPING_MEM_RANGE_DESC *MemRangeDescArray; + UINT64 NodeLength; + + ASSERT (Iort != NULL); + + RmrNode = (EFI_ACPI_6_0_IO_REMAPPING_RMR_NODE *)((UINT8 *)Iort + + NodesStartOffset); + + while (NodeCount-- != 0) { + NodeLength = GetRmrNodeSize (NodeList); + if (NodeLength > MAX_UINT16) { + Status = EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: RMR Node length 0x%lx > MAX_UINT16. Status = %r\n", + NodeLength, + Status + )); + return Status; + } + + if (NodeList->MemRangeDescCount == 0) { + Status = EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Memory Range Desc count = %d. Status = %r\n", + NodeList->MemRangeDescCount, + Status + )); + return Status; + } + + if (NodeList->MemRangeDescToken == CM_NULL_TOKEN) { + Status = EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Invalid Memory Range Descriptor token," + " Token = 0x%x. Status = %r\n", + NodeList->MemRangeDescToken, + Status + )); + return Status; + } + + // Populate the node header + RmrNode->Node.Type = EFI_ACPI_IORT_TYPE_RMR; + RmrNode->Node.Length = (UINT16)NodeLength; + RmrNode->Node.Revision = 3; + RmrNode->Node.Identifier = NodeList->Identifier; + RmrNode->Node.NumIdMappings = NodeList->IdMappingCount; + RmrNode->Node.IdReference = (NodeList->IdMappingCount == 0) ? + 0 : sizeof (EFI_ACPI_6_0_IO_REMAPPING_RMR_NODE); + + // RMR specific data + RmrNode->Flags = NodeList->Flags; + RmrNode->NumMemRangeDesc = NodeList->MemRangeDescCount; + RmrNode->MemRangeDescRef = (NodeList->MemRangeDescCount == 0) ? + 0 : (sizeof (EFI_ACPI_6_0_IO_REMAPPING_RMR_NODE) + + (NodeList->IdMappingCount * + sizeof (EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE))); + + if (NodeList->IdMappingCount > 0) { + if (NodeList->IdMappingToken == CM_NULL_TOKEN) { + Status = EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Invalid Id Mapping token," + " Token = 0x%x, Status =%r\n", + NodeList->IdMappingToken, + Status + )); + return Status; + } + + // Ids for RMR node + IdMapArray = (EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE *)((UINT8 *)RmrNode + + RmrNode->Node.IdReference); + + Status = AddIdMappingArray ( + This, + CfgMgrProtocol, + IdMapArray, + NodeList->IdMappingCount, + NodeList->IdMappingToken + ); + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Failed to add Id Mapping Array. Status = %r\n", + Status + )); + return Status; + } + } + + // Memory Range Descriptors for RMR node + MemRangeDescArray = (EFI_ACPI_6_0_IO_REMAPPING_MEM_RANGE_DESC *)( + (UINT8 *)RmrNode + + RmrNode->MemRangeDescRef + ); + + Status = AddMemRangeDescArray ( + This, + CfgMgrProtocol, + MemRangeDescArray, + NodeList->MemRangeDescCount, + NodeList->MemRangeDescToken + ); + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Failed to Memory Range Descriptor Array. Status = %r\n", + Status + )); + return Status; + } + + // Next RMR Node + RmrNode = (EFI_ACPI_6_0_IO_REMAPPING_RMR_NODE *)((UINT8 *)RmrNode + + RmrNode->Node.Length); + NodeList++; + } // RMR Node + + return EFI_SUCCESS; +} + +/** Validates that the IORT nodes Identifier are unique. + + @param [in] NodeIndexer Pointer to the Node Indexer. + @param [in] NodeCount Number of IORT Nodes. + + @retval EFI_SUCCESS Success. + @retval EFI_INVALID_PARAMETER Identifier field not unique. +**/ +STATIC +EFI_STATUS +ValidateNodeIdentifiers ( + IN CONST IORT_NODE_INDEXER *CONST NodeIndexer, + IN UINT32 NodeCount + ) +{ + UINT32 IndexI; + UINT32 IndexJ; + + for (IndexI = 0; IndexI < NodeCount; IndexI++) { + for (IndexJ = 0; IndexJ < NodeCount; IndexJ++) { + if ((IndexI != IndexJ) && + (NodeIndexer[IndexI].Identifier == NodeIndexer[IndexJ].Identifier)) + { + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: UID %d of Token %p matches with that of Token %p.\n", + NodeIndexer[IndexI].Identifier, + NodeIndexer[IndexI].Token, + NodeIndexer[IndexJ].Token + )); + return EFI_INVALID_PARAMETER; + } + }// IndexJ + } // IndexI + + return EFI_SUCCESS; +} + /** Construct the IORT ACPI table. This function invokes the Configuration Manager protocol interface @@ -1633,6 +2065,7 @@ BuildIortTable ( UINT32 SmmuV1V2NodeCount; UINT32 SmmuV3NodeCount; UINT32 PmcgNodeCount; + UINT32 RmrNodeCount; UINT32 ItsGroupOffset; UINT32 NamedComponentOffset; @@ -1640,6 +2073,7 @@ BuildIortTable ( UINT32 SmmuV1V2Offset; UINT32 SmmuV3Offset; UINT32 PmcgOffset; + UINT32 RmrOffset; CM_ARM_ITS_GROUP_NODE *ItsGroupNodeList; CM_ARM_NAMED_COMPONENT_NODE *NamedComponentNodeList; @@ -1647,6 +2081,7 @@ BuildIortTable ( CM_ARM_SMMUV1_SMMUV2_NODE *SmmuV1V2NodeList; CM_ARM_SMMUV3_NODE *SmmuV3NodeList; CM_ARM_PMCG_NODE *PmcgNodeList; + CM_ARM_RMR_NODE *RmrNodeList; EFI_ACPI_6_0_IO_REMAPPING_TABLE *Iort; IORT_NODE_INDEXER *NodeIndexer; @@ -1790,6 +2225,27 @@ BuildIortTable ( // Add the PMCG node count IortNodeCount += PmcgNodeCount; + if (AcpiTableInfo->AcpiTableRevision >= EFI_ACPI_IO_REMAPPING_TABLE_REV5) { + // Get the RMR node info + Status = GetEArmObjRmr ( + CfgMgrProtocol, + CM_NULL_TOKEN, + &RmrNodeList, + &RmrNodeCount + ); + if (EFI_ERROR (Status) && (Status != EFI_NOT_FOUND)) { + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Failed to get RMR Node Info. Status = %r\n", + Status + )); + goto error_handler; + } + + // Add the RMR node count + IortNodeCount += RmrNodeCount; + } + // Allocate Node Indexer array NodeIndexer = (IORT_NODE_INDEXER *)AllocateZeroPool ( (sizeof (IORT_NODE_INDEXER) * @@ -1999,6 +2455,39 @@ BuildIortTable ( )); } + // RMR Nodes + if ((AcpiTableInfo->AcpiTableRevision >= EFI_ACPI_IO_REMAPPING_TABLE_REV5) && + (RmrNodeCount > 0)) + { + RmrOffset = (UINT32)TableSize; + // Size of RMR node list. + NodeSize = GetSizeofRmrNodes ( + RmrOffset, + RmrNodeList, + RmrNodeCount, + &NodeIndexer + ); + if (NodeSize > MAX_UINT32) { + Status = EFI_INVALID_PARAMETER; + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Invalid Size of RMR Nodes. Status = %r\n", + Status + )); + goto error_handler; + } + + TableSize += NodeSize; + + DEBUG (( + DEBUG_INFO, + " RmrNodeCount = %d\n" \ + " RmrOffset = %d\n", + RmrNodeCount, + RmrOffset + )); + } + DEBUG (( DEBUG_INFO, "INFO: IORT:\n" \ @@ -2020,6 +2509,19 @@ BuildIortTable ( goto error_handler; } + // Validate that the identifiers for the nodes are unique + if (AcpiTableInfo->AcpiTableRevision >= EFI_ACPI_IO_REMAPPING_TABLE_REV5) { + Status = ValidateNodeIdentifiers (Generator->NodeIndexer, IortNodeCount); + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Node Identifier not unique. Status = %r\n", + Status + )); + goto error_handler; + } + } + // Allocate the Buffer for IORT table *Table = (EFI_ACPI_DESCRIPTION_HEADER *)AllocateZeroPool (TableSize); if (*Table == NULL) { @@ -2068,6 +2570,7 @@ BuildIortTable ( Status = AddItsGroupNodes ( This, CfgMgrProtocol, + AcpiTableInfo, Iort, ItsGroupOffset, ItsGroupNodeList, @@ -2087,6 +2590,7 @@ BuildIortTable ( Status = AddNamedComponentNodes ( This, CfgMgrProtocol, + AcpiTableInfo, Iort, NamedComponentOffset, NamedComponentNodeList, @@ -2106,6 +2610,7 @@ BuildIortTable ( Status = AddRootComplexNodes ( This, CfgMgrProtocol, + AcpiTableInfo, Iort, RootComplexOffset, RootComplexNodeList, @@ -2125,6 +2630,7 @@ BuildIortTable ( Status = AddSmmuV1V2Nodes ( This, CfgMgrProtocol, + AcpiTableInfo, Iort, SmmuV1V2Offset, SmmuV1V2NodeList, @@ -2144,6 +2650,7 @@ BuildIortTable ( Status = AddSmmuV3Nodes ( This, CfgMgrProtocol, + AcpiTableInfo, Iort, SmmuV3Offset, SmmuV3NodeList, @@ -2163,6 +2670,7 @@ BuildIortTable ( Status = AddPmcgNodes ( This, CfgMgrProtocol, + AcpiTableInfo, Iort, PmcgOffset, PmcgNodeList, @@ -2171,7 +2679,27 @@ BuildIortTable ( if (EFI_ERROR (Status)) { DEBUG (( DEBUG_ERROR, - "ERROR: IORT: Failed to add SMMUv3 Node. Status = %r\n", + "ERROR: IORT: Failed to add PMCG Node. Status = %r\n", + Status + )); + goto error_handler; + } + } + + if (RmrNodeCount > 0) { + Status = AddRmrNodes ( + This, + CfgMgrProtocol, + AcpiTableInfo, + Iort, + RmrOffset, + RmrNodeList, + RmrNodeCount + ); + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_ERROR, + "ERROR: IORT: Failed to add RMR Node. Status = %r\n", Status )); goto error_handler; @@ -2256,11 +2784,11 @@ ACPI_IORT_GENERATOR IortGenerator = { // Generator Description L"ACPI.STD.IORT.GENERATOR", // ACPI Table Signature - EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE, + EFI_ACPI_6_3_IO_REMAPPING_TABLE_SIGNATURE, // ACPI Table Revision supported by this Generator - EFI_ACPI_IO_REMAPPING_TABLE_REVISION, + EFI_ACPI_IO_REMAPPING_TABLE_REV5, // Minimum supported ACPI Table Revision - EFI_ACPI_IO_REMAPPING_TABLE_REVISION, + EFI_ACPI_IO_REMAPPING_TABLE_REV0, // Creator ID TABLE_GENERATOR_CREATOR_ID_ARM, // Creator Revision diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.h b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.h index 61f6b6153f207b356ed26aabf8366c1cf632fd90..99d86b3d167b56ae4e0c22d292e6e33318e3c78f 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.h +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.h @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2018, ARM Limited. All rights reserved. + Copyright (c) 2018 - 2022, Arm Limited. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @@ -25,6 +25,9 @@ typedef struct IortNodeIndexer { VOID *Object; /// Node offset from the start of the IORT table UINT32 Offset; + + /// Unique identifier for the Node + UINT32 Identifier; } IORT_NODE_INDEXER; typedef struct AcpiIortGenerator { -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'