forked from grate-driver/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information
1 parent
7bc90e0
commit 2223af3
Showing
8 changed files
with
120 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
obj-$(CONFIG_EFI) += efi.o efi_$(BITS).o efi_stub_$(BITS).o | ||
obj-$(CONFIG_ACPI_BGRT) += efi-bgrt.o |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
/* | ||
* Copyright 2012 Intel Corporation | ||
* Author: Josh Triplett <josh@joshtriplett.org> | ||
* | ||
* Based on the bgrt driver: | ||
* Copyright 2012 Red Hat, Inc <mjg@redhat.com> | ||
* Author: Matthew Garrett | ||
* | ||
* This program is free software; you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License version 2 as | ||
* published by the Free Software Foundation. | ||
*/ | ||
#include <linux/kernel.h> | ||
#include <linux/acpi.h> | ||
#include <linux/efi.h> | ||
#include <linux/efi-bgrt.h> | ||
|
||
struct acpi_table_bgrt *bgrt_tab; | ||
void *bgrt_image; | ||
size_t bgrt_image_size; | ||
|
||
struct bmp_header { | ||
u16 id; | ||
u32 size; | ||
} __packed; | ||
|
||
void efi_bgrt_init(void) | ||
{ | ||
acpi_status status; | ||
void __iomem *image; | ||
bool ioremapped = false; | ||
struct bmp_header bmp_header; | ||
|
||
if (acpi_disabled) | ||
return; | ||
|
||
status = acpi_get_table("BGRT", 0, | ||
(struct acpi_table_header **)&bgrt_tab); | ||
if (ACPI_FAILURE(status)) | ||
return; | ||
|
||
if (bgrt_tab->version != 1) | ||
return; | ||
if (bgrt_tab->image_type != 0 || !bgrt_tab->image_address) | ||
return; | ||
|
||
image = efi_lookup_mapped_addr(bgrt_tab->image_address); | ||
if (!image) { | ||
image = ioremap(bgrt_tab->image_address, sizeof(bmp_header)); | ||
ioremapped = true; | ||
if (!image) | ||
return; | ||
} | ||
|
||
memcpy_fromio(&bmp_header, image, sizeof(bmp_header)); | ||
if (ioremapped) | ||
iounmap(image); | ||
bgrt_image_size = bmp_header.size; | ||
|
||
bgrt_image = kmalloc(bgrt_image_size, GFP_KERNEL); | ||
if (!bgrt_image) | ||
return; | ||
|
||
if (ioremapped) { | ||
image = ioremap(bgrt_tab->image_address, bmp_header.size); | ||
if (!image) { | ||
kfree(bgrt_image); | ||
bgrt_image = NULL; | ||
return; | ||
} | ||
} | ||
|
||
memcpy_fromio(bgrt_image, image, bgrt_image_size); | ||
if (ioremapped) | ||
iounmap(image); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
#ifndef _LINUX_EFI_BGRT_H | ||
#define _LINUX_EFI_BGRT_H | ||
|
||
#ifdef CONFIG_ACPI_BGRT | ||
|
||
#include <linux/acpi.h> | ||
|
||
void efi_bgrt_init(void); | ||
|
||
/* The BGRT data itself; only valid if bgrt_image != NULL. */ | ||
extern void *bgrt_image; | ||
extern size_t bgrt_image_size; | ||
extern struct acpi_table_bgrt *bgrt_tab; | ||
|
||
#else /* !CONFIG_ACPI_BGRT */ | ||
|
||
static inline void efi_bgrt_init(void) {} | ||
|
||
#endif /* !CONFIG_ACPI_BGRT */ | ||
|
||
#endif /* _LINUX_EFI_BGRT_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters