From 120a25c2874081ef69024be4f3fdc9707146745c Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Mon, 23 Feb 2015 16:03:11 +0000 Subject: [PATCH] ArmVirtualizationPkg/PciHostBridgeDxe: abort if there's no PCI host bridge If VirtFdtDxe found no PCI host in the DTB, then the config space base address will be left at zero -- the default is set in the DSC --, and we should exit PciHostBridgeDxe immediately. This causes gEfiPciRootBridgeIoProtocolGuid not to be installed, which in turn prevents MdeModulePkg/Bus/Pci/PciBusDxe from binding (see PciBusDriverBindingSupported()). Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Reviewed-by: Olivier Martin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16898 6f19259b-4bc3-4df7-8a09-765794883524 --- .../ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridge.c | 6 ++++++ .../PciHostBridgeDxe/PciHostBridgeDxe.inf | 1 + 2 files changed, 7 insertions(+) diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridge.c b/ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridge.c index ced7528a2e..50f61cbfff 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridge.c +++ b/ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridge.c @@ -85,6 +85,7 @@ PCI_HOST_BRIDGE_INSTANCE mPciHostBridgeInstanceTemplate = { @param ImageHandle Handle of driver image @param SystemTable Point to EFI_SYSTEM_TABLE + @retval EFI_ABORTED PCI host bridge not present @retval EFI_OUT_OF_RESOURCES Can not allocate memory resource @retval EFI_DEVICE_ERROR Can not install the protocol instance @retval EFI_SUCCESS Success to initialize the Pci host bridge. @@ -102,6 +103,11 @@ InitializePciHostBridge ( PCI_HOST_BRIDGE_INSTANCE *HostBridge; PCI_ROOT_BRIDGE_INSTANCE *PrivateData; + if (PcdGet64 (PcdPciExpressBaseAddress) == 0) { + DEBUG ((EFI_D_INFO, "%a: PCI host bridge not present\n", __FUNCTION__)); + return EFI_ABORTED; + } + mDriverImageHandle = ImageHandle; mResAperture[0][0].BusBase = PcdGet32 (PcdPciBusMin); diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf b/ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf index be3200dedb..5497fa61d2 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf +++ b/ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf @@ -58,6 +58,7 @@ gArmPlatformTokenSpaceGuid.PcdPciIoTranslation gArmPlatformTokenSpaceGuid.PcdPciMmio32Base gArmPlatformTokenSpaceGuid.PcdPciMmio32Size + gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress [depex] gEfiMetronomeArchProtocolGuid