From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web09.35734.1658195210477449164 for ; Mon, 18 Jul 2022 18:46:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=jUCsjZYt; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: zhichao.gao@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658195210; x=1689731210; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=N4PqeKZUSbh5YNWbZhmqHS2O9ND6SFBGmFTboLAlWOU=; b=jUCsjZYtF/r4e+Y5FtLtXZwLsBC6v6DwBPp2L/ihpbXOi7c5FEq5T1fq JADoY25M8atmqqOtHyz32XLHJdqUYZshGhuswRJ/W0w6u/mtTu9f4CsL2 DXsKbn/NqeQovDpJLqbP3l0LAz1Lx9ozJMrjLhsv4ZwpFopCyQbGgN29S qi6hXs0BJqC3fNaZuxy3vSNiBa61jgERGA3Qp5670vlGh5cT7A1xwDqWu n4q85xuoT/+oHE3YozSzQ6ET5VSrkV4Ip6C0DW3bPpkldqS4qctXIBDye C3z8ISqJ8JdzYFHW6xeiaqop02eBZ233zPnViDS12JnRA9Ddh9a2aOCEq A==; X-IronPort-AV: E=McAfee;i="6400,9594,10412"; a="269385513" X-IronPort-AV: E=Sophos;i="5.92,282,1650956400"; d="scan'208";a="269385513" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2022 18:46:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,282,1650956400"; d="scan'208";a="572642369" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by orsmga006.jf.intel.com with ESMTP; 18 Jul 2022 18:46:49 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Mon, 18 Jul 2022 18:46:49 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Mon, 18 Jul 2022 18:46:49 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.171) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Mon, 18 Jul 2022 18:46:48 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fjYrO/xf8PvUxAW0b83CrnmhDuA2R0Z3fccLYgAwgjK/YqEjx5WBurKCIHfmRLerJHvwosu4L4KSJeud70cAyHX0+E1/txx8/mjlWrEtjTS12d/eSRniBKN7CEuKyazUgPhmTE5g7NhFD5DMTzC+Uox1BQuWgadXSH3rUk90Q/I1BFvfKzFriKCF+MBihzTMVhDsCcycbI6dILuMFshBu3DB2pfoY1LvdAzRMvDtjG2amIejkFmWECJCsfjCM7fuwZJWU4UtHyKz/Gm8oZc5IgBhq4LmFSzt3NmbmEtWyj0mb02gkymXB3A4+4pZhdgsL6r2gILaqRSVzI0r/tNR2w== 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=mx31UZNLi1TYETozIbl1yIu4SNtLxFgk62OJvK9PHXs=; b=AKRboLfgfht6T8Uu5jTehLue0gN/jQD0Hqv0qyENcEU/bS+nTZwbZXq6Pu/iPT5RgxiKycpsJIE0LnTUBJf6tZ8vU/GHHJLUypvue5MJxDlbHYOfgmiGK9ho/9tWzijpHLeQkPBxfy5ndbJlTkM77DJM/h6tGXZWR6pQ9ReyLPRDowQ4TG//33+le93g117J+WDRKHUCedaTZ5A7XaTxE+tVOIsJM7vRNfKPaQv4gAfvpIiNBDstMLmLm6/6cYnjRpYRR/JjunWAcaoNOB8pbm9nGBP5qMOUnxRCxltnC0mJszQtehMQHyWIOJyEgEqhBD7yAajVrbxksSbXbh/47A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from PH7PR11MB6377.namprd11.prod.outlook.com (2603:10b6:510:1fb::13) by DS7PR11MB6037.namprd11.prod.outlook.com (2603:10b6:8:74::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23; Tue, 19 Jul 2022 01:46:45 +0000 Received: from PH7PR11MB6377.namprd11.prod.outlook.com ([fe80::e1e3:11d:934b:47a7]) by PH7PR11MB6377.namprd11.prod.outlook.com ([fe80::e1e3:11d:934b:47a7%6]) with mapi id 15.20.5438.023; Tue, 19 Jul 2022 01:46:45 +0000 From: "Gao, Zhichao" To: "devel@edk2.groups.io" , "sami.mujawar@arm.com" CC: "Alexei.Fedorov@arm.com" , "ardb+tianocore@kernel.org" , "quic_llindhol@quicinc.com" , "pierre.gondois@arm.com" , "Matteo.Carlini@arm.com" , "Akanksha.Jain2@arm.com" , "Ben.Adderson@arm.com" , "steven.price@arm.com" , "Lorenzo.Pieralisi@arm.com" , "Kinney, Michael D" , "Gao, Liming" , "Liu, Zhiguang" , "Ni, Ray" , "nd@arm.com" Subject: Re: [edk2-devel] [PATCH v6 5/8] MdePkg: IORT header update for IORT Rev E.d spec Thread-Topic: [edk2-devel] [PATCH v6 5/8] MdePkg: IORT header update for IORT Rev E.d spec Thread-Index: AQHYl6Hzl5dk4jE/wUCBtTvPzwqG4K2E82eQ Date: Tue, 19 Jul 2022 01:46:45 +0000 Message-ID: References: <20220714165031.42640-1-sami.mujawar@arm.com> <20220714165031.42640-6-sami.mujawar@arm.com> In-Reply-To: <20220714165031.42640-6-sami.mujawar@arm.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.6.500.17 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4f4967b8-bc01-4910-d7f4-08da692889bf x-ms-traffictypediagnostic: DS7PR11MB6037:EE_ x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9GJXPQkbB0Vc3ZvwQCmjml2iqRDug1EtceFJPYDWuRuBgAI7E54mspZW8hvhvgCQKDlD5IxrKAN4SOkqx71NAvDcd9f3+b+lcyg4ZJoV1T8gUulrhRoU19eEOfFT1pL78libbHSCjVuika5Bs20qiHF2NcK0OMjuDWLzReTvW7LODoanDVsmuKZjZ7D1wmj2Vj2l+wToYofb0HD0Ur0mvjw4RcL7LXUDailJD1OwlUMoQLH4vEdyEEYgfRXAx23qQBgZRLa3Fhdr4KiOx8UWE11fTkBo3/r4eE9Ns7ee0gS3uxC2Klj6I7ONpiu/dRqBMGwhY64IvRVdfqiHEIfTe0l2K/Nmn7heFrgYIlNHND09dzW/E5bfBBWEPouaUDP+TJnLXEiorhg0AbqpqSZ5FQbsWkCCr4PMvShPh1lQF4jv1ANKau1UjHsBNaB6ZfsZTWHXkEXGTTd7ZtLp3hm7muXbT95xivI5/KQyvUg5/NS1NDMyi1hcKufJ9zAWAWsYRo5ZUJkm6XST0UNkCS1kybJ9SOe8Wp5az5qCECM2oz8CZ7GHHGT6GOOXgycOz0BrK28wyEP82kxUL6AAhxH+b5fTPwVJKRdr+6k3B6Nl/Wkr0CjRVrf2BZ7o0pj+f8bhJSVrDGm0YTQuqaQrEoHMWYheEDOEAiBay2xYvnb5BvaioVyED8o7IDD4QQfBEKhFzXMP1P3qOoJjiNvwm1tpO4DosW1/sKMcuhDWGucumCKH5e6EeOTVdDfcdSrc9zN6ItimZj2fsDjdRg+csQlBv9ZUzV9f3oxm5PWsWjurTv60W6e2sIYygo8z7Pr2w+slmXBpicG2gZVHRA9QBZUQoZxm0lujUwzIE53ytm88sPw= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR11MB6377.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(136003)(366004)(346002)(39860400002)(396003)(376002)(71200400001)(86362001)(966005)(38070700005)(82960400001)(478600001)(41300700001)(186003)(6506007)(9686003)(7696005)(53546011)(26005)(110136005)(316002)(83380400001)(54906003)(76116006)(52536014)(66446008)(122000001)(15650500001)(66556008)(66476007)(4326008)(8936002)(5660300002)(30864003)(7416002)(8676002)(66946007)(2906002)(33656002)(38100700002)(64756008)(55016003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?WXpVJ5Dx/e+Fg6ozY6qJuirhgM5yY9j5KduLws5FoZWsRBkMc207tNWiiTce?= =?us-ascii?Q?d6TYld10wGEjmTxICSGLHue5mptd+SFCo6sWrXvquA3AX0psHDhaj/ICa6uc?= =?us-ascii?Q?D1c34yojAAVIVf8bjoLoGz7XkodJr9uQO6ZYJQKUXIklkknJQG5Jyw+blyex?= =?us-ascii?Q?R2kMQcljG4TH0tvKKMOJkGGz10K5yVr4QixsMZC3gkt7z5qVMMv2Rfer6QQd?= =?us-ascii?Q?2ZhBEeJs6J/1hIf1YPDDnGlyhL+AwWGyzhkp3759YofPiVPKu2kLDGbnBRfC?= =?us-ascii?Q?xoFoBTbIIHH0y/P6anzKZtY8HT7Em5fVWHw/VG3hoGlwU7qDevJArBohxZBt?= =?us-ascii?Q?FPrlfOnSC9tfTKihFUSoNRCz9760G9hQ7b8YEFpaoNPP1VMZvuI82M+1/5zX?= =?us-ascii?Q?gAUtgPW4BkumdrtDKx2WEzx4kgdpUBo3y6hKmTDu1r/Itn5CltuOPvPuFQEX?= =?us-ascii?Q?qIPT+h4dibf1/3LVxlXEfuYXufYVPHIwg4FAHb+oqUabXoZI6HXLi/wxfBHo?= =?us-ascii?Q?/Z9QE5vN2afv4T9pllvpCnQNlewOzSXmxIlGSxO0i0Ae8jK73nncCwojrm77?= =?us-ascii?Q?T1SiSxSh5PQh58BsuY0sS/GiV4Tlhdno3XSHYjjOVpG/1OzjcOqgE3cUmKTA?= =?us-ascii?Q?ap5Fvk2yl7UJNgjZNQig2vgzth7koFb2wFWUHX4J9baFAFXhtDydp1pXaaBn?= =?us-ascii?Q?RvavYBseYY9lVnTdB7+uHmW/VMtLlispcrsMTEUTp9PIl/+7ocaC/yaxxsOY?= =?us-ascii?Q?nYifmtZDxWQ3D2VC7kIyzIvTFPoxkAAAqIcP9X6FuIwdp3l6Q4GsKn1k17gH?= =?us-ascii?Q?472h66CsH8pVWzEp+UBeAOUm6armurLlHBQFMZZtiOY55lHWhS2aKXkH+iny?= =?us-ascii?Q?/2LcZorR2zPPeFFUV+3sZcIaSd0AcVLnxVSar9I3xX5vFHodUrdSHuUfI5rZ?= =?us-ascii?Q?lGzRoZvF7MeG6YzNCg46mfHRZUmz3afLyvaHOzFnLxOc3zpA2AF5S2k+/5Iv?= =?us-ascii?Q?CyhdMM18GJUNqzi0WIEfsmLNwsxaZ1AxpLcNqSRAi/CJxh1TecI02+tiKKSg?= =?us-ascii?Q?qZ35jlD57GM8VDuvpUOxeKg4KhxU7TEnn4nvfE2n8YNjfAajImjgMAijKvIf?= =?us-ascii?Q?MkfqyaGXxsFyfxu1Xv5+TaLauLRPFh2l/atgg4QA8GGKpHibGaXyO9OXPHYf?= =?us-ascii?Q?pVH18P9PWIOGimSispPjLW1GU/IME81wRKgCCgCk2Hd/sjbhe48CHjE+hE5F?= =?us-ascii?Q?2x8MsUUbzo/YmvSQMkQ8ef+s0XoFDXni6l6TZOx67RClFPpLskaYZuULMY77?= =?us-ascii?Q?KfMDUzys+W8NisSi4NtEJY8nqJDstuOu2GIx5Zs92BjJGrzD+WtrHpXQfn3t?= =?us-ascii?Q?Dz8CoOXGtNGtXcNCX8aOhQXIZtczIXXZp05sdWDr4PWWtmkJ45xC58pl6+LX?= =?us-ascii?Q?LgqO5TVZVUL2wy0YGKnw1j/CvwQrUZgvEvdOT1VxBx6V+3pY4NUlBPUL1Ll+?= =?us-ascii?Q?ZTNWCc7cj2ymuXXKmHqaqzgCy1thOez71Fd58vAyc24c0Y2JFcdEI1H2U23Z?= =?us-ascii?Q?DlBfaLaLgbaR78YCMBI/RliUrspro5Ju3ngnuBKc?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB6377.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f4967b8-bc01-4910-d7f4-08da692889bf X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2022 01:46:45.6537 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Rigre3+d5wendQIKUmjig5XUdZzncuyMUU3bQSHMk2iGskR57lDYbgEuOt6ESUhUeg/200RQZAj9upaI22+rdg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR11MB6037 Return-Path: zhichao.gao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Zhichao Gao Thanks, Zhichao > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Sami > Mujawar > Sent: Friday, July 15, 2022 12:50 AM > To: devel@edk2.groups.io > Cc: Sami Mujawar ; Alexei.Fedorov@arm.com; > ardb+tianocore@kernel.org; quic_llindhol@quicinc.com; > pierre.gondois@arm.com; Matteo.Carlini@arm.com; > Akanksha.Jain2@arm.com; Ben.Adderson@arm.com; > steven.price@arm.com; Lorenzo.Pieralisi@arm.com; Kinney, Michael D > ; Gao, Liming ; > Liu, Zhiguang ; Ni, Ray ; Gao, > Zhichao ; nd@arm.com > Subject: [edk2-devel] [PATCH v6 5/8] MdePkg: IORT header update for IORT > Rev E.d spec >=20 > Bugzilla: 3458 - Add support IORT Rev E.d specification updates > (https://bugzilla.tianocore.org/show_bug.cgi?id=3D3458) >=20 > 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. >=20 > Therefore, update the IORT header file to reflect these changes, and also > rename the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro to > EFI_ACPI_IO_REMAPPING_TABLE_REVISION_00. >=20 > Also update the IORT generator in DynamicTablesPkg to fix the compilation > errors so that Git Bisect can work. >=20 > Signed-off-by: Sami Mujawar > Reviewed-by: Liming Gao > --- >=20 > Notes: > v6: > - Add definition for IORT Rev 4 and RMR Node Rev 2. [PIE= RRE] > - Added definition for IORT Rev 4 and RMR Node 2 so that [SAM= I] > appropriate checks can be performed for deprecated > table/node revisions. >=20 > v5: > - Change IORT revision macro name to make it similar to [THO= MAS] > macro names for other ACPI tables. > - Updated IORT revision macros from [SAM= I] > EFI_ACPI_IO_REMAPPING_TABLE_REVx to > EFI_ACPI_IO_REMAPPING_TABLE_REVISION_0x > Ref: https://edk2.groups.io/g/devel/message/91119 > - Keep EFI_ACPI_IO_REMAPPING_TABLE_REVISION and set to > [LIMING] > EFI_ACPI_IO_REMAPPING_TABLE_REVISION_05. > Ref: https://edk2.groups.io/g/devel/message/91137 > - Added EFI_ACPI_IO_REMAPPING_TABLE_REVISION and set it [SAM= I] > to the latest IORT revision. > - Updated IORT generator in DynamicTablesPkg and included [SAM= I] > in this patch so that Git bisect does not break. >=20 > v4: > - Updated patch series to IORT specification revision E.d. [SAM= I] > - Add flag to indicate if the root complex supports PASID. [SAM= I] > - Add flags to define access privilege and attributes for [SAM= I] > the memory ranges. > v3: > - Submit patch series to update platform code to use the [LIM= ING] > EFI_ACPI_IO_REMAPPING_TABLE_REV0 macro. > Ref: https://edk2.groups.io/g/devel/topic/83618423#76799 > - Removed definition of EFI_ACPI_IO_REMAPPING_TABLE_REVISION > [SAMI] > as EFI_ACPI_IO_REMAPPING_TABLE_REV0 has been provided for > representing Rev 0. Also, a corresponding patch series > for updating the platforms in edk2-platforms repository > shall be submitted to the edk2 mailing list. > - Include r-b received from v2 series. [SAM= I] > Ref: https://edk2.groups.io/g/devel/topic/83600724#76660 >=20 > v2: > - Set EFI_ACPI_IO_REMAPPING_TABLE_REVISION to Rev 0 as [SAMI] > setting to Rev 3 will break existing platforms. The > problem is that existing code would not be populating > the Identifier field in the nodes. This can lead to > non-unique values in the Identifier field. >=20 > DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c | 19 > ++--- > MdePkg/Include/IndustryStandard/IoRemappingTable.h | 86 > ++++++++++++++++++-- > 2 files changed, 87 insertions(+), 18 deletions(-) >=20 > diff --git > a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c > b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c > index > abef9e5a7f90a38e1d697227d3cd2c110db364a4..63381441e2d6515a7cc9731c8 > 9b9739a12c65599 100644 > --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c > +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiIortLibArm/IortGenerator.c > @@ -766,7 +766,7 @@ AddItsGroupNodes ( > ItsGroupNode->Node.Type =3D EFI_ACPI_IORT_TYPE_ITS_GROUP; > ItsGroupNode->Node.Length =3D (UINT16)NodeLength; > ItsGroupNode->Node.Revision =3D 0; > - ItsGroupNode->Node.Reserved =3D EFI_ACPI_RESERVED_DWORD; > + ItsGroupNode->Node.Identifier =3D EFI_ACPI_RESERVED_DWORD; > ItsGroupNode->Node.NumIdMappings =3D 0; > ItsGroupNode->Node.IdReference =3D 0; >=20 > @@ -872,7 +872,7 @@ AddNamedComponentNodes ( > NcNode->Node.Type =3D EFI_ACPI_IORT_TYPE_NAMED_COMP; > NcNode->Node.Length =3D (UINT16)NodeLength; > NcNode->Node.Revision =3D 2; > - NcNode->Node.Reserved =3D EFI_ACPI_RESERVED_DWORD; > + NcNode->Node.Identifier =3D EFI_ACPI_RESERVED_DWORD; > NcNode->Node.NumIdMappings =3D NodeList->IdMappingCount; >=20 > ObjectNameLength =3D AsciiStrLen (NodeList->ObjectName) + 1; > @@ -1005,7 +1005,7 @@ AddRootComplexNodes ( > RcNode->Node.Type =3D EFI_ACPI_IORT_TYPE_ROOT_COMPLEX; > RcNode->Node.Length =3D (UINT16)NodeLength; > RcNode->Node.Revision =3D 1; > - RcNode->Node.Reserved =3D EFI_ACPI_RESERVED_DWORD; > + RcNode->Node.Identifier =3D EFI_ACPI_RESERVED_DWORD; > RcNode->Node.NumIdMappings =3D NodeList->IdMappingCount; > RcNode->Node.IdReference =3D (NodeList->IdMappingCount =3D=3D 0) ? > 0 : sizeof (EFI_ACPI_6_0_IO_REMAPPING_R= C_NODE); > @@ -1018,9 +1018,8 @@ AddRootComplexNodes ( > RcNode->AtsAttribute =3D NodeList->AtsAttribute; > RcNode->PciSegmentNumber =3D NodeList->PciSegmentNumber; > RcNode->MemoryAddressSize =3D NodeList->MemoryAddressSize; > + RcNode->PasidCapabilities =3D EFI_ACPI_RESERVED_WORD; > RcNode->Reserved1[0] =3D EFI_ACPI_RESERVED_BYTE; > - RcNode->Reserved1[1] =3D EFI_ACPI_RESERVED_BYTE; > - RcNode->Reserved1[2] =3D EFI_ACPI_RESERVED_BYTE; >=20 > if (NodeList->IdMappingCount > 0) { > if (NodeList->IdMappingToken =3D=3D CM_NULL_TOKEN) { @@ -1188,7 > +1187,7 @@ AddSmmuV1V2Nodes ( > SmmuNode->Node.Type =3D EFI_ACPI_IORT_TYPE_SMMUv1v2; > SmmuNode->Node.Length =3D (UINT16)NodeLength; > SmmuNode->Node.Revision =3D 0; > - SmmuNode->Node.Reserved =3D EFI_ACPI_RESERVED_DWORD; > + SmmuNode->Node.Identifier =3D EFI_ACPI_RESERVED_DWORD; > SmmuNode->Node.NumIdMappings =3D NodeList->IdMappingCount; > SmmuNode->Node.IdReference =3D (NodeList->IdMappingCount =3D=3D 0)= ? > 0 : (sizeof (EFI_ACPI_6_0_IO_REMAPPIN= G_SMMU_NODE) > + @@ -1387,7 +1386,7 @@ AddSmmuV3Nodes ( > SmmuV3Node->Node.Type =3D EFI_ACPI_IORT_TYPE_SMMUv3; > SmmuV3Node->Node.Length =3D (UINT16)NodeLength; > SmmuV3Node->Node.Revision =3D 2; > - SmmuV3Node->Node.Reserved =3D EFI_ACPI_RESERVED_DWORD; > + SmmuV3Node->Node.Identifier =3D EFI_ACPI_RESERVED_DWORD; > SmmuV3Node->Node.NumIdMappings =3D NodeList->IdMappingCount; > SmmuV3Node->Node.IdReference =3D (NodeList->IdMappingCount =3D=3D = 0) ? > 0 : sizeof > (EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE); > @@ -1518,7 +1517,7 @@ AddPmcgNodes ( > PmcgNode->Node.Type =3D EFI_ACPI_IORT_TYPE_PMCG; > PmcgNode->Node.Length =3D (UINT16)NodeLength; > PmcgNode->Node.Revision =3D 1; > - PmcgNode->Node.Reserved =3D EFI_ACPI_RESERVED_DWORD; > + PmcgNode->Node.Identifier =3D EFI_ACPI_RESERVED_DWORD; > PmcgNode->Node.NumIdMappings =3D NodeList->IdMappingCount; > PmcgNode->Node.IdReference =3D (NodeList->IdMappingCount =3D=3D 0)= ? > 0 : sizeof (EFI_ACPI_6_0_IO_REMAPPING= _PMCG_NODE); > @@ -2258,9 +2257,9 @@ ACPI_IORT_GENERATOR IortGenerator =3D { > // ACPI Table Signature > EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE, > // ACPI Table Revision supported by this Generator > - EFI_ACPI_IO_REMAPPING_TABLE_REVISION, > + EFI_ACPI_IO_REMAPPING_TABLE_REVISION_00, > // Minimum supported ACPI Table Revision > - EFI_ACPI_IO_REMAPPING_TABLE_REVISION, > + EFI_ACPI_IO_REMAPPING_TABLE_REVISION_00, > // Creator ID > TABLE_GENERATOR_CREATOR_ID_ARM, > // Creator Revision > diff --git a/MdePkg/Include/IndustryStandard/IoRemappingTable.h > b/MdePkg/Include/IndustryStandard/IoRemappingTable.h > index > 79a34678681d45b2982dc8573db6bd447f42e429..f48a4a95cd71a147098dff33ef > f3096b52021990 100644 > --- a/MdePkg/Include/IndustryStandard/IoRemappingTable.h > +++ b/MdePkg/Include/IndustryStandard/IoRemappingTable.h > @@ -1,12 +1,19 @@ > /** @file > - ACPI IO Remapping Table (IORT) as specified in ARM spec DEN0049D > - > - > http://infocenter.arm.com/help/topic/com.arm.doc.den0049d/DEN0049D_I > O_Remapping_Table.pdf > + ACPI IO Remapping Table (IORT) definitions. >=20 > Copyright (c) 2017, Linaro Limited. All rights reserved.
> - Copyright (c) 2018, ARM Limited. All rights reserved.
> + Copyright (c) 2018 - 2022, Arm Limited. All rights reserved.
>=20 > SPDX-License-Identifier: BSD-2-Clause-Patent > + > + @par Reference(s): > + - IO Remapping Table, Platform Design Document, Revision E.d, Feb 2022 > + (https://developer.arm.com/documentation/den0049/) > + > + @par Glossary: > + - Ref : Reference > + - Mem : Memory > + - Desc : Descriptor > **/ >=20 > #ifndef __IO_REMAPPING_TABLE_H__ > @@ -14,7 +21,9 @@ >=20 > #include >=20 > -#define EFI_ACPI_IO_REMAPPING_TABLE_REVISION 0x0 > +#define EFI_ACPI_IO_REMAPPING_TABLE_REVISION_00 0x0 > +#define EFI_ACPI_IO_REMAPPING_TABLE_REVISION_04 0x4 // > Deprecated > +#define EFI_ACPI_IO_REMAPPING_TABLE_REVISION_05 0x5 >=20 > #define EFI_ACPI_IORT_TYPE_ITS_GROUP 0x0 > #define EFI_ACPI_IORT_TYPE_NAMED_COMP 0x1 > @@ -22,6 +31,7 @@ > #define EFI_ACPI_IORT_TYPE_SMMUv1v2 0x3 > #define EFI_ACPI_IORT_TYPE_SMMUv3 0x4 > #define EFI_ACPI_IORT_TYPE_PMCG 0x5 > +#define EFI_ACPI_IORT_TYPE_RMR 0x6 >=20 > #define EFI_ACPI_IORT_MEM_ACCESS_PROP_CCA BIT0 >=20 > @@ -55,10 +65,34 @@ > #define EFI_ACPI_IORT_SMMUv3_MODEL_CAVIUM_CN99XX 0x2 >=20 > #define EFI_ACPI_IORT_ROOT_COMPLEX_ATS_UNSUPPORTED 0x0 > -#define EFI_ACPI_IORT_ROOT_COMPLEX_ATS_SUPPORTED 0x1 > +#define EFI_ACPI_IORT_ROOT_COMPLEX_ATS_SUPPORTED BIT0 > + > +#define EFI_ACPI_IORT_ROOT_COMPLEX_PRI_UNSUPPORTED 0x0 > +#define EFI_ACPI_IORT_ROOT_COMPLEX_PRI_SUPPORTED BIT1 > + > +#define EFI_ACPI_IORT_ROOT_COMPLEX_PASID_FWD_UNSUPPORTED > 0x0 > +#define EFI_ACPI_IORT_ROOT_COMPLEX_PASID_FWD_SUPPORTED BIT2 > + > +#define EFI_ACPI_IORT_ROOT_COMPLEX_PASID_UNSUPPORTED 0x0 > +#define EFI_ACPI_IORT_ROOT_COMPLEX_PASID_SUPPORTED BIT1 > + > +#define EFI_ACPI_IORT_RMR_REMAP_NOT_PERMITTED 0x0 > +#define EFI_ACPI_IORT_RMR_REMAP_PERMITTED BIT0 > + > +#define EFI_ACPI_IORT_RMR_ACCESS_REQ_NOT_PRIVILEGED 0x0 > +#define EFI_ACPI_IORT_RMR_ACCESS_REQ_PRIVILEGED BIT1 > + > +#define EFI_ACPI_IORT_RMR_ACCESS_ATTRIB_DEV_NGNRNE 0x0 > +#define EFI_ACPI_IORT_RMR_ACCESS_ATTRIB_DEV_NGNRE 0x1 > +#define EFI_ACPI_IORT_RMR_ACCESS_ATTRIB_DEV_NGRE 0x2 > +#define EFI_ACPI_IORT_RMR_ACCESS_ATTRIB_DEV_GRE 0x3 > +#define EFI_ACPI_IORT_RMR_ACCESS_ATTRIB_NORM_IN_NC_OUT_NC > 0x4 > +#define > EFI_ACPI_IORT_RMR_ACCESS_ATTRIB_NORM_IN_WB_OUT_WB_ISH 0x5 >=20 > #define EFI_ACPI_IORT_ID_MAPPING_FLAGS_SINGLE BIT0 >=20 > +#define EFI_ACPI_IORT_RMR_NODE_REVISION_02 0x2 // Deprecated > + > #pragma pack(1) >=20 > /// > @@ -89,7 +123,7 @@ typedef struct { > UINT8 Type; > UINT16 Length; > UINT8 Revision; > - UINT32 Reserved; > + UINT32 Identifier; > UINT32 NumIdMappings; > UINT32 IdReference; > } EFI_ACPI_6_0_IO_REMAPPING_NODE; > @@ -118,7 +152,9 @@ typedef struct { > UINT32 AtsAttribute; > UINT32 PciSegmentNumber; > UINT8 MemoryAddressSize; > - UINT8 Reserved1[3]; > + UINT16 PasidCapabilities; > + UINT8 Reserved1[1]; > + UINT32 Flags; > } EFI_ACPI_6_0_IO_REMAPPING_RC_NODE; >=20 > /// > @@ -198,6 +234,40 @@ typedef struct { > // EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE > OverflowInterruptMsiMapping[1]; > } EFI_ACPI_6_0_IO_REMAPPING_PMCG_NODE; >=20 > +/// > +/// Memory Range Descriptor. > +/// > +typedef struct { > + /// Base address of Reserved Memory Range, > + /// aligned to a page size of 64K. > + UINT64 Base; > + > + /// Length of the Reserved Memory range. > + /// Must be a multiple of the page size of 64K. > + UINT64 Length; > + > + /// Reserved, must be zero. > + UINT32 Reserved; > +} EFI_ACPI_6_0_IO_REMAPPING_MEM_RANGE_DESC; > + > +/// > +/// Node type 6: Reserved Memory Range (RMR) node /// typedef struct { > + EFI_ACPI_6_0_IO_REMAPPING_NODE Node; > + > + /// RMR flags > + UINT32 Flags; > + > + /// Memory range descriptor count. > + UINT32 NumMemRangeDesc; > + > + /// Offset of the memory range descriptor array. > + UINT32 MemRangeDescRef; > + // EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE IdMapping[1]; > + // EFI_ACPI_6_0_IO_REMAPPING_MEM_RANGE_DESC > MemRangeDesc[1]; > +} EFI_ACPI_6_0_IO_REMAPPING_RMR_NODE; > + > #pragma pack() >=20 > #endif > -- > 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' >=20 >=20 >=20 >=20 >=20