vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

i386/linux: Add support for ext_lfb_base

Browse source 
The EFI Graphics Output Protocol can return a 64-bit
linear frame buffer address in some firmware/BIOS
implementations. We currently only store the lower
32-bits in the lfb_base. This will eventually be
passed to Linux kernel and the efifb driver will
incorrectly interpret the framebuffer address as
32-bit address.

The Linux kernel has already added support to handle
64-bit linear framebuffer address in the efifb driver
since quite some time now.

This patch adds the support for 64-bit linear frame
buffer address in GRUB to address the above mentioned
scenario.

Signed-off-by: Arindam Nath <arindam.nath@amd.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Arindam Nath 2018-07-12 19:02:49 +05:30 committed by Daniel Kiper
parent 9b37229f01
commit 886edba877
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
grub-core/loader/i386/linux.c
View file

@ -306,6 +306,12 @@ grub_linux_setup_video (struct linux_kernel_params *params)
params->lfb_line_len = mode_info.pitch; params->lfb_line_len = mode_info.pitch;
params->lfb_base = (grub_size_t) framebuffer; params->lfb_base = (grub_size_t) framebuffer;
#if defined (GRUB_MACHINE_EFI) && defined (__x86_64__)
params->ext_lfb_base = (grub_size_t) (((grub_uint64_t)(grub_size_t) framebuffer) >> 32);
params->capabilities |= VIDEO_CAPABILITY_64BIT_BASE;
#endif
params->lfb_size = ALIGN_UP (params->lfb_line_len * params->lfb_height, 65536); params->lfb_size = ALIGN_UP (params->lfb_line_len * params->lfb_height, 65536);
params->red_mask_size = mode_info.red_mask_size; params->red_mask_size = mode_info.red_mask_size;

6
include/grub/i386/linux.h
View file

@ -43,6 +43,9 @@
#define GRUB_LINUX_CL_MAGIC 0xA33F #define GRUB_LINUX_CL_MAGIC 0xA33F
#define VIDEO_CAPABILITY_SKIP_QUIRKS (1 << 0)
#define VIDEO_CAPABILITY_64BIT_BASE (1 << 1) /* Frame buffer base is 64-bit. */
#ifdef __x86_64__ #ifdef __x86_64__
#define GRUB_LINUX_EFI_SIGNATURE \ #define GRUB_LINUX_EFI_SIGNATURE \
@ -188,8 +191,9 @@ struct linux_kernel_params
grub_uint16_t lfb_pages; /* 32 */ grub_uint16_t lfb_pages; /* 32 */
grub_uint16_t vesa_attrib; /* 34 */ grub_uint16_t vesa_attrib; /* 34 */
grub_uint32_t capabilities; /* 36 */ grub_uint32_t capabilities; /* 36 */
grub_uint32_t ext_lfb_base; /* 3a */
grub_uint8_t padding3[0x40 - 0x3a]; grub_uint8_t padding3[0x40 - 0x3e];
grub_uint16_t apm_version; /* 40 */ grub_uint16_t apm_version; /* 40 */
grub_uint16_t apm_code_segment; /* 42 */ grub_uint16_t apm_code_segment; /* 42 */