Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4eaed6aa authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

arm64/kvm: consistently handle host HCR_EL2 flags 



In KVM we define the configuration of HCR_EL2 for a VHE HOST in
HCR_HOST_VHE_FLAGS, but we don't have a similar definition for the
non-VHE host flags, and open-code HCR_RW. Further, in head.S we
open-code the flags for VHE and non-VHE configurations.

In future, we're going to want to configure more flags for the host, so
lets add a HCR_HOST_NVHE_FLAGS defintion, and consistently use both
HCR_HOST_VHE_FLAGS and HCR_HOST_NVHE_FLAGS in the kvm code and head.S.

We now use mov_q to generate the HCR_EL2 value, as we use when
configuring other registers in head.S.

Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarKristina Martsenko <kristina.martsenko@arm.com>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: kvmarm@lists.cs.columbia.edu
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent aa6eece8

arch/arm64/include/asm/kvm_arm.h

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ 
			 HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW | HCR_TLOR | \

			 HCR_FMO | HCR_IMO)

#define HCR_VIRT_EXCP_MASK (HCR_VSE | HCR_VI | HCR_VF)

#define HCR_HOST_NVHE_FLAGS (HCR_RW)

#define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H)



/* TCR_EL2 Registers bits */

arch/arm64/kernel/head.S

+2 −3
Original line number Diff line number Diff line
@@ -510,10 +510,9 @@ ENTRY(el2_setup) 
#endif



	/* Hyp configuration. */

	mov	x0, #HCR_RW			// 64-bit EL1

	mov_q	x0, HCR_HOST_NVHE_FLAGS

	cbz	x2, set_hcr

	orr	x0, x0, #HCR_TGE		// Enable Host Extensions

	orr	x0, x0, #HCR_E2H

	mov_q	x0, HCR_HOST_VHE_FLAGS

set_hcr:

	msr	hcr_el2, x0

	isb

arch/arm64/kvm/hyp/switch.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static void __hyp_text __deactivate_traps_nvhe(void) 
	mdcr_el2 |= MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT;



	write_sysreg(mdcr_el2, mdcr_el2);

	write_sysreg(HCR_RW, hcr_el2);

	write_sysreg(HCR_HOST_NVHE_FLAGS, hcr_el2);

	write_sysreg(CPTR_EL2_DEFAULT, cptr_el2);

}