]> git.baikalelectronics.ru Git - kernel.git/commit
efi/arm: Revert deferred unmap of early memmap mapping
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Wed, 14 Nov 2018 17:55:41 +0000 (09:55 -0800)
committerIngo Molnar <mingo@kernel.org>
Thu, 15 Nov 2018 09:04:46 +0000 (10:04 +0100)
commitc545587a3ff89fdf8e83a8affb928f6caecebcd9
tree295397f138be8c59b37fb654675b46c25e27a5bd
parentbb1ce82c9265eb5bd6f59e74aca633a0d788d700
efi/arm: Revert deferred unmap of early memmap mapping

Commit:

  2ba801f7dcf5 ("efi/arm: preserve early mapping of UEFI memory map longer for BGRT")

deferred the unmap of the early mapping of the UEFI memory map to
accommodate the ACPI BGRT code, which looks up the memory type that
backs the BGRT table to validate it against the requirements of the UEFI spec.

Unfortunately, this causes problems on ARM, which does not permit
early mappings to persist after paging_init() is called, resulting
in a WARN() splat. Since we don't support the BGRT table on ARM anway,
let's revert ARM to the old behaviour, which is to take down the
early mapping at the end of efi_init().

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Fixes: 2ba801f7dcf5 ("efi/arm: preserve early mapping of UEFI memory ...")
Link: http://lkml.kernel.org/r/20181114175544.12860-3-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
drivers/firmware/efi/arm-init.c
drivers/firmware/efi/arm-runtime.c
drivers/firmware/efi/memmap.c