OvmfPkg: switch to MdeModulePkg/Bus/Pci/PciHostBridgeDxe

The old driver is retained for now; it remains available with "-D
USE_OLD_PCI_HOST". This is because I'd like to involve end users and
downstreams in testing the new drier, but also allow them to switch back
to the old driver at the first sight of trouble, while we debug the new
driver in parallel.

In a few weeks the ifdeffery and the "OvmfPkg/PciHostBridgeDxe/" driver
should be removed.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Marcel Apfelbaum <marcel@redhat.com>
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index de4fd57d28..2b928506e4 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -37,6 +37,7 @@
   DEFINE NETWORK_IP6_ENABLE      = FALSE

   DEFINE HTTP_BOOT_ENABLE        = FALSE

   DEFINE SMM_REQUIRE             = FALSE

+  DEFINE USE_OLD_PCI_HOST        = FALSE

 

 [BuildOptions]

   GCC:*_UNIXGCC_*_CC_FLAGS             = -DMDEPKG_NDEBUG

@@ -525,7 +526,14 @@
   UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf

   UefiCpuPkg/CpuDxe/CpuDxe.inf

   PcAtChipsetPkg/8254TimerDxe/8254Timer.inf

+!if $(USE_OLD_PCI_HOST) == TRUE

   OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf

+!else

+  MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {

+    <LibraryClasses>

+      PciHostBridgeLib|OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf

+  }

+!endif

   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {

     <LibraryClasses>

       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf