From nobody Mon Feb 9 02:24:37 2026 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+90932+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 1656604139552353.58111375946885; Thu, 30 Jun 2022 08:48:59 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8whoYY1788612xnuCffRgyvK; Thu, 30 Jun 2022 08:48:58 -0700 X-Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.80]) by mx.groups.io with SMTP id smtpd.web08.26784.1656604137832924515 for ; Thu, 30 Jun 2022 08:48:58 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J6X23GdKPEykx0RT2PHUGV2jS6E2kBlFyfuyPgTTNLHde+3UaFgDU4jp5d9bFnUIOtqs7DQrxEIlQ2zODdI5VcsekbOKf6LrpyyL5Shxtspt3e6WwGEqWt2q9SUx4Qf7UDozK5iDXDCTANRAMxCW1kVACll3n00QB/gow1PWg4ek4b8vbieM4rI95neTY+Psro5E2GCcz2/7XeIsu0gIEaD9hYRowfj66XqRluZyYY/S0U+Pi2/RJnxo1O/MTIsHkWLOiRhKQ/p+FPdPu/RhrRklYxtSzRjdaQXM6bG9EPFDaWBvL9c00cGkBjiUnDx72gUFOU6dsNjwX1uQXYc2Nw== 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=G6XotJDKS38NmggwG9SKo2NTRgb7FehyoBFhytkQDnk=; b=J3OSiNMOq7fWgEohOh89W+Lp+Fpd6c10A10DWW47b5KDNNJZhyAiYqkuQ7TciFl2ZmVlL91xehlZxfYBxGUvcbmzPdoV83oE45Soqr21Nxpo6qNBSB3bcQ7yCra3INjDAcRC8LWqJgjBEscw8zv4fpcWowAzPcnv43f+d2Wsje8NFI5zLVkq4E49SxbkjlFG8jWMpWMz99FMwf2Kwf1VBC0Imj5q2IxQlGO5melhKVZRyxPIRMTZXLA/NdhHw3xCIdgUl7Ih+43XxJhBN4hTRnojVxot4uT2gGj1QYTorlHmIiuC71yXoDln+NuiuaTC4maMqGgy79yPQIVLaHLLEw== 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 DM6PR07CA0060.namprd07.prod.outlook.com (2603:10b6:5:74::37) by BL0PR12MB2547.namprd12.prod.outlook.com (2603:10b6:207:3e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Thu, 30 Jun 2022 15:48:55 +0000 X-Received: from DM6NAM11FT014.eop-nam11.prod.protection.outlook.com (2603:10b6:5:74:cafe::57) by DM6PR07CA0060.outlook.office365.com (2603:10b6:5:74::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14 via Frontend Transport; Thu, 30 Jun 2022 15:48:55 +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+90932+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 DM6NAM11FT014.mail.protection.outlook.com (10.13.173.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5395.14 via Frontend Transport; Thu, 30 Jun 2022 15:48:55 +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.32; Thu, 30 Jun 2022 15:48:55 +0000 X-Received: from drhqmail202.nvidia.com (10.126.190.181) 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.26; Thu, 30 Jun 2022 08:48:54 -0700 X-Received: from perses.nvidia.com (10.127.8.14) by mail.nvidia.com (10.126.190.181) with Microsoft SMTP Server id 15.2.986.26 via Frontend Transport; Thu, 30 Jun 2022 08:48:54 -0700 From: "Jeff Brasen via groups.io" To: CC: , , , Jeff Brasen Subject: [edk2-devel] [PATCH 2/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Allow use of segment number as UID Date: Thu, 30 Jun 2022 09:48:49 -0600 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-NVConfidentiality: public X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 554aa567-a2b4-4669-64d7-08da5ab00a1b X-MS-TrafficTypeDiagnostic: BL0PR12MB2547:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: z/nEPNt89vU1+9Y1m8wUyJ+itZCJDoti1AqF/jviDIPimVlKF5sTrXhJpIeXwDcw9K8Wq1k4S6Q1/jmTihYQ+7YstzkiLAyUjaaPHz66AAIF4DkslF4dv1gN8ZfLL6dG2gM/tZp/Ssv0EEup7js6M82DqJ2LV/6M4jRWv8H0WKk4yW8Gedc+sO1emDtIP56gmub8GieFFNo+zhoNLrDwbkRx6Ra+C3qRGM8Ntkx/YYpm5/gaNEp/JhpLjbp0oC/+/hfUzUlfNfDAb3EE++LTa2LWFF8uytricKt7xe1wB+LQAJ/KQav7D1iVtBthhFZzFYPnrK46KBDk+P6PgXWgsQ75HhJE8AlY3HwaTbQ2RujspnC30gjJcw168t/C4ov0oaczLEf+eE7GGPQgiO7TEgdJCgCFGkGAFtIrrXrtBfAcYJYxVF7oYATQa2hbEY8tjr/m1wdJsgNDJYdwaseikdP0OsVqcSg7we6v97p0nzSoYgUki7ckieYQoKpLyPm04yji5fUATX0QJ8B8LRGzq5fZd4M7CjwuCWj2eYdJFy/e8BL/CJlQR2IUR1w5oD0ZW8QuoQbVdd8B7hJwDXUOSeg1M/p+C5eDLtd8bMOwhW98Ik7mrJbHGVcPrfRfXNs8sEzZmQbZA1YxHaT1UgF7cErRZoJrHmcJJ0sjh7DVdYnRyecI3MvHGARxpcowjEnjq2HjcdUpND+Gf+tVmb5uZRv+9tfw4nUvUaD72xRelq97fc/uNpWWWUg052WlYcKQa9jiBhFtTXg8b8QMUZ2tF/LGjHXACW39f3MXZXEkvv7hcNaMyAPX135Tg45Q/ag/HhOvQ/dhe7q4AkR3ktFBCZJj3yWlDetxlAvUF13oTrgsrbeY60RicMhmBZBVrZGA X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 15:48:55.5564 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 554aa567-a2b4-4669-64d7-08da5ab00a1b 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: DM6NAM11FT014.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB2547 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: gnaD1csp5V4JIWuQ5dfSQG18x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1656604138; bh=MjkpEDzSkpT8eJYGOr8ev/nLfOzfZlJ59pqed2Vd9D4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=IhH9zozKUGjBBv0UqzI/ZhwLX0zj6Z+qcyneDry9kWEQ632LycVm8WHFjAYghntrG6R DGrVw7wqt+Rbj68QdjKko9l8jOXCws1UuOHAegzmtZDqZG7IiUnPxQNaU5iq9hR5agzeC SzvnMXUX+Q3L5lf18sB4ixMLQl57uDci/Jg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1656604140580100009 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. Signed-off-by: Jeff Brasen --- 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 9b74c5a671..a890a048be 100644 --- a/DynamicTablesPkg/DynamicTablesPkg.dec +++ b/DynamicTablesPkg/DynamicTablesPkg.dec @@ -57,5 +57,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 f0d15f69a4..85782af380 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c @@ -996,6 +996,7 @@ BuildSsdtPciTableEx ( UINTN Index; EFI_ACPI_DESCRIPTION_HEADER **TableList; ACPI_PCI_GENERATOR *Generator; + UINT32 Uid; =20 ASSERT (This !=3D NULL); ASSERT (AcpiTableInfo !=3D NULL); @@ -1051,13 +1052,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 283b564801..431e32a777 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.i= nf +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieLibArm.i= nf @@ -30,3 +30,6 @@ AcpiHelperLib AmlLib BaseLib + +[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 (#90932): https://edk2.groups.io/g/devel/message/90932 Mute This Topic: https://groups.io/mt/92089320/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-