From nobody Mon Feb 9 14:00:06 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+90934+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 1656604142432654.2401829002358; Thu, 30 Jun 2022 08:49:02 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id AOvnYY1788612xhg4LUzNzIk; Thu, 30 Jun 2022 08:49:02 -0700 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.64]) by mx.groups.io with SMTP id smtpd.web08.26786.1656604141319588818 for ; Thu, 30 Jun 2022 08:49:01 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cEbuazgeN0RcQ5Danhy1TPk0QGo5HvbOXE5y/JDOkveVobC2fpA9YHUmWu4CEY9pPi6paprYnRpFHIabfjf0r0KdiSCsOuwnYF9o+Z6vXaZCCdpTrBvbR3Vf0D7Zgeh4f82DKsGskwvwCzFp9bELikhC5bSA1u8YisUwyOd0X+XpK3N4VFbBTfZs9TLwAdUC3EIbHl8fjeK6QqvsHjs/FwP1PZGJpMuQw85RO6Wgb3eXNQqiI0CRY1eihCWIs8iVPzb1Wmxlfikwbm9KTNiy3MCNh6pGXe5kwO/1WWTYZzkEcAFF+nGZA52bL4So/SgjzD7g9xvnL6HK6ygLU1g8tA== 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=p972YgBT388mbKHUKJsPHcADe7kmuvQq4l9rpeZqExU=; b=M5NW+7ZZg/QCo43fh7Q5vwiNpE1eDwH74PVc32KPLnWE7e7AFZlSwQj7bNPx9Gyb3BiR2yDzTnwXUQW8fIGajAymfgG4Nk1Y5LZm24hu5L7PKzs5dDUH6sOaXBV2ThP6sh9arnykFufleLHhQ6rOcsBjaJCEdkbDwVdn+HW5CTLDhtLXk5ZMV+doa8m1Aw00g0BXQzrT8RlAdJMydY6C/vMOwiMJUCkAeVEwOH78XFnuxSstvKKAFihq+CgESY2dMBGAC6hv8PI1J5gdAOqba5ldLNu8YrPx72nq4Q+zUhmjIRBTf0ddDkrBwVTF34MkJZsP8dZdMPInOY24dVpLbw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) 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 BN9PR03CA0954.namprd03.prod.outlook.com (2603:10b6:408:108::29) by BYAPR12MB3479.namprd12.prod.outlook.com (2603:10b6:a03:dc::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.17; Thu, 30 Jun 2022 15:48:58 +0000 X-Received: from BN8NAM11FT024.eop-nam11.prod.protection.outlook.com (2603:10b6:408:108:cafe::1a) by BN9PR03CA0954.outlook.office365.com (2603:10b6:408:108::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.15 via Frontend Transport; Thu, 30 Jun 2022 15:48:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.236) 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+90934+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.236 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.236; helo=mail.nvidia.com; pr=C X-Received: from mail.nvidia.com (12.22.5.236) by BN8NAM11FT024.mail.protection.outlook.com (10.13.177.38) 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:57 +0000 X-Received: from drhqmail201.nvidia.com (10.126.190.180) by DRHQMAIL109.nvidia.com (10.27.9.19) 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 drhqmail201.nvidia.com (10.126.190.180) 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:55 -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 3/4] DynamicTablesPkg: AcpiSsdtPcieLibArm: Support UID > 0xF Date: Thu, 30 Jun 2022 09:48:50 -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: e4e5f739-6b44-4167-8ab3-08da5ab00b8e X-MS-TrafficTypeDiagnostic: BYAPR12MB3479:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: RG83YPUDNIoaFjCMU9vE0a3N5vvUvV6qd/9FYazIvbXRhun1bt7aZN7eejGRU7cjFymCfrBhBdqIUUUA8bImjFoNILk+w2PZVO8RBBCf5vOf9MfQmExmOI4xsObQQuNVuvYWW990NsPW6onjYBK+yu9PHk7LGB7k3aaUl34d7EZkwUoYzhTGetDrqMN3hx1xYpOmSNEHYKUV2SkybRILRQJzvlv+lL+2KUqcnQ4KuE33/ZWx2yybYmihl0Ugi/fApQY3pUgdR4rztFBfuEVAPlEESraKWfbvKZjX55keeX10bQjVne0Z4+OymuYg9q/UEqw6RJis2IEc9Kn50eMlZ9gmheVIIG/otHvVKDhZuPsssU12ctuCfFkmdncIOgf9Y1UM39wl+qTqkV3vRw85En9zd924/tHXl084n4E6CAFD2bIHg9kQmu6sGQaE8UktVEwg2XrUDCPw5MX1F9yVyqWkmMvLCc0jxHgvq52RA30ybf9QQRiXSqQNnlndUQouPXkgssbURDVlBME2Zsxh8bihB9yOvc0cubOC9DuYYY4vD+7993QRSKb/LSWwHZeTU7jVJweYtpVa0aFPSD55AAQUSoAEN9dMnz+yrWo2/VM3rC/rNDGyY8qm01giKek+B8xYkXYZWt7vgA2yl/QxJfcFt5TixDl0Kxionav1HHE0+Q4GFuoqLJjfcohy+6OvFxAtW9EXKlXeBa+iPnxE5RIRRDDo3Z0rvHRpssm43kzjlFdAV6rbulN/GIN+jFK3KQ0Rrtcr+gm1hhb11Sw/M8up4FBl5ZuynSWaF5gii7NhKRPH1fkF5Gv97PrZyh6QJaDEgNdiBzJJOV8Y8AXiHJFSr9UxLannAAjNwWpBpn4P83pf0B8ECV+XQaVoYrKd X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 15:48:57.9106 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e4e5f739-6b44-4167-8ab3-08da5ab00b8e 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.236];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT024.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3479 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: i5cLpXWspQfCLkSFHlf1yjcTx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1656604142; bh=73jZdzgBj3wJG7yhj53pSKNXZlyxKnsxNyJuU+cwhL0=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=aezL84dGwuFnpEHlkqwHDAiR9sRtCJcoQ03Tak7cRY4LsBnARuwKqgN+WqeQOJjVf9r gD2uAxvVFEPix+b3A/RvAXVP8EbQjbY/5AL7ldSFv+EmXQrBZByiba6VXpERfTpfz/cQG /ZiRgZBu0BLCUKEQOY0eHaTGTcwU/XfAEZI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1656604144583100019 Content-Type: text/plain; charset="utf-8" Add support for PCIe devices with UID > 0xF. This is done by using the next value in the name so PCI5, PC26, etc Signed-off-by: Jeff Brasen --- .../Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c | 11 +++++++---- .../Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.c index 85782af380..c5b23d91d0 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c @@ -818,7 +818,10 @@ GeneratePciDevice ( =20 // Write the name of the PCI device. CopyMem (AslName, "PCIx", AML_NAME_SEG_SIZE + 1); - AslName[AML_NAME_SEG_SIZE - 1] =3D AsciiFromHex (Uid); + AslName[AML_NAME_SEG_SIZE - 1] =3D AsciiFromHex (Uid & 0xF); + if (Uid > 0xF) { + AslName[AML_NAME_SEG_SIZE - 2] =3D AsciiFromHex ((Uid >> 4) & 0xF); + } =20 // ASL: Device (PCIx) {} Status =3D AmlCodeGenDevice (AslName, ScopeNode, &PciNode); @@ -1054,13 +1057,13 @@ BuildSsdtPciTableEx ( for (Index =3D 0; Index < PciCount; Index++) { if (PcdGetBool (PcdPciUseSegmentAsUid)) { Uid =3D PciInfo[Index].PciSegmentGroupNumber; - if (Uid > MAX_PCI_ROOT_COMPLEXES_SUPPORTED) { + if (Uid >=3D 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", + " Greater than maximum supported value =3D %d.\n", Uid, - MAX_PCI_ROOT_COMPLEXES_SUPPORTED + MAX_PCI_ROOT_COMPLEXES_SUPPORTED - 1 )); return EFI_INVALID_PARAMETER; } diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.h b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.h index 59a0d601a3..515a3e1785 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.h +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.h @@ -31,7 +31,7 @@ Corresponding changes would be needed to support the Name and UID fields describing the Pci root complexes. */ -#define MAX_PCI_ROOT_COMPLEXES_SUPPORTED 16 +#define MAX_PCI_ROOT_COMPLEXES_SUPPORTED 256 =20 // _SB scope of the AML namespace. #define SB_SCOPE "\\_SB_" --=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 (#90934): https://edk2.groups.io/g/devel/message/90934 Mute This Topic: https://groups.io/mt/92089322/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-