summaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm/hyp/hyp.h
diff options
context:
space:
mode:
authorMarc Zyngier2016-01-05 19:42:49 +0100
committerMarc Zyngier2016-02-29 19:34:14 +0100
commit9dddc2dfa5da95fa380635d400f80767077ef936 (patch)
tree7d9845a9aa0c8d664e9075ad9ccd5e69f7410033 /arch/arm/kvm/hyp/hyp.h
parentARM: KVM: Add VFP lazy save/restore handler (diff)
downloadkernel-qcow2-linux-9dddc2dfa5da95fa380635d400f80767077ef936.tar.gz
kernel-qcow2-linux-9dddc2dfa5da95fa380635d400f80767077ef936.tar.xz
kernel-qcow2-linux-9dddc2dfa5da95fa380635d400f80767077ef936.zip
ARM: KVM: Add the new world switch implementation
The new world switch implementation is modeled after the arm64 one, calling the various save/restore functions in turn, and having as little state as possible. 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.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/kvm/hyp/hyp.h b/arch/arm/kvm/hyp/hyp.h
index b3f6ed233564..ef582c9ad96d 100644
--- a/arch/arm/kvm/hyp/hyp.h
+++ b/arch/arm/kvm/hyp/hyp.h
@@ -60,11 +60,16 @@
#define CNTV_CVAL __ACCESS_CP15_64(3, c14)
#define CNTVOFF __ACCESS_CP15_64(4, c14)
+#define MIDR __ACCESS_CP15(c0, 0, c0, 0)
#define CSSELR __ACCESS_CP15(c0, 2, c0, 0)
+#define VPIDR __ACCESS_CP15(c0, 4, c0, 0)
#define VMPIDR __ACCESS_CP15(c0, 4, c0, 5)
#define SCTLR __ACCESS_CP15(c1, 0, c0, 0)
#define CPACR __ACCESS_CP15(c1, 0, c0, 2)
+#define HCR __ACCESS_CP15(c1, 4, c1, 0)
+#define HDCR __ACCESS_CP15(c1, 4, c1, 1)
#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 DACR __ACCESS_CP15(c3, 0, c0, 0)
#define DFSR __ACCESS_CP15(c5, 0, c0, 0)
@@ -73,6 +78,7 @@
#define AIFSR __ACCESS_CP15(c5, 0, c1, 1)
#define DFAR __ACCESS_CP15(c6, 0, c0, 0)
#define IFAR __ACCESS_CP15(c6, 0, c0, 2)
+#define HDFAR __ACCESS_CP15(c6, 4, c0, 0)
#define ICIALLUIS __ACCESS_CP15(c7, 0, c1, 0)
#define TLBIALLIS __ACCESS_CP15(c8, 0, c3, 0)
#define TLBIALLNSNHIS __ACCESS_CP15(c8, 4, c3, 4)
@@ -85,6 +91,7 @@
#define TID_URW __ACCESS_CP15(c13, 0, c0, 2)
#define TID_URO __ACCESS_CP15(c13, 0, c0, 3)
#define TID_PRIV __ACCESS_CP15(c13, 0, c0, 4)
+#define HTPIDR __ACCESS_CP15(c13, 4, c0, 2)
#define CNTKCTL __ACCESS_CP15(c14, 0, c1, 0)
#define CNTV_CTL __ACCESS_CP15(c14, 0, c3, 1)
#define CNTHCTL __ACCESS_CP15(c14, 4, c1, 0)