KVM: arm/arm64: Correct CPSR on exception entry

[platform/kernel/linux-rpi.git] / arch / arm / include / asm / kvm_emulate.h

diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h
index 4000241..ad75c37 100644 (file)
--- a/arch/arm/include/asm/kvm_emulate.h
+++ b/arch/arm/include/asm/kvm_emulate.h
@@ -14,13 +14,25 @@
 #include <asm/cputype.h>
 
 /* arm64 compatibility macros */
+#define PSR_AA32_MODE_FIQ      FIQ_MODE
+#define PSR_AA32_MODE_SVC      SVC_MODE
 #define PSR_AA32_MODE_ABT      ABT_MODE
 #define PSR_AA32_MODE_UND      UND_MODE
 #define PSR_AA32_T_BIT         PSR_T_BIT
+#define PSR_AA32_F_BIT         PSR_F_BIT
 #define PSR_AA32_I_BIT         PSR_I_BIT
 #define PSR_AA32_A_BIT         PSR_A_BIT
 #define PSR_AA32_E_BIT         PSR_E_BIT
 #define PSR_AA32_IT_MASK       PSR_IT_MASK
+#define PSR_AA32_GE_MASK       0x000f0000
+#define PSR_AA32_DIT_BIT       0x00200000
+#define PSR_AA32_PAN_BIT       0x00400000
+#define PSR_AA32_SSBS_BIT      0x00800000
+#define PSR_AA32_Q_BIT         PSR_Q_BIT
+#define PSR_AA32_V_BIT         PSR_V_BIT
+#define PSR_AA32_C_BIT         PSR_C_BIT
+#define PSR_AA32_Z_BIT         PSR_Z_BIT
+#define PSR_AA32_N_BIT         PSR_N_BIT
 
 unsigned long *vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num);