mirror of
https://github.com/torvalds/linux.git
synced 2026-04-27 11:02:31 -04:00
c5a8f13f1e
In the EFI config table, rename LINUX_EFI_SCREEN_INFO_TABLE_GUID to LINUX_EFI_PRIMARY_DISPLAY_TABLE_GUID. Read sysfb_primary_display from the entry. In addition to the screen_info, the entry now also contains EDID information. In libstub, replace struct screen_info with struct sysfb_display_info from the kernel's sysfb_primary_display and rename functions accordingly. Transfer it to the runtime kernel using the kernel's global state or the LINUX_EFI_PRIMARY_DISPLAY_TABLE_GUID config-table entry. With CONFIG_FIRMWARE_EDID=y, libstub now transfers the GOP device's EDID information to the kernel. If CONFIG_FIRMWARE_EDID=n, EDID information is disabled. Make the Kconfig symbol CONFIG_FIRMWARE_EDID available with EFI. Setting the value to 'n' disables EDID support. Also rename screen_info.c to primary_display.c and adapt the contained comment according to the changes. Link: https://lore.kernel.org/all/20251126160854.553077-8-tzimmermann@suse.de/ Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> [ardb: depend on EFI_GENERIC_STUB not EFI, fix conflicts after dropping the preceding patch from the series] Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
90 lines
2.2 KiB
C
90 lines
2.2 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
|
|
#include <linux/efi.h>
|
|
#include <linux/sysfb.h>
|
|
|
|
#include <asm/efi.h>
|
|
|
|
#include "efistub.h"
|
|
|
|
static unsigned long kernel_image_offset;
|
|
|
|
static void *kernel_image_addr(void *addr)
|
|
{
|
|
return addr + kernel_image_offset;
|
|
}
|
|
|
|
struct sysfb_display_info *alloc_primary_display(void)
|
|
{
|
|
if (IS_ENABLED(CONFIG_ARM))
|
|
return __alloc_primary_display();
|
|
|
|
if (IS_ENABLED(CONFIG_X86) ||
|
|
IS_ENABLED(CONFIG_EFI_EARLYCON) ||
|
|
IS_ENABLED(CONFIG_SYSFB))
|
|
return kernel_image_addr(&sysfb_primary_display);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* EFI entry point for the generic EFI stub used by ARM, arm64, RISC-V and
|
|
* LoongArch. This is the entrypoint that is described in the PE/COFF header
|
|
* of the core kernel.
|
|
*/
|
|
efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
|
|
efi_system_table_t *systab)
|
|
{
|
|
efi_loaded_image_t *image;
|
|
efi_status_t status;
|
|
unsigned long image_addr;
|
|
unsigned long image_size = 0;
|
|
/* addr/point and size pairs for memory management*/
|
|
char *cmdline_ptr = NULL;
|
|
efi_guid_t loaded_image_proto = LOADED_IMAGE_PROTOCOL_GUID;
|
|
unsigned long reserve_addr = 0;
|
|
unsigned long reserve_size = 0;
|
|
|
|
WRITE_ONCE(efi_system_table, systab);
|
|
|
|
/* Check if we were booted by the EFI firmware */
|
|
if (efi_system_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)
|
|
return EFI_INVALID_PARAMETER;
|
|
|
|
/*
|
|
* Get a handle to the loaded image protocol. This is used to get
|
|
* information about the running image, such as size and the command
|
|
* line.
|
|
*/
|
|
status = efi_bs_call(handle_protocol, handle, &loaded_image_proto,
|
|
(void *)&image);
|
|
if (status != EFI_SUCCESS) {
|
|
efi_err("Failed to get loaded image protocol\n");
|
|
return status;
|
|
}
|
|
|
|
status = efi_handle_cmdline(image, &cmdline_ptr);
|
|
if (status != EFI_SUCCESS)
|
|
return status;
|
|
|
|
efi_info("Booting Linux Kernel...\n");
|
|
|
|
status = handle_kernel_image(&image_addr, &image_size,
|
|
&reserve_addr,
|
|
&reserve_size,
|
|
image, handle);
|
|
if (status != EFI_SUCCESS) {
|
|
efi_err("Failed to relocate kernel\n");
|
|
return status;
|
|
}
|
|
|
|
kernel_image_offset = image_addr - (unsigned long)image->image_base;
|
|
|
|
status = efi_stub_common(handle, image, image_addr, cmdline_ptr);
|
|
|
|
efi_free(image_size, image_addr);
|
|
efi_free(reserve_size, reserve_addr);
|
|
|
|
return status;
|
|
}
|