diff options
author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2018-11-14 09:55:43 -0800 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-11-15 10:04:46 +0100 |
commit | eff896288872d687d9662000ec9ae11b6d61766f (patch) | |
tree | 87714359c17406ff59e8d30e78c9213cea1bec27 /arch/arm64/kernel | |
parent | 72a58a63a164b4e9d2d914e65caeb551846883f1 (diff) | |
download | linux-eff896288872d687d9662000ec9ae11b6d61766f.tar.gz linux-eff896288872d687d9662000ec9ae11b6d61766f.tar.bz2 linux-eff896288872d687d9662000ec9ae11b6d61766f.zip |
efi/arm: Defer persistent reservations until after paging_init()
The new memory EFI reservation feature we introduced to allow memory
reservations to persist across kexec may trigger an unbounded number
of calls to memblock_reserve(). The memblock subsystem can deal with
this fine, but not before memblock resizing is enabled, which we can
only do after paging_init(), when the memory we reallocate the array
into is actually mapped.
So break out the memreserve table processing into a separate routine
and call it after paging_init() on arm64. On ARM, because of limited
reviewing bandwidth of the maintainer, we cannot currently fix this,
so instead, disable the EFI persistent memreserve entirely on ARM so
we can fix it later.
Tested-by: Marc Zyngier <marc.zyngier@arm.com>
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
Link: http://lkml.kernel.org/r/20181114175544.12860-5-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/kernel')
-rw-r--r-- | arch/arm64/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 953e316521fc..f4fc1e0544b7 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -313,6 +313,7 @@ void __init setup_arch(char **cmdline_p) arm64_memblock_init(); paging_init(); + efi_apply_persistent_mem_reservations(); acpi_table_upgrade(); |