OvmfPkg/PlatformBootManagerLib: hoist PciAcpiInitialization()

  PlatformBootManagerAfterConsole()
                              <--------------------------------+
    PlatformBdsConnectSequence()                               |
      ConnectDevicesFromQemu() / EfiBootManagerConnectAll()    |
      PciAcpiInitialization() ---------------------------------+
    TryRunningQemuKernel()

Functionally this is a no-op:

- PciAcpiInitialization() iterates over PciIo protocol instances, which
  are available just the same at the new call site.

- The PCI interrupt line register exists only to inform system software
  (it doesn't affect hardware) and UEFI drivers don't use PCI interrupts
  anyway.

(More background in commits 2e70cf8ade0d and 5218c27950c4.)

This change will let us move TryRunningQemuKernel() between
PciAcpiInitialization() and PlatformBdsConnectSequence() in the next
patch.

Cc: "Gabriel L. Somlo" <gsomlo@gmail.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Gabriel Somlo <gsomlo@gmail.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Gabriel Somlo <gsomlo@gmail.com>

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index b155639f3c97096c3a80a40e0c82d1a867ed7f10..b624b8f2253545171ee04a176091a8032da31108 100644 (file)
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -1359,8 +1359,6 @@ PlatformBdsConnectSequence (
     DEBUG ((DEBUG_INFO, "EfiBootManagerConnectAll\n"));\r
     EfiBootManagerConnectAll ();\r
   }\r
     DEBUG ((DEBUG_INFO, "EfiBootManagerConnectAll\n"));\r
     EfiBootManagerConnectAll ();\r
   }\r

-\r
-  PciAcpiInitialization ();\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -1446,6 +1444,11 @@ PlatformBootManagerAfterConsole (
   //\r
   BootLogoEnableLogo ();\r
 \r
   //\r
   BootLogoEnableLogo ();\r
 \r

+  //\r
+  // Set PCI Interrupt Line registers and ACPI SCI_EN\r
+  //\r
+  PciAcpiInitialization ();\r
+\r

   //\r
   // Perform some platform specific connect sequence\r
   //\r
   //\r
   // Perform some platform specific connect sequence\r
   //\r