2 files changed, 9 insertions, 4 deletions

diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 79812be4f25f..e10c45a578e3 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -149,9 +149,11 @@ struct kvm_vcpu_arch {
 #define vcpu_cp15(v,r)          ((v)->arch.ctxt.copro[(r)])
 
 #ifdef CONFIG_CPU_BIG_ENDIAN
-#define vcpu_cp15_64_low(v,r) ((v)->arch.ctxt.copro[((r) + 1)])
+#define vcpu_cp15_64_high(v,r)  vcpu_cp15((v),(r))
+#define vcpu_cp15_64_low(v,r)   vcpu_cp15((v),(r) + 1)
 #else
-#define vcpu_cp15_64_low(v,r) ((v)->arch.ctxt.copro[((r) + 0)])
+#define vcpu_cp15_64_high(v,r)  vcpu_cp15((v),(r) + 1)
+#define vcpu_cp15_64_low(v,r)   vcpu_cp15((v),(r))
 #endif
 
 struct kvm_vm_stat {
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index a4fd5267c65b..5805e7c4a4dd 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -135,10 +135,13 @@ static bool access_vm_reg(struct kvm_vcpu *vcpu,
         BUG_ON(!p->is_write);
 
         val = *vcpu_reg(vcpu, p->Rt);
-        if (!p->is_aarch32 || !p->is_32bit)
+        if (!p->is_aarch32) {
                 vcpu_sys_reg(vcpu, r->reg) = val;
-        else
+        } else {
+                if (!p->is_32bit)
+                        vcpu_cp15_64_high(vcpu, r->reg) = val >> 32;
                 vcpu_cp15_64_low(vcpu, r->reg) = val & 0xffffffffUL;
+        }
 
         return true;
 }