Commit 8f4de66e authored by Quentin Perret's avatar Quentin Perret Committed by Marc Zyngier
Browse files

arm64: asm: Provide set_sctlr_el2 macro 



We will soon need to turn the EL2 stage 1 MMU on and off in nVHE
protected mode, so refactor the set_sctlr_el1 macro to make it usable
for that purpose.

Acked-by: default avatarWill Deacon <will@kernel.org>
Suggested-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210319100146.1149909-17-qperret@google.com
parent bc1d2892

arch/arm64/include/asm/assembler.h

+11 −3
Original line number Diff line number Diff line
@@ -676,11 +676,11 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU 
	.endm



/*

 * Set SCTLR_EL1 to the passed value, and invalidate the local icache

 * Set SCTLR_ELx to the @reg value, and invalidate the local icache

 * in the process. This is called when setting the MMU on.

 */

.macro set_sctlr_el1, reg

	msr	sctlr_el1, \reg

.macro set_sctlr, sreg, reg

	msr	\sreg, \reg

	isb

	/*

	 * Invalidate the local I-cache so that any instructions fetched
@@ -692,6 +692,14 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU 
	isb

.endm



.macro set_sctlr_el1, reg

	set_sctlr sctlr_el1, \reg

.endm



.macro set_sctlr_el2, reg

	set_sctlr sctlr_el2, \reg

.endm



/*

 * Check whether to yield to another runnable task from kernel mode NEON code

 * (which runs with preemption disabled).