summaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2012-09-28 17:57:05 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2012-09-29 12:21:03 -0700
commit2223af389032425e3d1a70f9cb3a63feaa654ced (patch)
tree6874c07f26b3cdc5b10e06c34e7d0f6a9f5494aa /init/main.c
parent7bc90e01c3f66c137e7e761f574bbf883087d590 (diff)
downloadlinux-2223af389032425e3d1a70f9cb3a63feaa654ced.tar.gz
linux-2223af389032425e3d1a70f9cb3a63feaa654ced.tar.bz2
linux-2223af389032425e3d1a70f9cb3a63feaa654ced.zip
efi: Fix the ACPI BGRT driver for images located in EFI boot services memory
The ACPI BGRT driver accesses the BIOS logo image when it initializes. However, ACPI 5.0 (which introduces the BGRT) recommends putting the logo image in EFI boot services memory, so that the OS can reclaim that memory. Production systems follow this recommendation, breaking the ACPI BGRT driver. Move the bulk of the BGRT code to run during a new EFI late initialization phase, which occurs after switching EFI to virtual mode, and after initializing ACPI, but before freeing boot services memory. Copy the BIOS logo image to kernel memory at that point, and make it accessible to the BGRT driver. Rework the existing ACPI BGRT driver to act as a simple wrapper exposing that image (and the properties from the BGRT) via sysfs. Signed-off-by: Josh Triplett <josh@joshtriplett.org> Link: http://lkml.kernel.org/r/93ce9f823f1c1f3bb88bdd662cce08eee7a17f5d.1348876882.git.josh@joshtriplett.org Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index d61ec542205c..db34c0ec4711 100644
--- a/init/main.c
+++ b/init/main.c
@@ -631,8 +631,10 @@ asmlinkage void __init start_kernel(void)
acpi_early_init(); /* before LAPIC and SMP init */
sfi_init_late();
- if (efi_enabled)
+ if (efi_enabled) {
+ efi_late_init();
efi_free_boot_services();
+ }
ftrace_init();