diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-02-08 09:57:21 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-02-09 13:47:50 +0000 |
| commit | f6f0c4362f070cab4a0cec432e82428d702ce0a6 (patch) | |
| tree | 1d3182a21a793a5151038f7f533fcf90ad878665 /arch/arm64/kernel/head.S | |
| parent | b3341ae0efa235726ad69e53ce83c6a3c445bda8 (diff) | |
| download | linux-f6f0c4362f070cab4a0cec432e82428d702ce0a6.tar.bz2 | |
arm64: Extract early FDT mapping from kaslr_early_init()
As we want to parse more options very early in the kernel lifetime,
let's always map the FDT early. This is achieved by moving that
code out of kaslr_early_init().
No functional change expected.
Signed-off-by: Marc Zyngier <maz@kernel.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: David Brazdil <dbrazdil@google.com>
Link: https://lore.kernel.org/r/20210208095732.3267263-13-maz@kernel.org
[will: Ensue KASAN is enabled before running C code]
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/head.S')
| -rw-r--r-- | arch/arm64/kernel/head.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 2c1b8ffa3d3e..070d1c6ec9eb 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -436,10 +436,11 @@ SYM_FUNC_START_LOCAL(__primary_switched) #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) bl kasan_early_init #endif + mov x0, x21 // pass FDT address in x0 + bl early_fdt_map // Try mapping the FDT early #ifdef CONFIG_RANDOMIZE_BASE tst x23, ~(MIN_KIMG_ALIGN - 1) // already running randomized? b.ne 0f - mov x0, x21 // pass FDT address in x0 bl kaslr_early_init // parse FDT for KASLR options cbz x0, 0f // KASLR disabled? just proceed orr x23, x23, x0 // record KASLR offset |