From e1b259da426b3bc0cddf7a293bc8c5c8d85c6d8d Mon Sep 17 00:00:00 2001 From: "Jiahui Cen via groups.io" Date: Tue, 19 Jan 2021 09:12:56 +0800 Subject: [PATCH] OvmfPkg/PciHostBridgeUtilityLib: Extend parameters of InitRootBridge() Extend parameter list of PciHostBridgeUtilityInitRootBridge() with DmaAbove4G and NoExtendedConfigSpace to prepare for sharing with ArmVirtPkg. BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3059 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 Message-Id: <20210119011302.10908-6-cenjiahui@huawei.com> Reviewed-by: Laszlo Ersek --- .../Include/Library/PciHostBridgeUtilityLib.h | 56 ++++++++++------- .../PciHostBridgeLib/PciHostBridgeLib.c | 5 ++ .../PciHostBridgeLib/PciHostBridgeLib.inf | 1 + OvmfPkg/Library/PciHostBridgeLib/XenSupport.c | 1 + .../PciHostBridgeUtilityLib.c | 63 ++++++++++--------- .../PciHostBridgeUtilityLib.inf | 4 -- 6 files changed, 73 insertions(+), 57 deletions(-) diff --git a/OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h b/OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h index 8a1ddc2f5e..a44ad50345 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. - @param[in] Supports Supported attributes. + @param[in] Supports Supported attributes. - @param[in] Attributes Initial attributes. + @param[in] Attributes Initial attributes. - @param[in] AllocAttributes Allocation attributes. + @param[in] AllocAttributes Allocation attributes. - @param[in] RootBusNumber The bus number to store in RootBus. + @param[in] DmaAbove4G DMA above 4GB memory. - @param[in] MaxSubBusNumber The inclusive maximum bus number that can be - assigned to any subordinate bus found behind any - PCI bridge hanging off this root bus. + @param[in] NoExtendedConfigSpace No Extended Config Space. - The caller is repsonsible for ensuring that - RootBusNumber <= MaxSubBusNumber. If - RootBusNumber equals MaxSubBusNumber, then the - root bus has no room for subordinate buses. + @param[in] RootBusNumber The bus number to store in RootBus. - @param[in] Io IO aperture. + @param[in] MaxSubBusNumber The inclusive maximum bus number that can + be assigned to any subordinate bus found + behind any PCI bridge hanging off this + root bus. - @param[in] Mem MMIO aperture. + The caller is repsonsible for ensuring + that RootBusNumber <= MaxSubBusNumber. If + RootBusNumber equals MaxSubBusNumber, then + the root bus has no room for subordinate + buses. - @param[in] MemAbove4G MMIO aperture above 4G. + @param[in] Io IO aperture. - @param[in] PMem Prefetchable MMIO aperture. + @param[in] Mem MMIO aperture. - @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G. + @param[in] MemAbove4G MMIO aperture above 4G. - @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. - @retval EFI_SUCCESS Initialization successful. A device path - consisting of an ACPI device path node, with - UID = RootBusNumber, has been allocated and - linked into RootBus. + @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G. - @retval EFI_OUT_OF_RESOURCES Memory allocation failed. + @param[out] RootBus The PCI_ROOT_BRIDGE structure (allocated + by the caller) that should be filled in by + this function. + + @retval EFI_SUCCESS Initialization successful. A device path + consisting of an ACPI device path node, + with UID = RootBusNumber, has been + 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/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c index 07fa98110e..8758d7c12b 100644 --- a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c +++ b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -151,6 +152,8 @@ PciHostBridgeGetRootBridges ( Attributes, Attributes, AllocationAttributes, + FALSE, + PcdGet16 (PcdOvmfHostBridgePciDevId) != INTEL_Q35_MCH_DEVICE_ID, (UINT8) LastRootBridgeNumber, (UINT8) (RootBridgeNumber - 1), &Io, @@ -176,6 +179,8 @@ PciHostBridgeGetRootBridges ( Attributes, Attributes, AllocationAttributes, + FALSE, + PcdGet16 (PcdOvmfHostBridgePciDevId) != INTEL_Q35_MCH_DEVICE_ID, (UINT8) LastRootBridgeNumber, PCI_MAX_BUS, &Io, diff --git a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf index 7944f94b77..72458262cb 100644 --- a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf +++ b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf @@ -50,4 +50,5 @@ gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio32Size gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Base gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Size + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration diff --git a/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c b/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c index 5dfeba0e6e..9ef39f0182 100644 --- a/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c +++ b/OvmfPkg/Library/PciHostBridgeLib/XenSupport.c @@ -456,6 +456,7 @@ ScanForRootBridges ( ASSERT (RootBridges != NULL); PciHostBridgeUtilityInitRootBridge ( Attributes, Attributes, 0, + FALSE, PcdGet16 (PcdOvmfHostBridgePciDevId) != INTEL_Q35_MCH_DEVICE_ID, (UINT8) PrimaryBus, (UINT8) SubBus, &Io, &Mem, &MemAbove4G, &mNonExistAperture, &mNonExistAperture, &RootBridges[*NumberOfRootBridges] diff --git a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c index 92b42566e5..bed2d87ea8 100644 --- a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c +++ b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c @@ -11,12 +11,10 @@ **/ #include -#include #include #include #include #include -#include #include @@ -64,43 +62,49 @@ OVMF_PCI_ROOT_BRIDGE_DEVICE_PATH mRootBridgeDevicePathTemplate = { /** Utility function to initialize a PCI_ROOT_BRIDGE structure. - @param[in] Supports Supported attributes. + @param[in] Supports Supported attributes. - @param[in] Attributes Initial attributes. + @param[in] Attributes Initial attributes. - @param[in] AllocAttributes Allocation attributes. + @param[in] AllocAttributes Allocation attributes. - @param[in] RootBusNumber The bus number to store in RootBus. + @param[in] DmaAbove4G DMA above 4GB memory. - @param[in] MaxSubBusNumber The inclusive maximum bus number that can be - assigned to any subordinate bus found behind any - PCI bridge hanging off this root bus. + @param[in] NoExtendedConfigSpace No Extended Config Space. - The caller is repsonsible for ensuring that - RootBusNumber <= MaxSubBusNumber. If - RootBusNumber equals MaxSubBusNumber, then the - root bus has no room for subordinate buses. + @param[in] RootBusNumber The bus number to store in RootBus. - @param[in] Io IO aperture. + @param[in] MaxSubBusNumber The inclusive maximum bus number that can + be assigned to any subordinate bus found + behind any PCI bridge hanging off this + root bus. - @param[in] Mem MMIO aperture. + The caller is repsonsible for ensuring + that RootBusNumber <= MaxSubBusNumber. If + RootBusNumber equals MaxSubBusNumber, then + the root bus has no room for subordinate + buses. - @param[in] MemAbove4G MMIO aperture above 4G. + @param[in] Io IO aperture. - @param[in] PMem Prefetchable MMIO aperture. + @param[in] Mem MMIO aperture. - @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G. + @param[in] MemAbove4G MMIO aperture above 4G. - @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. - @retval EFI_SUCCESS Initialization successful. A device path - consisting of an ACPI device path node, with - UID = RootBusNumber, has been allocated and - linked into RootBus. + @param[in] PMemAbove4G Prefetchable MMIO aperture above 4G. - @retval EFI_OUT_OF_RESOURCES Memory allocation failed. + @param[out] RootBus The PCI_ROOT_BRIDGE structure (allocated + by the caller) that should be filled in by + this function. + + @retval EFI_SUCCESS Initialization successful. A device path + consisting of an ACPI device path node, + with UID = RootBusNumber, has been + 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 = Supports; RootBus->Attributes = Attributes; - RootBus->DmaAbove4G = FALSE; + RootBus->DmaAbove4G = DmaAbove4G; RootBus->AllocationAttributes = AllocAttributes; RootBus->Bus.Base = RootBusNumber; @@ -141,8 +147,7 @@ PciHostBridgeUtilityInitRootBridge ( CopyMem (&RootBus->PMem, PMem, sizeof (*PMem)); CopyMem (&RootBus->PMemAbove4G, PMemAbove4G, sizeof (*PMemAbove4G)); - RootBus->NoExtendedConfigSpace = (PcdGet16 (PcdOvmfHostBridgePciDevId) != - INTEL_Q35_MCH_DEVICE_ID); + RootBus->NoExtendedConfigSpace = NoExtendedConfigSpace; DevicePath = AllocateCopyPool (sizeof mRootBridgeDevicePathTemplate, &mRootBridgeDevicePathTemplate); diff --git a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf index e3d0a37409..4d6764b702 100644 --- a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf +++ b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf @@ -39,7 +39,3 @@ DebugLib DevicePathLib MemoryAllocationLib - PcdLib - -[Pcd] - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId