summaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm/hyp/hyp.h
diff options
context:
space:
mode:
authorMarc Zyngier2016-02-01 20:56:31 +0100
committerMarc Zyngier2016-02-29 19:34:14 +0100
commitd4c7688c51e57be20ca5f3dffa4c8771888a42fc (patch)
treeef37556f1e5e57e9d9e5a582bf25f3daf1dfc636 /arch/arm/kvm/hyp/hyp.h
parentARM: KVM: Remove the old world switch (diff)
downloadkernel-qcow2-linux-d4c7688c51e57be20ca5f3dffa4c8771888a42fc.tar.gz
kernel-qcow2-linux-d4c7688c51e57be20ca5f3dffa4c8771888a42fc.tar.xz
kernel-qcow2-linux-d4c7688c51e57be20ca5f3dffa4c8771888a42fc.zip
ARM: KVM: Switch to C-based stage2 init
As we now have hooks to setup VTCR from C code, let's drop the original VTCR setup and reimplement it as part of the HYP code. Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/kvm/hyp/hyp.h')
-rw-r--r--arch/arm/kvm/hyp/hyp.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kvm/hyp/hyp.h b/arch/arm/kvm/hyp/hyp.h
index 8b9c2eb5a9dc..ff6de6a3af2d 100644
--- a/arch/arm/kvm/hyp/hyp.h
+++ b/arch/arm/kvm/hyp/hyp.h
@@ -71,6 +71,8 @@
#define HCPTR __ACCESS_CP15(c1, 4, c1, 2)
#define HSTR __ACCESS_CP15(c1, 4, c1, 3)
#define TTBCR __ACCESS_CP15(c2, 0, c0, 2)
+#define HTCR __ACCESS_CP15(c2, 4, c0, 2)
+#define VTCR __ACCESS_CP15(c2, 4, c1, 2)
#define DACR __ACCESS_CP15(c3, 0, c0, 0)
#define DFSR __ACCESS_CP15(c5, 0, c0, 0)
#define IFSR __ACCESS_CP15(c5, 0, c0, 1)