summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2021-05-26 22:14:30 +0200
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2021-06-04 16:01:50 +0000
commit984c93ece3ea26cfa7f5b5a9274365beeb4aff6e (patch)
tree314beca31ca524458aa6e13ae0ace97c87d77c68
parent8c8f886f27556f2fb6e8b502d32aa9ccee930acc (diff)
downloadedk2-984c93ece3ea26cfa7f5b5a9274365beeb4aff6e.tar.gz
edk2-984c93ece3ea26cfa7f5b5a9274365beeb4aff6e.tar.bz2
edk2-984c93ece3ea26cfa7f5b5a9274365beeb4aff6e.zip
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>
-rw-r--r--OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c10
-rw-r--r--OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf2
2 files changed, 3 insertions, 9 deletions
diff --git a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
index 53c768167d..db1532f109 100644
--- a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
+++ b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
@@ -266,14 +266,10 @@ DriverInitialize (
VOID *Registration;
//
- // If the PCI Bus driver is not supposed to allocate resources, then it makes
- // no sense to install a protocol that influences the resource allocation.
+ // If there is no 64-bit PCI MMIO aperture, then 64-bit MMIO BARs have to be
+ // allocated under 4 GB unconditionally.
//
- // Similarly, if there is no 64-bit PCI MMIO aperture, then 64-bit MMIO BARs
- // have to be allocated under 4 GB unconditionally.
- //
- if (PcdGetBool (PcdPciDisableBusEnumeration) ||
- PcdGet64 (PcdPciMmio64Size) == 0) {
+ if (PcdGet64 (PcdPciMmio64Size) == 0) {
return EFI_UNSUPPORTED;
}
diff --git a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf
index f08b6f4bd4..c3e6bb9447 100644
--- a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf
+++ b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf
@@ -20,7 +20,6 @@
IncompatiblePciDeviceSupport.c
[Packages]
- MdeModulePkg/MdeModulePkg.dec
MdePkg/MdePkg.dec
OvmfPkg/OvmfPkg.dec
@@ -36,7 +35,6 @@
gEfiLegacyBiosProtocolGuid ## NOTIFY
[Pcd]
- gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration ## CONSUMES
gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Size ## CONSUMES
[Depex]