From nobody Sun May 12 19:18:56 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+93302+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1662496448255829.46394051261; Tue, 6 Sep 2022 13:34:08 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id FBAgYY1788612xClKwIXjgoX; Tue, 06 Sep 2022 13:34:07 -0700 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.87]) by mx.groups.io with SMTP id smtpd.web12.4614.1662496446784303942 for ; Tue, 06 Sep 2022 13:34:07 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hesfTWamUUPTqETQuK9U8qa+hCOHpmZx8KlkrRXSCUZ83Lbp+ln46O/x1a4Ftmvf1WzBqwGz4Agt4nT9OeYPAMluQSVv+jVN5C6vkkxOoKaeVVnePYlMVa/3ADgbX7c85boSUecOnzq224zQzoiz4xDPrsSp7wfhvqUH8d2Gz8I6ODYff43PXBzkh45cWBZzOcrsCIC3FoKO9ubDYKgUssjzNEOWuuJiOlrza9M0+iWMLvxSq/eTEkihqwRnJ5JkDFUWxGdSJgoclJ70lRNraDBqYX1AsEvA1W2bHC51DfxWZB4VpQijBHTh8s9ACxqduiYtMPi+m34OUXR359UyTQ== 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=1PMxAyqsEPdOcilfRNlQmSlRuxq4B3zEI3p/fD6jRqk=; b=AGIiGwFIKCx/fKdP3R4F7J9vp5x3hYU15QjROTSkq4TvSCTAlgBVPqs+vqtXS7sjvVRWRBB80gcr/wGBU7p3QCP6ZczEAao17Q6M4Mn9Ybs1FVygXDI0RhgU4fiShOrWoVuOHK+q7ETTClr36zfqRygd3EHXPApu+WCgYmAGN14EY8oVZgXaUckMtHhot4cCo4rJBQnanY7U1xG/ZCfS+kut58uwxS4duMZmU50indGUkuZ8LZhxzsfkmzAg0wFZ0uBEBawtWJjvZ3kBw8w1Wdz/ls/2HuuDOsNwcNii0gp8EKAZ1fftc01+6Zs9CW+OvmMEeCaimvhO17T4d7yeuA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=arm.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none X-Received: from DM6PR21CA0012.namprd21.prod.outlook.com (2603:10b6:5:174::22) by PH7PR12MB6396.namprd12.prod.outlook.com (2603:10b6:510:1fc::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.12; Tue, 6 Sep 2022 20:34:05 +0000 X-Received: from DM6NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:5:174:cafe::f8) by DM6PR21CA0012.outlook.office365.com (2603:10b6:5:174::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.4 via Frontend Transport; Tue, 6 Sep 2022 20:34:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.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+93302+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; pr=C X-Received: from mail.nvidia.com (12.22.5.235) by DM6NAM11FT011.mail.protection.outlook.com (10.13.172.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5612.13 via Frontend Transport; Tue, 6 Sep 2022 20:34:04 +0000 X-Received: from drhqmail202.nvidia.com (10.126.190.181) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.38; Tue, 6 Sep 2022 20:34:04 +0000 X-Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Tue, 6 Sep 2022 13:34:03 -0700 X-Received: from 9e107f4f5b88.nvidia.com (10.127.8.13) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.986.29 via Frontend Transport; Tue, 6 Sep 2022 13:34:03 -0700 From: "Jeff Brasen via groups.io" To: CC: , , , , Jeff Brasen Subject: [edk2-devel] [PATCH] DynamicTablesPkg: AcpiSsdtPcieLibArm: Allow use of segment number as UID Date: Tue, 6 Sep 2022 14:33:56 -0600 Message-ID: MIME-Version: 1.0 X-NVConfidentiality: public X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT011:EE_|PH7PR12MB6396:EE_ X-MS-Office365-Filtering-Correlation-Id: 743bbcd8-2e7b-439a-72a5-08da90472413 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: 82Ry4pqEXp6KrPKZXEGsi8DDRDHkHozXsc65BTSfOtq5m8DSpHLKMYdnELgtk8+RKQwRS+3dq0E6RRy0Vnlv7v/rZaL5j3taMMGa6HVXHU+h7UTVnRhbdZ4/vTXEV6F4tbmJUVhaSvRW3lM2oa15bxf0u9iwcCKzVWcdUwABGpUA2NObyQqRqGJjbGw6CqrdzjoPD8d3kM8ELgE+EeiaLilZsyUGvwGvqjXWncG9SwxzISV7xUC6XoJn1hs019KS83rpkdNGCJLgKsI1d4hEOpAlW7Xzg5zKq+jbWX3j0L1jkhkJpprIe+eIR+8/AiBAEwzBYHyknciq9hJc8b4Ji15s3wbDckxH4mZhP4VvQGZooTCnkgIOGaifP83EPUWvirI5ktCSlJFDiRGj6fE+LdzPNNzutlJDBzFi5On/SbXpJHYZfscE2N1l97OYGLR9FR7uNke9rwO4xMcz5xrF7ExC68afIL33+vD68As4ZHJLCR+DtZeb5ofWsWr0VLBye24XCsFSx1pkMpbzi3oNU4EGgVELnuMykEvcUHZqR0nsNd8py1wq051oH6WgIGgLezq2mLTimLIdCV09Yq6TGZ0aD03bYwM9Yx7WPoQG4TiMI2s6LooStW3HqpUnL+Mku9Ti1d2/ChWuc9isLdwDbDnO00tTtaVQgu77OddpSLtYmYYnriUpnlZcv6Pdo0WHlttbw+56nbSxlNf4B+BY46OAWPeTnDC36flefJhT/cS+fp9+TL8zoX/KIMlC/P8NwaXnCwqIeTjSqCBkcAnHl/cgWTIZy4v3086hty67wB/k467H997cqn+OMRUkKQ1gKL9lTQzvqf1eVNS/I1rwZQ== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 20:34:04.7428 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 743bbcd8-2e7b-439a-72a5-08da90472413 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[12.22.5.235];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6396 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,jbrasen@nvidia.com X-Gm-Message-State: mnBsaR6ZeiCTosJkGABhJevxx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1662496447; bh=U+wk1mFafEbA/1iAMfJRUv7AiEZfzFyaiYBIpaEgMEY=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=QliHSFcaDzrBi0WxMf62tu8rzyGaMo34IWDmY6VNxv2Khi6VL6C/j4OMlLiqDGTR7Cw 9PPHaq0wDDExwqfs/wVi4V9rHQqkCkpjbjR0CcsIEHqDqsJqmOJFtXE6A4ziMDHmXmbNI Q55vTPnIKYQhgR8I0pb8ev3mqLUJ9NTb2LA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1662496449937100001 Content-Type: text/plain; charset="utf-8" Add support for selecting to use index or segment number as UID and name. This allows the path of the nodes to be well known. For example, if the PCIe node needs to be notified from by an interrupt for a Generic Event Device Signed-off-by: Jeff Brasen Reviewed-by: Pierre Gondois Reviewed-by: Sami Mujawar --- DynamicTablesPkg/DynamicTablesPkg.dec | 3 +++ .../AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 19 ++++++++++++++++++- .../Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.inf | 3 +++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/DynamicTablesPkg/DynamicTablesPkg.dec b/DynamicTablesPkg/Dynam= icTablesPkg.dec index cc34c2bdd6..adc2e67cbf 100644 --- a/DynamicTablesPkg/DynamicTablesPkg.dec +++ b/DynamicTablesPkg/DynamicTablesPkg.dec @@ -60,5 +60,8 @@ # Non BSA Compliant 16550 Serial HID gEdkiiDynamicTablesPkgTokenSpaceGuid.PcdNonBsaCompliant16550SerialHid|""= |VOID*|0x40000008 =20 + # Use PCI segment numbers as UID + gEdkiiDynamicTablesPkgTokenSpaceGuid.PcdPciUseSegmentAsUid|FALSE|BOOLEAN= |0x40000009 + [Guids] gEdkiiDynamicTablesPkgTokenSpaceGuid =3D { 0xab226e66, 0x31d8, 0x4613, {= 0x87, 0x9d, 0xd2, 0xfa, 0xb6, 0x10, 0x26, 0x3c } } diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.c index d82f071e85..85098752c6 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c @@ -981,6 +981,7 @@ BuildSsdtPciTableEx ( UINTN Index; EFI_ACPI_DESCRIPTION_HEADER **TableList; ACPI_PCI_GENERATOR *Generator; + UINT32 Uid; =20 ASSERT (This !=3D NULL); ASSERT (AcpiTableInfo !=3D NULL); @@ -1036,13 +1037,29 @@ BuildSsdtPciTableEx ( *Table =3D TableList; =20 for (Index =3D 0; Index < PciCount; Index++) { + if (PcdGetBool (PcdPciUseSegmentAsUid)) { + Uid =3D PciInfo[Index].PciSegmentGroupNumber; + if (Uid > MAX_PCI_ROOT_COMPLEXES_SUPPORTED) { + DEBUG (( + DEBUG_ERROR, + "ERROR: SSDT-PCI: Pci root complexes segment number: %d." + " Greater than maximum number of Pci root complexes supported = =3D %d.\n", + Uid, + MAX_PCI_ROOT_COMPLEXES_SUPPORTED + )); + return EFI_INVALID_PARAMETER; + } + } else { + Uid =3D Index; + } + // Build a SSDT table describing the Pci devices. Status =3D BuildSsdtPciTable ( Generator, CfgMgrProtocol, AcpiTableInfo, &PciInfo[Index], - Index, + Uid, &TableList[Index] ); if (EFI_ERROR (Status)) { diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieL= ibArm.inf b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieLi= bArm.inf index b38a4e9d34..c2a1acb570 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.i= nf +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.i= nf @@ -30,3 +30,6 @@ AmlLib BaseLib SsdtPcieSupportLib + +[Pcd] + gEdkiiDynamicTablesPkgTokenSpaceGuid.PcdPciUseSegmentAsUid --=20 2.25.1 -=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 (#93302): https://edk2.groups.io/g/devel/message/93302 Mute This Topic: https://groups.io/mt/93510745/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-