diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2015-02-23 16:04:16 +0000 |
|---|---|---|
| committer | lersek <lersek@Edk2> | 2015-02-23 16:04:16 +0000 |
| commit | a78c4836ea0bae2598bcc3137cac7b1322e56bba (patch) | |
| tree | f453993618a130483f859efc51dace089ebd2abb /ArmPlatformPkg | |
| parent | 10233c9e6e24e311afeaaa4e9874fa7aa3a38c04 (diff) | |
| download | edk2-platforms-a78c4836ea0bae2598bcc3137cac7b1322e56bba.tar.xz | |
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
Diffstat (limited to 'ArmPlatformPkg')
| -rw-r--r-- | ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c index a03e9097c3..ae43f9c21d 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c +++ b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c @@ -289,14 +289,17 @@ PlatformBdsPolicyBehavior ( 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
|