diff options
author | Ard Biesheuvel <ardb@kernel.org> | 2023-10-20 19:11:06 +0300 |
---|---|---|
committer | Ard Biesheuvel <ardb@kernel.org> | 2023-10-20 19:11:06 +0300 |
commit | c03d21f05e76b25f907684bdf874308dcefab385 (patch) | |
tree | 329af17330383296b4d68102ac6a474da480571f /drivers/firmware/efi/libstub | |
parent | 8dbe33956d96c9d066ef15ca933ede30748198b2 (diff) | |
parent | 50e782a86c980d4f8292ef82ed8139282ca07a98 (diff) | |
download | linux-c03d21f05e76b25f907684bdf874308dcefab385.tar.xz |
Merge 3rd batch of EFI fixes into efi/urgent
Diffstat (limited to 'drivers/firmware/efi/libstub')
-rw-r--r-- | drivers/firmware/efi/libstub/x86-stub.c | 7 | ||||
-rw-r--r-- | drivers/firmware/efi/libstub/x86-stub.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c index 2fee52ed335d..9d5df683f882 100644 --- a/drivers/firmware/efi/libstub/x86-stub.c +++ b/drivers/firmware/efi/libstub/x86-stub.c @@ -605,11 +605,8 @@ setup_e820(struct boot_params *params, struct setup_data *e820ext, u32 e820ext_s break; case EFI_UNACCEPTED_MEMORY: - if (!IS_ENABLED(CONFIG_UNACCEPTED_MEMORY)) { - efi_warn_once( -"The system has unaccepted memory, but kernel does not support it\nConsider enabling CONFIG_UNACCEPTED_MEMORY\n"); + if (!IS_ENABLED(CONFIG_UNACCEPTED_MEMORY)) continue; - } e820_type = E820_TYPE_RAM; process_unaccepted_memory(d->phys_addr, d->phys_addr + PAGE_SIZE * d->num_pages); @@ -852,6 +849,8 @@ void __noreturn efi_stub_entry(efi_handle_t handle, unsigned long kernel_entry; efi_status_t status; + boot_params_pointer = boot_params; + efi_system_table = sys_table_arg; /* Check if we were booted by the EFI firmware */ if (efi_system_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE) diff --git a/drivers/firmware/efi/libstub/x86-stub.h b/drivers/firmware/efi/libstub/x86-stub.h index 37c5a36b9d8c..2748bca192df 100644 --- a/drivers/firmware/efi/libstub/x86-stub.h +++ b/drivers/firmware/efi/libstub/x86-stub.h @@ -2,6 +2,8 @@ #include <linux/efi.h> +extern struct boot_params *boot_params_pointer asm("boot_params"); + extern void trampoline_32bit_src(void *, bool); extern const u16 trampoline_ljmp_imm_offset; |