diff options
author | Ard Biesheuvel <ardb@kernel.org> | 2022-06-24 17:06:46 +0200 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2022-06-24 17:18:10 +0100 |
commit | c0be8f18a3bfcfd369eba21337e6c89a4bb8b0e8 (patch) | |
tree | 68737da76c2b6a3b60ce405dae34b76f58be9533 /arch/arm64/kernel/head.S | |
parent | arm64: idreg-override: use early FDT mapping in ID map (diff) | |
download | linux-c0be8f18a3bfcfd369eba21337e6c89a4bb8b0e8.tar.gz linux-c0be8f18a3bfcfd369eba21337e6c89a4bb8b0e8.tar.bz2 linux-c0be8f18a3bfcfd369eba21337e6c89a4bb8b0e8.zip |
arm64: head: factor out TTBR1 assignment into a macro
Create a macro load_ttbr1 to avoid having to repeat the same instruction
sequence 3 times in a subsequent patch. No functional change intended.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20220624150651.1358849-17-ardb@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/head.S')
-rw-r--r-- | arch/arm64/kernel/head.S | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 64ebff634b83..d704d0bd8ffc 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -722,12 +722,9 @@ SYM_FUNC_START(__enable_mmu) cmp x3, #ID_AA64MMFR0_TGRAN_SUPPORTED_MAX b.gt __no_granule_support update_early_cpu_boot_status 0, x3, x4 - phys_to_ttbr x1, x1 phys_to_ttbr x2, x2 msr ttbr0_el1, x2 // load TTBR0 - offset_ttbr1 x1, x3 - msr ttbr1_el1, x1 // load TTBR1 - isb + load_ttbr1 x1, x1, x3 set_sctlr_el1 x0 |