ArmVirtualizationPkg: PlatformIntelBdsLib: kernel boot should provide ACPI

If there is a PCI host, then PCI enumeration (which happens inside
BdsLibConnectAll()) blocks ACPI table installation (correctly). Make sure
we install ACPI tables before trying to direct-boot a QEMU kernel.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Olivier Martin <Olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16911 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
index a03e9097c39f97178517a1d2438b5a8a743a78d9..ae43f9c21dd2a00b5aa057798aef2b0d2ddda9d7 100644 (file)
--- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
@@ -289,14 +289,17 @@ PlatformBdsPolicyBehavior (
   Status = PlatformBdsConnectConsole ();\r
   ASSERT_EFI_ERROR (Status);\r
 \r
+  BdsLibConnectAll ();\r
+\r
   //\r
-  // Process QEMU's -kernel command line option\r
+  // Process QEMU's -kernel command line option. Note that the kernel booted\r
+  // this way should receive ACPI tables, which is why we connect all devices\r
+  // first (see above) -- PCI enumeration blocks ACPI table installation, if\r
+  // there is a PCI host.\r
   //\r
   TryRunningQemuKernel ();\r
 \r
-  BdsLibConnectAll ();\r
   BdsLibEnumerateAllBootOption (BootOptionList);\r
-\r
   SetBootOrderFromQemu (BootOptionList);\r
   //\r
   // The BootOrder variable may have changed, reload the in-memory list with\r