1 files changed, 16 insertions, 0 deletions

diff --git a/virt/kvm/arm/vgic/vgic-mmio.c b/virt/kvm/arm/vgic/vgic-mmio.c
index 3ba7278fb533..44efc2ff863f 100644
--- a/virt/kvm/arm/vgic/vgic-mmio.c
+++ b/virt/kvm/arm/vgic/vgic-mmio.c
@@ -113,6 +113,22 @@ void vgic_mmio_write_senable(struct kvm_vcpu *vcpu,
                 struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i);
 
                 raw_spin_lock_irqsave(&irq->irq_lock, flags);
+                if (vgic_irq_is_mapped_level(irq)) {
+                        bool was_high = irq->line_level;
+
+                        /*
+                         * We need to update the state of the interrupt because
+                         * the guest might have changed the state of the device
+                         * while the interrupt was disabled at the VGIC level.
+                         */
+                        irq->line_level = vgic_get_phys_line_level(irq);
+                        /*
+                         * Deactivate the physical interrupt so the GIC will let
+                         * us know when it is asserted again.
+                         */
+                        if (!irq->active && was_high && !irq->line_level)
+                                vgic_irq_set_phys_active(irq, false);
+                }
                 irq->enabled = true;
                 vgic_queue_irq_unlock(vcpu->kvm, irq, flags);