leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi: stub: Pass EFI GOP information to U-Boot payload

Browse Source 
If UEFI BIOS has the graphics output protocol (GOP), let's pass its
information to U-Boot payload so that U-Boot can utilize it (eg:
an EFI framebuffer driver).

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2018-06-12 08:36:21 -07:00
parent 252d41f1ae
commit d1fe992746
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/efi.h
View File

@ -241,6 +241,7 @@ struct efi_open_protocol_info_entry {
enum efi_entry_t { enum efi_entry_t {
EFIET_END, /* Signals this is the last (empty) entry */ EFIET_END, /* Signals this is the last (empty) entry */
EFIET_MEMORY_MAP, EFIET_MEMORY_MAP,
EFIET_GOP_MODE,
/* Number of entries */ /* Number of entries */
EFIET_MEMORY_COUNT, EFIET_MEMORY_COUNT,
@ -297,6 +298,40 @@ struct efi_entry_memmap {
struct efi_mem_desc desc[]; struct efi_mem_desc desc[];
}; };
/**
* struct efi_entry_gopmode - a GOP mode table passed to U-Boot
*
* @fb_base: EFI's framebuffer base address
* @fb_size: EFI's framebuffer size
* @info_size: GOP mode info structure size
* @info: Start address of the GOP mode info structure
*/
struct efi_entry_gopmode {
efi_physical_addr_t fb_base;
/*
* Not like the ones in 'struct efi_gop_mode' which are 'unsigned
* long', @fb_size and @info_size have to be 'u64' here. As the EFI
* stub codes may have different bit size from the U-Boot payload,
* using 'long' will cause mismatch between the producer (stub) and
* the consumer (payload).
*/
u64 fb_size;
u64 info_size;
/*
* We cannot directly use 'struct efi_gop_mode_info info[]' here as
* it causes compiler to complain: array type has incomplete element
* type 'struct efi_gop_mode_info'.
*/
struct /* efi_gop_mode_info */ {
u32 version;
u32 width;
u32 height;
u32 pixel_format;
u32 pixel_bitmask[4];
u32 pixels_per_scanline;
} info[];
};
static inline struct efi_mem_desc *efi_get_next_mem_desc( static inline struct efi_mem_desc *efi_get_next_mem_desc(
struct efi_entry_memmap *map, struct efi_mem_desc *desc) struct efi_entry_memmap *map, struct efi_mem_desc *desc)
{ {

15
lib/efi/efi_stub.c
View File

@ -275,6 +275,9 @@ efi_status_t EFIAPI efi_main(efi_handle_t image,
struct efi_boot_services *boot = sys_table->boottime; struct efi_boot_services *boot = sys_table->boottime;
struct efi_mem_desc *desc; struct efi_mem_desc *desc;
struct efi_entry_memmap map; struct efi_entry_memmap map;
struct efi_gop *gop;
struct efi_entry_gopmode mode;
efi_guid_t efi_gop_guid = EFI_GOP_GUID;
efi_uintn_t key, desc_size, size; efi_uintn_t key, desc_size, size;
efi_status_t ret; efi_status_t ret;
u32 version; u32 version;
@ -313,6 +316,18 @@ efi_status_t EFIAPI efi_main(efi_handle_t image,
if (ret) if (ret)
return ret; return ret;
ret = boot->locate_protocol(&efi_gop_guid, NULL, (void **)&gop);
if (ret) {
puts(" GOP unavailable\n");
} else {
mode.fb_base = gop->mode->fb_base;
mode.fb_size = gop->mode->fb_size;
mode.info_size = gop->mode->info_size;
add_entry_addr(priv, EFIET_GOP_MODE, &mode, sizeof(mode),
gop->mode->info,
sizeof(struct efi_gop_mode_info));
}
ret = boot->get_memory_map(&size, desc, &key, &desc_size, &version); ret = boot->get_memory_map(&size, desc, &key, &desc_size, &version);
if (ret) { if (ret) {
printhex2(ret); printhex2(ret);