OSDN Git Service

efi/arm: preserve early mapping of UEFI memory map longer for BGRT
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Mon, 23 Jul 2018 01:57:30 +0000 (10:57 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Sep 2018 06:36:33 +0000 (08:36 +0200)
commitbe2338f3a57f004a9b33ac6c23ab062061d37b7d
tree05c4a1b0b1730010a0268733ea0e5118574b4f18
parentf42caeadf02ca374182849614614321bb7b62586
efi/arm: preserve early mapping of UEFI memory map longer for BGRT

[ Upstream commit 3ea86495aef2f6de26b7cb1599ba350dd6a0c521 ]

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>
drivers/firmware/efi/arm-init.c
drivers/firmware/efi/arm-runtime.c