From nobody Mon Feb 9 19:06:49 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+70525+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+70525+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1611018910; cv=none; d=zohomail.com; s=zohoarc; b=OZ0Va7M+7k+MhXUSDm423CJXA8InER7g7u3YWaC2/J9+BRejO8Q59Gvgz8F6pffGnNjtqRznFRi5I2i87bKMng4lzoqz3eZKsZjsOZ5VpSECOU9HuMe50vmi/3SNHAJrcnU2WEOg20aST+5CEQflr1Ge3DCgy6N0eeVhg8JyBFY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611018910; 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=+3xIDFtKkh/3k8H7WCXORYbKxYJfXiWYvgR+KB1Fvxk=; b=TahDog6KChPr80Nw8JhzLxX8n6gX/jii+YYLTxvsKSNEMKVMLn5Td7SeF6g0uJgi6LGjrQ9tEsF3SOGGrl5HqHElXRuHEZzk/75cP8LcrnogOJU7fSk4keNcJn+V8DGuKFZi+GhhRIX6KhA+pTSKQTcHXp8xsvdY8ZwPCZdcw7Q= 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+70525+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1611018910712233.07999316125688; Mon, 18 Jan 2021 17:15:10 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZXNGYY1788612xlAR3xj65Yg; Mon, 18 Jan 2021 17:15:10 -0800 X-Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by mx.groups.io with SMTP id smtpd.web12.5520.1611018903514289976 for ; Mon, 18 Jan 2021 17:15:04 -0800 X-Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4DKVzP6yJSz15vhD; Tue, 19 Jan 2021 09:13:53 +0800 (CST) X-Received: from localhost (10.174.184.155) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.498.0; Tue, 19 Jan 2021 09:14:49 +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 v6 08/11] OvmfPkg/PciHostBridgeUtilityLib: Extend parameter list of GetRootBridges Date: Tue, 19 Jan 2021 09:12:59 +0800 Message-ID: <20210119011302.10908-9-cenjiahui@huawei.com> In-Reply-To: <20210119011302.10908-1-cenjiahui@huawei.com> References: <20210119011302.10908-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: Kp8akP1biOpoyjahzZM1wa3Gx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1611018910; bh=4aBc1177EwLgoQ0w7RcHI/2RBNvJw0clh1ZOVYMKD+8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=aQ+2U24XWGCsE1M9hplS79rBhhfI01XAWjJU7UpiDzQaNWyQCGmPNayOCgfkIOnvoWT s/aA8qb6OfOayvGMrtrAEqe0KuFMTw6g4qajnsUNbiOXuiXqdFZZdQTDQXkFz6cpA7UdX +6Ol19keskbBxgmpnb1uH5P5bE9Ofx0kO5s= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Extend parameter list of PciHostBridgeUtilityGetRootBridges() with DmaAbove4G, NoExtendedConfigSpace 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 Reviewed-by: Laszlo Ersek --- OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf | 4 -= -- OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h | 24 += +++++++------ OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c | 5 += ++ OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c | 34 += ++++++++++--------- 4 files changed, 39 insertions(+), 28 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 2b7d5d3725c3..a0ea44d96a67 100644 --- a/OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h +++ b/OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h @@ -102,23 +102,27 @@ 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] Io IO aperture. =20 - @param[in] PMem Prefetchable MMIO aperture. + @param[in] Mem MMIO aperture. =20 - @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G. + @param[in] MemAbove4G MMIO aperture above 4G. =20 - @return All the root bridge instances in an array. + @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 @@ -126,6 +130,8 @@ PciHostBridgeUtilityGetRootBridges ( OUT UINTN *Count, IN UINT64 Attributes, IN UINT64 AllocationAttributes, + IN BOOLEAN DmaAbove4G, + IN BOOLEAN NoExtendedConfigSpace, IN PCI_ROOT_BRIDGE_APERTURE *Io, IN PCI_ROOT_BRIDGE_APERTURE *Mem, IN PCI_ROOT_BRIDGE_APERTURE *MemAbove4G, diff --git a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/OvmfPkg/= Library/PciHostBridgeLib/PciHostBridgeLib.c index 6ac41ff853a9..91b9e6baa1e8 100644 --- a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c +++ b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c @@ -9,6 +9,9 @@ **/ #include =20 +#include +#include + #include #include =20 @@ -80,6 +83,8 @@ PciHostBridgeGetRootBridges ( Count, Attributes, AllocationAttributes, + FALSE, + PcdGet16 (PcdOvmfHostBridgePciDevId) !=3D INTEL_Q35_MCH_DEVICE_ID, &Io, &Mem, &MemAbove4G, diff --git a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLi= b.c b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c index b1e74a469d50..1d78984b83ad 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 @@ -192,23 +190,27 @@ 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] Io IO aperture. =20 - @param[in] PMem Prefetchable MMIO aperture. + @param[in] Mem MMIO aperture. =20 - @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G. + @param[in] MemAbove4G MMIO aperture above 4G. =20 - @return All the root bridge instances in an array. + @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 @@ -216,6 +218,8 @@ PciHostBridgeUtilityGetRootBridges ( OUT UINTN *Count, IN UINT64 Attributes, IN UINT64 AllocationAttributes, + IN BOOLEAN DmaAbove4G, + IN BOOLEAN NoExtendedConfigSpace, IN PCI_ROOT_BRIDGE_APERTURE *Io, IN PCI_ROOT_BRIDGE_APERTURE *Mem, IN PCI_ROOT_BRIDGE_APERTURE *MemAbove4G, @@ -295,8 +299,8 @@ PciHostBridgeUtilityGetRootBridges ( Attributes, Attributes, AllocationAttributes, - FALSE, - PcdGet16 (PcdOvmfHostBridgePciDevId) !=3D INTEL_Q35_MCH_DEVICE_ID, + DmaAbove4G, + NoExtendedConfigSpace, (UINT8) LastRootBridgeNumber, (UINT8) (RootBridgeNumber - 1), Io, @@ -322,8 +326,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 (#70525): https://edk2.groups.io/g/devel/message/70525 Mute This Topic: https://groups.io/mt/79941635/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-