Commit d077cb3c authored by Marc Zyngier's avatar Marc Zyngier Committed by Will Deacon
Browse files

arm64: Move SCTLR_EL1 initialisation to EL-agnostic code 



We can now move the initial SCTLR_EL1 setup to be used for both
EL1 and EL2 setup.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarDavid Brazdil <dbrazdil@google.com>
Link: https://lore.kernel.org/r/20210208095732.3267263-10-maz@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent e2df4641

arch/arm64/kernel/head.S

+3 −5
Original line number Diff line number Diff line
@@ -479,13 +479,14 @@ EXPORT_SYMBOL(kimage_vaddr) 
 * booted in EL1 or EL2 respectively.

 */

SYM_FUNC_START(init_kernel_el)

	mov_q	x0, INIT_SCTLR_EL1_MMU_OFF

	msr	sctlr_el1, x0



	mrs	x0, CurrentEL

	cmp	x0, #CurrentEL_EL2

	b.eq	init_el2



SYM_INNER_LABEL(init_el1, SYM_L_LOCAL)

	mov_q	x0, INIT_SCTLR_EL1_MMU_OFF

	msr	sctlr_el1, x0

	isb

	mov_q	x0, INIT_PSTATE_EL1

	msr	spsr_el1, x0
@@ -494,9 +495,6 @@ SYM_INNER_LABEL(init_el1, SYM_L_LOCAL) 
	eret



SYM_INNER_LABEL(init_el2, SYM_L_LOCAL)

	mov_q	x0, INIT_SCTLR_EL1_MMU_OFF

	msr	sctlr_el1, x0



	mov_q	x0, HCR_HOST_NVHE_FLAGS

	msr	hcr_el2, x0

	isb