ARM: KVM: Initial VGIC infrastructure code

[firefly-linux-kernel-4.4.55.git] / arch / arm / kvm / interrupts.S

diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
index c5400d2e97ca767135a4e45f66bf5afa4067b9d7..5f113bedfaee6d74c29628febf1b093ba6dffcf2 100644 (file)
--- a/arch/arm/kvm/interrupts.S
+++ b/arch/arm/kvm/interrupts.S
@@ -94,6 +94,8 @@ ENTRY(__kvm_vcpu_run)
 
        save_host_regs
 
+       restore_vgic_state
+
        @ Store hardware CP15 state and load guest state
        read_cp15_state store_to_vcpu = 0
        write_cp15_state read_from_vcpu = 1
@@ -187,6 +189,8 @@ after_vfp_restore:
        read_cp15_state store_to_vcpu = 1
        write_cp15_state read_from_vcpu = 0
 
+       save_vgic_state
+
        restore_host_regs
        clrex                           @ Clear exclusive monitor
        mov     r0, r1                  @ Return the return code