From nobody Tue Feb 10 16:18:32 2026 Delivered-To: importer@patchew.org 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+70242+1787277+3901457@groups.io; helo=mail02.groups.io; 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+70242+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1610534037; cv=none; d=zohomail.com; s=zohoarc; b=IHRt9FmTSFpEds/Hx1X3Oo28eAE+YJjZNIbhoa9jM8UAiXCVR+WX5hk55r/Pw1FFXJqENdui3TKmsT9PQCU+7i7SsO6VHMr2wIUW1OCHVS7xGDnrRysWQaXLRVeTQgL/IO1GnjQ8SPlJRsnhGwui+KF2lJvnJRsu92NhAcnq+4g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610534037; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=M+H85HbUQTKJ7D2tGHsiZrTP6pHCRj9b8ac96a01Z/w=; b=Rpv7x9QvboTGb7AcATSXEs8Z5NRJFm+vU8x9g1Og4WYYrFJm1GJC1j7cwRwkbHKUbxsBSSKJiZgqn0jKesonChwHC9oCqS+nBRDuD49LgjmrnsRYSET08uoIbbcPOdKW+d7qElcaIC8Ky0LxADAKJgNIvmDX2vuUIM27iQpO2MQ= ARC-Authentication-Results: i=1; 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+70242+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1610534037510264.1498326539231; Wed, 13 Jan 2021 02:33:57 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id kiOjYY1788612xEb1CQOWc4O; Wed, 13 Jan 2021 02:33:57 -0800 X-Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by mx.groups.io with SMTP id smtpd.web12.6136.1610534033004198989 for ; Wed, 13 Jan 2021 02:33:53 -0800 X-Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4DG3g60HSTzj6Q6; Wed, 13 Jan 2021 18:32:50 +0800 (CST) X-Received: from localhost (10.174.184.155) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.498.0; Wed, 13 Jan 2021 18:33:44 +0800 From: "Jiahui Cen via groups.io" To: CC: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Rebecca Cran , Peter Grehan , Anthony Perard , Julien Grall , Leif Lindholm , Sami Mujawar , , , Jiahui Cen , Yubo Miao Subject: [edk2-devel] [PATCH v5 08/10] OvmfPkg/PciHostBridgeUtilityLib: Extend parameter list of GetRootBridges Date: Wed, 13 Jan 2021 18:33:29 +0800 Message-ID: <20210113103331.10375-9-cenjiahui@huawei.com> In-Reply-To: <20210113103331.10375-1-cenjiahui@huawei.com> References: <20210113103331.10375-1-cenjiahui@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.184.155] X-CFilter-Loop: Reflected Precedence: Bulk List-Unsubscribe: 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,cenjiahui@huawei.com X-Gm-Message-State: pYm8VbacGS8MNt6RyTlywmcPx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1610534037; bh=KhY++vg6GxqlnwOkkDluqFJ5SsDeUcAtmSDs5X+O8YU=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=ojPoF/OLVXNApOS4+RTkKtyE212VwiIBlxbS20mKzj974Uqto/NLwajdpJlvnD+P2Od q7xSuAu4kjZc8+HA5eJXsVp+GhAHVyjGg25KRWUM2OfEMDwP3GPefcyjkqyo6NZw28Inu 8+Cyv4r1X8xVCeGB5R8m/74aadhq5M1YBME= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Extend parameter list of PciHostBridgeUtilityGetRootBridges() with DmaAbove4G, NoExtendedConfigSpace, BusMin and BusMax to support for ArmVirtPkg. BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3059 Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Jiahui Cen Signed-off-by: Yubo Miao --- OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf | 4 -- OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h | 30 += +++++++---- OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c | 7 += ++ OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c | 48 += +++++++++++-------- 4 files changed, 57 insertions(+), 32 deletions(-) diff --git a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLi= b.inf b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf index fdae8cfe872e..83a734c1725e 100644 --- a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf +++ b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf @@ -39,9 +39,5 @@ [LibraryClasses] DebugLib DevicePathLib MemoryAllocationLib - PcdLib PciLib QemuFwCfgLib - -[Pcd] - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId diff --git a/OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h b/OvmfPkg/In= clude/Library/PciHostBridgeUtilityLib.h index 29ea19f2d7e5..ed2b386001e1 100644 --- a/OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h +++ b/OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h @@ -100,23 +100,31 @@ PciHostBridgeUtilityUninitRootBridge ( /** Utility function to return all the root bridge instances in an array. =20 - @param[out] Count The number of root bridge instances. + @param[out] Count The number of root bridge instances. =20 - @param[in] Attributes Initial attributes. + @param[in] Attributes Initial attributes. =20 - @param[in] AllocAttributes Allocation attributes. + @param[in] AllocAttributes Allocation attributes. =20 - @param[in] Io IO aperture. + @param[in] DmaAbove4G DMA above 4GB memory. =20 - @param[in] Mem MMIO aperture. + @param[in] NoExtendedConfigSpace No Extended Config Space. =20 - @param[in] MemAbove4G MMIO aperture above 4G. + @param[in] BusMin Minimum Bus number =20 - @param[in] PMem Prefetchable MMIO aperture. + @param[in] BusMax Maximum Bus number =20 - @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G. + @param[in] Io IO aperture. =20 - @return All the root bridge instances in an array. + @param[in] Mem MMIO aperture. + + @param[in] MemAbove4G MMIO aperture above 4G. + + @param[in] PMem Prefetchable MMIO aperture. + + @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G. + + @return All the root bridge instances in an a= rray. **/ PCI_ROOT_BRIDGE * EFIAPI @@ -124,6 +132,10 @@ PciHostBridgeUtilityGetRootBridges ( UINTN *Count, UINT64 Attributes, UINT64 AllocationAttributes, + BOOLEAN DmaAbove4G, + BOOLEAN NoExtendedConfigSpace, + UINT32 BusMin, + UINT32 BusMax, PCI_ROOT_BRIDGE_APERTURE *Io, PCI_ROOT_BRIDGE_APERTURE *Mem, PCI_ROOT_BRIDGE_APERTURE *MemAbove4G, diff --git a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/OvmfPkg/= Library/PciHostBridgeLib/PciHostBridgeLib.c index 62e0a517a938..bd125834e5c4 100644 --- a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c +++ b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c @@ -9,6 +9,9 @@ **/ #include =20 +#include +#include + #include #include =20 @@ -82,6 +85,10 @@ PciHostBridgeGetRootBridges ( Count, Attributes, AllocationAttributes, + FALSE, + PcdGet16 (PcdOvmfHostBridgePciDevId) !=3D INTEL_Q35_MCH_DEVICE_ID, + 0, + PCI_MAX_BUS, &Io, &Mem, &MemAbove4G, diff --git a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLi= b.c b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c index 31a8c19d4f7f..fa090c428d13 100644 --- a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c +++ b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c @@ -12,12 +12,10 @@ =20 #include #include -#include #include #include #include #include -#include #include #include #include @@ -190,23 +188,31 @@ PciHostBridgeUtilityUninitRootBridge ( /** Utility function to return all the root bridge instances in an array. =20 - @param[out] Count The number of root bridge instances. + @param[out] Count The number of root bridge instances. =20 - @param[in] Attributes Initial attributes. + @param[in] Attributes Initial attributes. =20 - @param[in] AllocAttributes Allocation attributes. + @param[in] AllocAttributes Allocation attributes. =20 - @param[in] Io IO aperture. + @param[in] DmaAbove4G DMA above 4GB memory. =20 - @param[in] Mem MMIO aperture. + @param[in] NoExtendedConfigSpace No Extended Config Space. =20 - @param[in] MemAbove4G MMIO aperture above 4G. + @param[in] BusMin Minimum Bus number =20 - @param[in] PMem Prefetchable MMIO aperture. + @param[in] BusMax Maximum Bus number =20 - @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G. + @param[in] Io IO aperture. =20 - @return All the root bridge instances in an array. + @param[in] Mem MMIO aperture. + + @param[in] MemAbove4G MMIO aperture above 4G. + + @param[in] PMem Prefetchable MMIO aperture. + + @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G. + + @return All the root bridge instances in an a= rray. **/ PCI_ROOT_BRIDGE * EFIAPI @@ -214,6 +220,10 @@ PciHostBridgeUtilityGetRootBridges ( UINTN *Count, UINT64 Attributes, UINT64 AllocationAttributes, + BOOLEAN DmaAbove4G, + BOOLEAN NoExtendedConfigSpace, + UINT32 BusMin, + UINT32 BusMax, PCI_ROOT_BRIDGE_APERTURE *Io, PCI_ROOT_BRIDGE_APERTURE *Mem, PCI_ROOT_BRIDGE_APERTURE *MemAbove4G, @@ -241,7 +251,7 @@ PciHostBridgeUtilityGetRootBridges ( QemuFwCfgSelectItem (FwCfgItem); QemuFwCfgReadBytes (FwCfgSize, &ExtraRootBridges); =20 - if (ExtraRootBridges > PCI_MAX_BUS) { + if (ExtraRootBridges > BusMax - BusMin) { DEBUG ((DEBUG_ERROR, "%a: invalid count of extra root buses (%Lu) " "reported by QEMU\n", __FUNCTION__, ExtraRootBridges)); return NULL; @@ -263,15 +273,15 @@ PciHostBridgeUtilityGetRootBridges ( // // The "main" root bus is always there. // - LastRootBridgeNumber =3D 0; + LastRootBridgeNumber =3D BusMin; =20 // // Scan all other root buses. If function 0 of any device on a bus retur= ns a // VendorId register value different from all-bits-one, then that bus is // alive. // - for (RootBridgeNumber =3D 1; - RootBridgeNumber <=3D PCI_MAX_BUS && Initialized < ExtraRootBridges; + for (RootBridgeNumber =3D BusMin + 1; + RootBridgeNumber <=3D BusMax && Initialized < ExtraRootBridges; ++RootBridgeNumber) { UINTN Device; =20 @@ -291,8 +301,8 @@ PciHostBridgeUtilityGetRootBridges ( Attributes, Attributes, AllocationAttributes, - FALSE, - PcdGet16 (PcdOvmfHostBridgePciDevId) !=3D INTEL_Q35_MCH_DEVICE_ID, + DmaAbove4G, + NoExtendedConfigSpace, (UINT8) LastRootBridgeNumber, (UINT8) (RootBridgeNumber - 1), Io, @@ -318,8 +328,8 @@ PciHostBridgeUtilityGetRootBridges ( Attributes, Attributes, AllocationAttributes, - FALSE, - PcdGet16 (PcdOvmfHostBridgePciDevId) !=3D INTEL_Q35_MCH_DEVICE_ID, + DmaAbove4G, + NoExtendedConfigSpace, (UINT8) LastRootBridgeNumber, PCI_MAX_BUS, Io, --=20 2.29.2 -=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 (#70242): https://edk2.groups.io/g/devel/message/70242 Mute This Topic: https://groups.io/mt/79647749/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-