From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35]) by mx.groups.io with SMTP id smtpd.web11.5328.1611018896462274118 for ; Mon, 18 Jan 2021 17:14:57 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: huawei.com, ip: 45.249.212.35, mailfrom: cenjiahui@huawei.com) Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4DKVzK13hFz7Wxc; Tue, 19 Jan 2021 09:13:49 +0800 (CST) Received: from localhost (10.174.184.155) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.498.0; Tue, 19 Jan 2021 09:14:47 +0800 From: "Jiahui Cen" 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: [PATCH v6 05/11] OvmfPkg/PciHostBridgeUtilityLib: Extend parameters of InitRootBridge() Date: Tue, 19 Jan 2021 09:12:56 +0800 Message-ID: <20210119011302.10908-6-cenjiahui@huawei.com> X-Mailer: git-send-email 2.25.1 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 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Extend parameter list of PciHostBridgeUtilityInitRootBridge() with DmaAbove4G and NoExtendedConfigSpace to prepare for sharing with ArmVirtPkg. BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3059 Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Anthony Perard Cc: Julien Grall Signed-off-by: Jiahui Cen Signed-off-by: Yubo Miao --- OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf | 1= + OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf | 4= -- OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h | 56= +++++++++-------- OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c | 5= ++ OvmfPkg/Library/PciHostBridgeLib/XenSupport.c | 1= + OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c | 63= +++++++++++--------- 6 files changed, 73 insertions(+), 57 deletions(-) diff --git a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Ovmf= Pkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf index 7944f94b7743..72458262cb42 100644 --- a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf +++ b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf @@ -50,4 +50,5 @@ [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio32Size gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Base gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Size + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration diff --git a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtility= Lib.inf b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib= .inf index e3d0a3740952..4d6764b702f4 100644 --- a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf +++ b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf @@ -39,7 +39,3 @@ [LibraryClasses] DebugLib DevicePathLib MemoryAllocationLib - PcdLib - -[Pcd] - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId diff --git a/OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h b/OvmfPkg/= Include/Library/PciHostBridgeUtilityLib.h index 8a1ddc2f5e02..a44ad5034520 100644 --- a/OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h +++ b/OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h @@ -20,43 +20,49 @@ /** Utility function to initialize a PCI_ROOT_BRIDGE structure. =20 - @param[in] Supports Supported attributes. + @param[in] Supports Supported attributes. =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] RootBusNumber The bus number to store in RootBus. + @param[in] DmaAbove4G DMA above 4GB memory. =20 - @param[in] MaxSubBusNumber The inclusive maximum bus number that can= be - assigned to any subordinate bus found beh= ind any - PCI bridge hanging off this root bus. + @param[in] NoExtendedConfigSpace No Extended Config Space. =20 - The caller is repsonsible for ensuring th= at - RootBusNumber <=3D MaxSubBusNumber. If - RootBusNumber equals MaxSubBusNumber, the= n the - root bus has no room for subordinate buse= s. + @param[in] RootBusNumber The bus number to store in RootBus. =20 - @param[in] Io IO aperture. + @param[in] MaxSubBusNumber The inclusive maximum bus number th= at can + be assigned to any subordinate bus = found + behind any PCI bridge hanging off t= his + root bus. =20 - @param[in] Mem MMIO aperture. + The caller is repsonsible for ensur= ing + that RootBusNumber <=3D MaxSubBusNu= mber. If + RootBusNumber equals MaxSubBusNumbe= r, then + the root bus has no room for subord= inate + buses. =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 - @param[out] RootBus The PCI_ROOT_BRIDGE structure (allocated = by the - caller) that should be filled in by this - function. + @param[in] PMem Prefetchable MMIO aperture. =20 - @retval EFI_SUCCESS Initialization successful. A device path - consisting of an ACPI device path node, = with - UID =3D RootBusNumber, has been allocate= d and - linked into RootBus. + @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G= . =20 - @retval EFI_OUT_OF_RESOURCES Memory allocation failed. + @param[out] RootBus The PCI_ROOT_BRIDGE structure (allo= cated + by the caller) that should be fille= d in by + this function. + + @retval EFI_SUCCESS Initialization successful. A device= path + consisting of an ACPI device path n= ode, + with UID =3D RootBusNumber, has bee= n + allocated and linked into RootBus. + + @retval EFI_OUT_OF_RESOURCES Memory allocation failed. **/ EFI_STATUS EFIAPI @@ -64,6 +70,8 @@ PciHostBridgeUtilityInitRootBridge ( IN UINT64 Supports, IN UINT64 Attributes, IN UINT64 AllocAttributes, + IN BOOLEAN DmaAbove4G, + IN BOOLEAN NoExtendedConfigSpace, IN UINT8 RootBusNumber, IN UINT8 MaxSubBusNumber, IN PCI_ROOT_BRIDGE_APERTURE *Io, diff --git a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/OvmfPk= g/Library/PciHostBridgeLib/PciHostBridgeLib.c index 07fa98110e98..8758d7c12bf0 100644 --- a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c +++ b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c @@ -10,6 +10,7 @@ #include =20 #include +#include =20 #include #include @@ -151,6 +152,8 @@ PciHostBridgeGetRootBridges ( Attributes, Attributes, AllocationAttributes, + FALSE, + PcdGet16 (PcdOvmfHostBridgePciDevId) !=3D INTEL_Q35_MCH_DEVICE_I= D, (UINT8) LastRootBridgeNumber, (UINT8) (RootBridgeNumber - 1), &Io, @@ -176,6 +179,8 @@ PciHostBridgeGetRootBridges ( Attributes, Attributes, AllocationAttributes, + FALSE, + PcdGet16 (PcdOvmfHostBridgePciDevId) !=3D INTEL_Q35_MCH_DEVICE_ID, (UINT8) LastRootBridgeNumber, PCI_MAX_BUS, &Io, diff --git a/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c b/OvmfPkg/Libr= ary/PciHostBridgeLib/XenSupport.c index 5dfeba0e6e23..9ef39f01821b 100644 --- a/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c +++ b/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c @@ -456,6 +456,7 @@ ScanForRootBridges ( ASSERT (RootBridges !=3D NULL); PciHostBridgeUtilityInitRootBridge ( Attributes, Attributes, 0, + FALSE, PcdGet16 (PcdOvmfHostBridgePciDevId) !=3D INTEL_Q35_MCH_D= EVICE_ID, (UINT8) PrimaryBus, (UINT8) SubBus, &Io, &Mem, &MemAbove4G, &mNonExistAperture, &mNonExistAperture, &RootBridges[*NumberOfRootBridges] diff --git a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtility= Lib.c b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c index 92b42566e5f8..bed2d87ea89c 100644 --- a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c +++ b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c @@ -11,12 +11,10 @@ **/ =20 #include -#include #include #include #include #include -#include #include =20 =20 @@ -64,43 +62,49 @@ OVMF_PCI_ROOT_BRIDGE_DEVICE_PATH mRootBridgeDevicePat= hTemplate =3D { /** Utility function to initialize a PCI_ROOT_BRIDGE structure. =20 - @param[in] Supports Supported attributes. + @param[in] Supports Supported attributes. =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] RootBusNumber The bus number to store in RootBus. + @param[in] DmaAbove4G DMA above 4GB memory. =20 - @param[in] MaxSubBusNumber The inclusive maximum bus number that can= be - assigned to any subordinate bus found beh= ind any - PCI bridge hanging off this root bus. + @param[in] NoExtendedConfigSpace No Extended Config Space. =20 - The caller is repsonsible for ensuring th= at - RootBusNumber <=3D MaxSubBusNumber. If - RootBusNumber equals MaxSubBusNumber, the= n the - root bus has no room for subordinate buse= s. + @param[in] RootBusNumber The bus number to store in RootBus. =20 - @param[in] Io IO aperture. + @param[in] MaxSubBusNumber The inclusive maximum bus number th= at can + be assigned to any subordinate bus = found + behind any PCI bridge hanging off t= his + root bus. =20 - @param[in] Mem MMIO aperture. + The caller is repsonsible for ensur= ing + that RootBusNumber <=3D MaxSubBusNu= mber. If + RootBusNumber equals MaxSubBusNumbe= r, then + the root bus has no room for subord= inate + buses. =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 - @param[out] RootBus The PCI_ROOT_BRIDGE structure (allocated = by the - caller) that should be filled in by this - function. + @param[in] PMem Prefetchable MMIO aperture. =20 - @retval EFI_SUCCESS Initialization successful. A device path - consisting of an ACPI device path node, = with - UID =3D RootBusNumber, has been allocate= d and - linked into RootBus. + @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G= . =20 - @retval EFI_OUT_OF_RESOURCES Memory allocation failed. + @param[out] RootBus The PCI_ROOT_BRIDGE structure (allo= cated + by the caller) that should be fille= d in by + this function. + + @retval EFI_SUCCESS Initialization successful. A device= path + consisting of an ACPI device path n= ode, + with UID =3D RootBusNumber, has bee= n + allocated and linked into RootBus. + + @retval EFI_OUT_OF_RESOURCES Memory allocation failed. **/ EFI_STATUS EFIAPI @@ -108,6 +112,8 @@ PciHostBridgeUtilityInitRootBridge ( IN UINT64 Supports, IN UINT64 Attributes, IN UINT64 AllocAttributes, + IN BOOLEAN DmaAbove4G, + IN BOOLEAN NoExtendedConfigSpace, IN UINT8 RootBusNumber, IN UINT8 MaxSubBusNumber, IN PCI_ROOT_BRIDGE_APERTURE *Io, @@ -130,7 +136,7 @@ PciHostBridgeUtilityInitRootBridge ( RootBus->Supports =3D Supports; RootBus->Attributes =3D Attributes; =20 - RootBus->DmaAbove4G =3D FALSE; + RootBus->DmaAbove4G =3D DmaAbove4G; =20 RootBus->AllocationAttributes =3D AllocAttributes; RootBus->Bus.Base =3D RootBusNumber; @@ -141,8 +147,7 @@ PciHostBridgeUtilityInitRootBridge ( CopyMem (&RootBus->PMem, PMem, sizeof (*PMem)); CopyMem (&RootBus->PMemAbove4G, PMemAbove4G, sizeof (*PMemAbove4G)); =20 - RootBus->NoExtendedConfigSpace =3D (PcdGet16 (PcdOvmfHostBridgePciDevI= d) !=3D - INTEL_Q35_MCH_DEVICE_ID); + RootBus->NoExtendedConfigSpace =3D NoExtendedConfigSpace; =20 DevicePath =3D AllocateCopyPool (sizeof mRootBridgeDevicePathTemplate, &mRootBridgeDevicePathTemplate); --=20 2.29.2