OvmfPkg: match PCI config access to machine type (if not USE_OLD_PCI_HOST)

If USE_OLD_PCI_HOST is FALSE, then we switch all executable module types
supported by DxePciLibI440FxQ35 to the following library instance stack:

  BasePciSegmentLibPci  [class: PciSegmentLib]
    DxePciLibI440FxQ35  [class: PciLib]
      BasePciCf8Lib     [class: PciCf8Lib]
      BasePciExpressLib [class: PciExpressLib]

Every module will select 0xCF8 vs. ECAM based on the OVMF platform type
(i440fx or Q35). Notably, MdeModulePkg/Bus/Pci/PciHostBridgeDxe is among
the affected drivers.

The BasePciExpressLib instance is where the PcdPciExpressBaseAddress PCD
fills its original role.

Cc: Gabriel Somlo <somlo@cmu.edu>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Marcel Apfelbaum <marcel@redhat.com>
Cc: Michał Zegan <webczat_200@poczta.onet.pl>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Tested-by: Gabriel Somlo <somlo@cmu.edu>
Tested-by: Michał Zegan <webczat_200@poczta.onet.pl>

3 files changed, 63 insertions, 0 deletions

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index aae1972950..2635992ac7 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -82,6 +82,9 @@
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf

   PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf

+!endif

   PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf

   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf

   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

@@ -242,6 +245,9 @@
 !if $(SECURE_BOOT_ENABLE) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf

 !endif

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.UEFI_DRIVER]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -256,6 +262,9 @@
   DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf

 !endif

   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.DXE_DRIVER]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -287,6 +296,9 @@
 !if $(SECURE_BOOT_ENABLE) == TRUE

   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

 !endif

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.UEFI_APPLICATION]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -298,6 +310,9 @@
 !else

   DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf

 !endif

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.DXE_SMM_DRIVER]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -317,6 +332,9 @@
   DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf

 !endif

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.SMM_CORE]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -332,6 +350,9 @@
 !else

   DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf

 !endif

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 ################################################################################

 #

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 0422dda09f..e9ffcb4185 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -87,6 +87,9 @@
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf

   PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf

+!endif

   PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf

   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf

   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

@@ -247,6 +250,9 @@
 !if $(SECURE_BOOT_ENABLE) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf

 !endif

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.UEFI_DRIVER]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -261,6 +267,9 @@
   DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf

 !endif

   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.DXE_DRIVER]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -292,6 +301,9 @@
 !if $(SECURE_BOOT_ENABLE) == TRUE

   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

 !endif

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.UEFI_APPLICATION]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -303,6 +315,9 @@
 !else

   DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf

 !endif

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.DXE_SMM_DRIVER]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -322,6 +337,9 @@
   DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf

 !endif

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.SMM_CORE]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -337,6 +355,9 @@
 !else

   DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf

 !endif

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 ################################################################################

 #

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 18517e3376..c983a544d5 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -87,6 +87,9 @@
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf

   PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf

+!endif

   PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf

   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf

   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

@@ -247,6 +250,9 @@
 !if $(SECURE_BOOT_ENABLE) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf

 !endif

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.UEFI_DRIVER]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -261,6 +267,9 @@
   DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf

 !endif

   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.DXE_DRIVER]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -292,6 +301,9 @@
 !if $(SECURE_BOOT_ENABLE) == TRUE

   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

 !endif

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.UEFI_APPLICATION]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -303,6 +315,9 @@
 !else

   DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf

 !endif

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.DXE_SMM_DRIVER]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -322,6 +337,9 @@
   DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf

 !endif

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 [LibraryClasses.common.SMM_CORE]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -337,6 +355,9 @@
 !else

   DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf

 !endif

+!if $(USE_OLD_PCI_HOST) == FALSE

+  PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

+!endif

 

 ################################################################################

 #