@@ -55,6 +55,20 @@
#ifdef __ASSEMBLY__
+#include <asm/kvm_arm.h>
+
+.macro setup_vtcr tmp1, tmp2
+ mov \tmp1, #(VTCR_EL2_FLAGS & 0xffff)
+ movk \tmp1, #(VTCR_EL2_FLAGS >> 16), lsl #16
+ /*
+ * Read the PARange bits from ID_AA64MMFR0_EL1 and set the PS bits in
+ * VTCR_EL2.
+ */
+ mrs \tmp2, id_aa64mmfr0_el1
+ bfi \tmp1, \tmp2, #16, #3
+ msr vtcr_el2, \tmp1
+ isb
+.endm
/*
* Convert a kernel VA into a HYP VA.
* reg: VA to be converted.
@@ -87,14 +87,7 @@ __do_hyp_init:
#endif
msr tcr_el2, x4
- ldr x4, =VTCR_EL2_FLAGS
- /*
- * Read the PARange bits from ID_AA64MMFR0_EL1 and set the PS bits in
- * VTCR_EL2.
- */
- mrs x5, ID_AA64MMFR0_EL1
- bfi x4, x5, #16, #3
- msr vtcr_el2, x4
+ setup_vtcr x4, x5
mrs x4, mair_el1
msr mair_el2, x4
On a VHE-capable system, there is no point in setting VTCR_EL2 at KVM init time. We can perfectly set it up when the kernel boots, removing the need for a more complicated configuration. In order to allow this, turn VTCR_EL2 setup into a macro that we'll be able to reuse at boot time. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm64/include/asm/kvm_mmu.h | 14 ++++++++++++++ arch/arm64/kvm/hyp-init.S | 9 +-------- 2 files changed, 15 insertions(+), 8 deletions(-)