From: Marc Zyngier <maz@kernel.org>
Date: Tue, 13 Apr 2021 14:41:08 +0000 (+0100)
Subject: Merge branch 'kvm-arm64/nvhe-wxn' into kvmarm-master/next
X-Git-Tag: v5.15.73~12049^2~38^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bba8857febb1d0574480bd13a1be0567ac0f0ce9;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'kvm-arm64/nvhe-wxn' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>
---

bba8857febb1d0574480bd13a1be0567ac0f0ce9
diff --cc arch/arm64/kvm/hyp/nvhe/hyp-init.S
index c164045af238,2e16b2098bbd..c953fb4b9a13
--- a/arch/arm64/kvm/hyp/nvhe/hyp-init.S
+++ b/arch/arm64/kvm/hyp/nvhe/hyp-init.S
@@@ -119,16 -115,9 +119,10 @@@ alternative_else_nop_endi
  
  	/* Invalidate the stale TLBs from Bootloader */
  	tlbi	alle2
 +	tlbi	vmalls12e1
  	dsb	sy
  
- 	/*
- 	 * Preserve all the RES1 bits while setting the default flags,
- 	 * as well as the EE bit on BE. Drop the A flag since the compiler
- 	 * is allowed to generate unaligned accesses.
- 	 */
- 	mov_q	x0, (SCTLR_EL2_RES1 | (SCTLR_ELx_FLAGS & ~SCTLR_ELx_A))
- CPU_BE(	orr	x0, x0, #SCTLR_ELx_EE)
+ 	mov_q	x0, INIT_SCTLR_EL2_MMU_ON
  alternative_if ARM64_HAS_ADDRESS_AUTH
  	mov_q	x1, (SCTLR_ELx_ENIA | SCTLR_ELx_ENIB | \
  		     SCTLR_ELx_ENDA | SCTLR_ELx_ENDB)