commit a78c4836ea0bae2598bcc3137cac7b1322e56bba
author Laszlo Ersek <lersek@redhat.com> Mon Feb 23 16:04:16 2015 +0000
committer lersek <lersek@Edk2> Mon Feb 23 16:04:16 2015 +0000
tree f453993618a130483f859efc51dace089ebd2abb
parent 10233c9e6e24e311afeaaa4e9874fa7aa3a38c04

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

ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
index a03e909..ae43f9c 100644
--- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c
@@ -289,14 +289,17 @@
   Status = PlatformBdsConnectConsole ();

   ASSERT_EFI_ERROR (Status);

 

+  BdsLibConnectAll ();

+

   //

-  // Process QEMU's -kernel command line option

+  // Process QEMU's -kernel command line option. Note that the kernel booted

+  // this way should receive ACPI tables, which is why we connect all devices

+  // first (see above) -- PCI enumeration blocks ACPI table installation, if

+  // there is a PCI host.

   //

   TryRunningQemuKernel ();

 

-  BdsLibConnectAll ();

   BdsLibEnumerateAllBootOption (BootOptionList);

-

   SetBootOrderFromQemu (BootOptionList);

   //

   // The BootOrder variable may have changed, reload the in-memory list with