redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

efi/arm: preserve early mapping of UEFI memory map longer for BGRT 

[ Upstream commit 3ea86495ae ]

The BGRT code validates the contents of the table against the UEFI
memory map, and so it expects it to be mapped when the code runs.

On ARM, this is currently not the case, since we tear down the early
mapping after efi_init() completes, and only create the permanent
mapping in arm_enable_runtime_services(), which executes as an early
initcall, but still leaves a window where the UEFI memory map is not
mapped.

So move the call to efi_memmap_unmap() from efi_init() to
arm_enable_runtime_services().

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
[will: fold in EFI_MEMMAP attribute check from Ard]
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
pull/10/head
Ard Biesheuvel 2018-07-23 10:57:30 +09:00 committed by Greg Kroah-Hartman
parent 27adb89d1f
commit d08c50e853
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/firmware/efi/arm-init.c
View File

@ -259,7 +259,6 @@ void __init efi_init(void)
reserve_regions();
efi_esrt_init();
efi_memmap_unmap();
memblock_reserve(params.mmap & PAGE_MASK,
PAGE_ALIGN(params.mmap_size +

4
drivers/firmware/efi/arm-runtime.c
View File

@ -122,11 +122,13 @@ static int __init arm_enable_runtime_services(void)
{
u64 mapsize;
if (!efi_enabled(EFI_BOOT)) {
if (!efi_enabled(EFI_BOOT) || !efi_enabled(EFI_MEMMAP)) {
pr_info("EFI services will not be available.\n");
return 0;
}
efi_memmap_unmap();
if (efi_runtime_disabled()) {
pr_info("EFI runtime services will be disabled.\n");
return 0;