OvmfPkg/IncompatiblePciDeviceSupportDxe: remove PcdPciDisableBusEnumeration

At this point, the IncompatiblePciDeviceSupportDxe driver is included in
the following platforms in edk2:

  OvmfPkg/AmdSev/AmdSevX64.dsc
  OvmfPkg/OvmfPkgIa32.dsc
  OvmfPkg/OvmfPkgIa32X64.dsc
  OvmfPkg/OvmfPkgX64.dsc

All those platforms inherit FALSE for "PcdPciDisableBusEnumeration" from
"MdeModulePkg.dec".

This makes the PcdGetBool() call in the entry point of the driver
superfluous; remove it. Clean up now unused dependencies in the INF file
as well.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2122
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20210526201446.12554-28-lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

diff --git a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
index 53c768167de9d0d89aea46f4b484f6ef8dbc2733..db1532f10934b7dfb4f1018c024f88a0c0d2c010 100644 (file)
--- a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
+++ b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
@@ -266,14 +266,10 @@ DriverInitialize (
   VOID       *Registration;\r
 \r
   //\r
-  // If the PCI Bus driver is not supposed to allocate resources, then it makes\r
-  // no sense to install a protocol that influences the resource allocation.\r
+  // If there is no 64-bit PCI MMIO aperture, then 64-bit MMIO BARs have to be\r
+  // allocated under 4 GB unconditionally.\r
   //\r
-  // Similarly, if there is no 64-bit PCI MMIO aperture, then 64-bit MMIO BARs\r
-  // have to be allocated under 4 GB unconditionally.\r
-  //\r
-  if (PcdGetBool (PcdPciDisableBusEnumeration) ||\r
-      PcdGet64 (PcdPciMmio64Size) == 0) {\r
+  if (PcdGet64 (PcdPciMmio64Size) == 0) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r

diff --git a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf
index f08b6f4bd4b48aa7db9d83f461aa886533941437..c3e6bb944791b352e73174b72055809da8a2fe44 100644 (file)
--- a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf
+++ b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf
@@ -20,7 +20,6 @@
   IncompatiblePciDeviceSupport.c\r
 \r
 [Packages]\r
-  MdeModulePkg/MdeModulePkg.dec\r
   MdePkg/MdePkg.dec\r
   OvmfPkg/OvmfPkg.dec\r
 \r
@@ -36,7 +35,6 @@
   gEfiLegacyBiosProtocolGuid                   ## NOTIFY\r
 \r
 [Pcd]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration ## CONSUMES\r
   gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Size                ## CONSUMES\r
 \r
 [Depex]\r