irqchip/gic-v4: Clear IRQ_DISABLE_UNLAZY again if mapping fails

Should the call to irq_set_vcpu_affinity() fail at map time,
we should restore the normal lazy-disable behaviour instead
of staying with the eager disable that GICv4 requires.

Reported-by: Eric Auger <eric.auger@redhat.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/irqchip/irq-gic-v4.c b/drivers/irqchip/irq-gic-v4.c
index cd0bcc3b7e33..dba9d67cb9c1 100644
--- a/drivers/irqchip/irq-gic-v4.c
+++ b/drivers/irqchip/irq-gic-v4.c
@@ -177,6 +177,7 @@ int its_map_vlpi(int irq, struct its_vlpi_map *map)
                         .map      = map,
                 },
         };
+        int ret;
 
         /*
          * The host will never see that interrupt firing again, so it
@@ -184,7 +185,11 @@ int its_map_vlpi(int irq, struct its_vlpi_map *map)
          */
         irq_set_status_flags(irq, IRQ_DISABLE_UNLAZY);
 
-        return irq_set_vcpu_affinity(irq, &info);
+        ret = irq_set_vcpu_affinity(irq, &info);
+        if (ret)
+                irq_clear_status_flags(irq, IRQ_DISABLE_UNLAZY);
+
+        return ret;
 }
 
 int its_get_vlpi(int irq, struct its_vlpi_map *map)