tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg/PciHostBridgeUtilityLib: Extend parameter list of GetRootBridges 

Extend parameter list of PciHostBridgeUtilityGetRootBridges() with
DmaAbove4G, NoExtendedConfigSpace to support for ArmVirtPkg.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3059

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Jiahui Cen <cenjiahui@huawei.com>
Signed-off-by: Yubo Miao <miaoyubo@huawei.com>
Message-Id: <20210119011302.10908-9-cenjiahui@huawei.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Jiahui Cen via groups.io 2021-01-19 09:12:59 +08:00 committed by mergify[bot]
parent 4edba29651
commit 14d4b6be56
4 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h
View File

@ -102,23 +102,27 @@ PciHostBridgeUtilityUninitRootBridge (
/** /**
Utility function to return all the root bridge instances in an array. Utility function to return all the root bridge instances in an array.
@param[out] Count The number of root bridge instances. @param[out] Count The number of root bridge instances.
@param[in] Attributes Initial attributes. @param[in] Attributes Initial attributes.
@param[in] AllocAttributes Allocation attributes. @param[in] AllocAttributes Allocation attributes.
@param[in] Io IO aperture. @param[in] DmaAbove4G DMA above 4GB memory.
@param[in] Mem MMIO aperture. @param[in] NoExtendedConfigSpace No Extended Config Space.
@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.
@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 array.
**/ **/
PCI_ROOT_BRIDGE * PCI_ROOT_BRIDGE *
EFIAPI EFIAPI
@ -126,6 +130,8 @@ PciHostBridgeUtilityGetRootBridges (
OUT UINTN *Count, OUT UINTN *Count,
IN UINT64 Attributes, IN UINT64 Attributes,
IN UINT64 AllocationAttributes, IN UINT64 AllocationAttributes,
IN BOOLEAN DmaAbove4G,
IN BOOLEAN NoExtendedConfigSpace,
IN PCI_ROOT_BRIDGE_APERTURE *Io, IN PCI_ROOT_BRIDGE_APERTURE *Io,
IN PCI_ROOT_BRIDGE_APERTURE *Mem, IN PCI_ROOT_BRIDGE_APERTURE *Mem,
IN PCI_ROOT_BRIDGE_APERTURE *MemAbove4G, IN PCI_ROOT_BRIDGE_APERTURE *MemAbove4G,

5
OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
View File

@ -9,6 +9,9 @@
**/ **/
#include <PiDxe.h> #include <PiDxe.h>
#include <IndustryStandard/Pci.h>
#include <IndustryStandard/Q35MchIch9.h>
#include <Protocol/PciHostBridgeResourceAllocation.h> #include <Protocol/PciHostBridgeResourceAllocation.h>
#include <Protocol/PciRootBridgeIo.h> #include <Protocol/PciRootBridgeIo.h>
@ -80,6 +83,8 @@ PciHostBridgeGetRootBridges (
Count, Count,
Attributes, Attributes,
AllocationAttributes, AllocationAttributes,
FALSE,
PcdGet16 (PcdOvmfHostBridgePciDevId) != INTEL_Q35_MCH_DEVICE_ID,
&Io, &Io,
&Mem, &Mem,
&MemAbove4G, &MemAbove4G,

34
OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c
View File

@ -12,12 +12,10 @@
#include <IndustryStandard/Acpi10.h> #include <IndustryStandard/Acpi10.h>
#include <IndustryStandard/Pci.h> #include <IndustryStandard/Pci.h>
#include <IndustryStandard/Q35MchIch9.h>
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Library/DevicePathLib.h> #include <Library/DevicePathLib.h>
#include <Library/MemoryAllocationLib.h> #include <Library/MemoryAllocationLib.h>
#include <Library/PcdLib.h>
#include <Library/PciHostBridgeUtilityLib.h> #include <Library/PciHostBridgeUtilityLib.h>
#include <Library/PciLib.h> #include <Library/PciLib.h>
#include <Library/QemuFwCfgLib.h> #include <Library/QemuFwCfgLib.h>
@ -192,23 +190,27 @@ PciHostBridgeUtilityUninitRootBridge (
/** /**
Utility function to return all the root bridge instances in an array. Utility function to return all the root bridge instances in an array.
@param[out] Count The number of root bridge instances. @param[out] Count The number of root bridge instances.
@param[in] Attributes Initial attributes. @param[in] Attributes Initial attributes.
@param[in] AllocAttributes Allocation attributes. @param[in] AllocAttributes Allocation attributes.
@param[in] Io IO aperture. @param[in] DmaAbove4G DMA above 4GB memory.
@param[in] Mem MMIO aperture. @param[in] NoExtendedConfigSpace No Extended Config Space.
@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.
@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 array.
**/ **/
PCI_ROOT_BRIDGE * PCI_ROOT_BRIDGE *
EFIAPI EFIAPI
@ -216,6 +218,8 @@ PciHostBridgeUtilityGetRootBridges (
OUT UINTN *Count, OUT UINTN *Count,
IN UINT64 Attributes, IN UINT64 Attributes,
IN UINT64 AllocationAttributes, IN UINT64 AllocationAttributes,
IN BOOLEAN DmaAbove4G,
IN BOOLEAN NoExtendedConfigSpace,
IN PCI_ROOT_BRIDGE_APERTURE *Io, IN PCI_ROOT_BRIDGE_APERTURE *Io,
IN PCI_ROOT_BRIDGE_APERTURE *Mem, IN PCI_ROOT_BRIDGE_APERTURE *Mem,
IN PCI_ROOT_BRIDGE_APERTURE *MemAbove4G, IN PCI_ROOT_BRIDGE_APERTURE *MemAbove4G,
@ -295,8 +299,8 @@ PciHostBridgeUtilityGetRootBridges (
Attributes, Attributes,
Attributes, Attributes,
AllocationAttributes, AllocationAttributes,
FALSE, DmaAbove4G,
PcdGet16 (PcdOvmfHostBridgePciDevId) != INTEL_Q35_MCH_DEVICE_ID, NoExtendedConfigSpace,
(UINT8) LastRootBridgeNumber, (UINT8) LastRootBridgeNumber,
(UINT8) (RootBridgeNumber - 1), (UINT8) (RootBridgeNumber - 1),
Io, Io,
@ -322,8 +326,8 @@ PciHostBridgeUtilityGetRootBridges (
Attributes, Attributes,
Attributes, Attributes,
AllocationAttributes, AllocationAttributes,
FALSE, DmaAbove4G,
PcdGet16 (PcdOvmfHostBridgePciDevId) != INTEL_Q35_MCH_DEVICE_ID, NoExtendedConfigSpace,
(UINT8) LastRootBridgeNumber, (UINT8) LastRootBridgeNumber,
PCI_MAX_BUS, PCI_MAX_BUS,
Io, Io,

4
OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf
View File

@ -39,9 +39,5 @@
DebugLib DebugLib
DevicePathLib DevicePathLib
MemoryAllocationLib MemoryAllocationLib
PcdLib
PciLib PciLib
QemuFwCfgLib QemuFwCfgLib
[Pcd]
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId