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

arm64: Drop early setting of MDSCR_EL2.TPMS 



When running VHE, we set MDSCR_EL2.TPMS very early on to force
the trapping of EL1 SPE accesses to EL2.

However:
- we are running with HCR_EL2.{E2H,TGE}={1,1}, meaning that there
  is no EL1 to trap from

- before entering a guest, we call kvm_arm_setup_debug(), which
  sets MDCR_EL2_TPMS in the per-vcpu shadow mdscr_el2, which gets
  applied on entry by __activate_traps_common().

The early setting of MDSCR_EL2.TPMS is therefore useless and can
be dropped.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210208095732.3267263-7-maz@kernel.org


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

arch/arm64/include/asm/el2_setup.h

+0 −3
Original line number Diff line number Diff line
@@ -66,9 +66,6 @@ 
	mov	x0, #(MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT)

	orr	x2, x2, x0			// If we don't have VHE, then

						// use EL1&0 translation.

.else

	orr	x2, x2, #MDCR_EL2_TPMS		// For VHE, use EL2 translation

						// and disable access from EL1

.endif



.Lskip_spe_\@: