1 files changed, 22 insertions, 18 deletions

diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index 3c2909c1bda3..84abc6f38c1d 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -1313,13 +1313,10 @@ epilog:
         }
 }
 
-static int process_level_irq(struct kvm_vcpu *vcpu, int lr, struct vgic_lr vlr)
+static int process_queued_irq(struct kvm_vcpu *vcpu,
+                                   int lr, struct vgic_lr vlr)
 {
-        int level_pending = 0;
-
-        vlr.state = 0;
-        vlr.hwirq = 0;
-        vgic_set_lr(vcpu, lr, vlr);
+        int pending = 0;
 
         /*
          * If the IRQ was EOIed (called from vgic_process_maintenance) or it
@@ -1335,26 +1332,35 @@ static int process_level_irq(struct kvm_vcpu *vcpu, int lr, struct vgic_lr vlr)
         vgic_dist_irq_clear_soft_pend(vcpu, vlr.irq);
 
         /*
-         * Tell the gic to start sampling the line of this interrupt again.
+         * Tell the gic to start sampling this interrupt again.
          */
         vgic_irq_clear_queued(vcpu, vlr.irq);
 
         /* Any additional pending interrupt? */
-        if (vgic_dist_irq_get_level(vcpu, vlr.irq)) {
-                vgic_cpu_irq_set(vcpu, vlr.irq);
-                level_pending = 1;
+        if (vgic_irq_is_edge(vcpu, vlr.irq)) {
+                BUG_ON(!(vlr.state & LR_HW));
+                pending = vgic_dist_irq_is_pending(vcpu, vlr.irq);
         } else {
-                vgic_dist_irq_clear_pending(vcpu, vlr.irq);
-                vgic_cpu_irq_clear(vcpu, vlr.irq);
+                if (vgic_dist_irq_get_level(vcpu, vlr.irq)) {
+                        vgic_cpu_irq_set(vcpu, vlr.irq);
+                        pending = 1;
+                } else {
+                        vgic_dist_irq_clear_pending(vcpu, vlr.irq);
+                        vgic_cpu_irq_clear(vcpu, vlr.irq);
+                }
         }
 
         /*
          * Despite being EOIed, the LR may not have
          * been marked as empty.
          */
+        vlr.state = 0;
+        vlr.hwirq = 0;
+        vgic_set_lr(vcpu, lr, vlr);
+
         vgic_sync_lr_elrsr(vcpu, lr, vlr);
 
-        return level_pending;
+        return pending;
 }
 
 static bool vgic_process_maintenance(struct kvm_vcpu *vcpu)
@@ -1391,7 +1397,7 @@ static bool vgic_process_maintenance(struct kvm_vcpu *vcpu)
                                              vlr.irq - VGIC_NR_PRIVATE_IRQS);
 
                         spin_lock(&dist->lock);
-                        level_pending |= process_level_irq(vcpu, lr, vlr);
+                        level_pending |= process_queued_irq(vcpu, lr, vlr);
                         spin_unlock(&dist->lock);
                 }
         }
@@ -1413,7 +1419,7 @@ static bool vgic_process_maintenance(struct kvm_vcpu *vcpu)
 /*
  * Save the physical active state, and reset it to inactive.
  *
- * Return true if there's a pending level triggered interrupt line to queue.
+ * Return true if there's a pending forwarded interrupt to queue.
  */
 static bool vgic_sync_hwirq(struct kvm_vcpu *vcpu, int lr, struct vgic_lr vlr)
 {
@@ -1438,10 +1444,8 @@ static bool vgic_sync_hwirq(struct kvm_vcpu *vcpu, int lr, struct vgic_lr vlr)
         if (phys_active)
                 return 0;
 
-        /* Mapped edge-triggered interrupts not yet supported. */
-        WARN_ON(vgic_irq_is_edge(vcpu, vlr.irq));
         spin_lock(&dist->lock);
-        level_pending = process_level_irq(vcpu, lr, vlr);
+        level_pending = process_queued_irq(vcpu, lr, vlr);
         spin_unlock(&dist->lock);
         return level_pending;
 }