irqchip/gic-v5: Delete a stray tab

There are two issues to fix in this code:
1) If gicv5_alloc_lpi() fails the original code was checking the wrong variable. Fix the mixup between "ret" and "lpi".
2) If irq_domain_alloc_irqs_parent() fails, then clean up all the loop iterations instead of just the current iteration.

Fixes 57d72196dfc8 ("irqchip/gic-v5: Add GICv5 ITS support")

Signed-off-by Dan Carpenter <[email protected]>

---
 drivers/irqchip/irq-gic-v5-its.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

drivers/irqchip/irq-gic-v5-its.c +0 -0

index 55360ae9f1f6..8cc8563e27d5 100644

drivers/irqchip/irq-gic-v5-its.c +10 -2

 		}
+		lpi = ret;
 
 		ret = irq_domain_alloc_irqs_parent(domain, virq + i, 1, &lpi);
-		if (ret)
+		if (ret) {
+			gicv5_free_lpi(lpi);
 			goto out_free_lpi;
+		}
 
 		/*
 		 * Store eventid and deviceid into the hwirq for later use.

@@ -979,7 +982,12 @@ static int gicv5_its_irq_domain_alloc(struct irq_domain *domain, unsigned int vi
 	return 0;
 
 out_free_lpi:
-	gicv5_free_lpi(lpi);
+	while (--i >= 0) {
+		irqd = irq_domain_get_irq_data(domain, virq + i);
+		gicv5_free_lpi(irqd->parent_data->hwirq);
+		irq_domain_reset_irq_data(irqd);
+		irq_domain_free_irqs_parent(domain, virq + i, 1);
+	}
 out_eventid:
 	gicv5_its_free_eventid(its_dev, event_id_base, nr_irqs);
 	return ret;

Signature · 1 line

2.47.2

Quoted 17 lines · Dan Carpenter

There are two issues to fix in this code:
1) If gicv5_alloc_lpi() fails the original code was checking the wrong variable. Fix the mixup between "ret" and "lpi".
2) If irq_domain_alloc_irqs_parent() fails, then clean up all the loop iterations instead of just the current iteration.

Fixes 57d72196dfc8 ("irqchip/gic-v5: Add GICv5 ITS support")

Signed-off-by Dan Carpenter <[email protected]>

---
 drivers/irqchip/irq-gic-v5-its.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

drivers/irqchip/irq-gic-v5-its.c +0 -0

index 55360ae9f1f6..8cc8563e27d5 100644

drivers/irqchip/irq-gic-v5-its.c static int gicv5_its_irq_domain_alloc(struct irq_domain *domain, unsigned int vi · line 955

Quoted 8 lines

drivers/irqchip/irq-gic-v5-its.c +1 -1

@@ -949,15 +949,18 @@ static int gicv5_its_irq_domain_alloc(struct irq_domain *domain, unsigned int vi
 	device_id = its_dev->device_id;
 
 	for (i = 0; i < nr_irqs; i++) {
-		lpi = gicv5_alloc_lpi();
+		ret = gicv5_alloc_lpi();
 		if (ret < 0) {
 			pr_debug("Failed to find free LPI!\n");
 			goto out_eventid;

This should be:

goto out_free_lpi;

otherwise we miss cleaning up for [0, i - 1] on LPI alloc failure.

I can fix it up - not sure it is worth splitting it into two patches, just let me know please how you want me to handle it.

Quoted 29 lines · Lorenzo Pieralisi

Quoted 17 lines · Dan Carpenter

There are two issues to fix in this code:
1) If gicv5_alloc_lpi() fails the original code was checking the wrong variable. Fix the mixup between "ret" and "lpi".
2) If irq_domain_alloc_irqs_parent() fails, then clean up all the loop iterations instead of just the current iteration.

Fixes 57d72196dfc8 ("irqchip/gic-v5: Add GICv5 ITS support")

Signed-off-by Dan Carpenter <[email protected]>

---
 drivers/irqchip/irq-gic-v5-its.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

drivers/irqchip/irq-gic-v5-its.c +0 -0

index 55360ae9f1f6..8cc8563e27d5 100644

drivers/irqchip/irq-gic-v5-its.c static int gicv5_its_irq_domain_alloc(struct irq_domain *domain, unsigned int vi · line 955

Quoted 8 lines

drivers/irqchip/irq-gic-v5-its.c +1 -1

@@ -949,15 +949,18 @@ static int gicv5_its_irq_domain_alloc(struct irq_domain *domain, unsigned int vi
 	device_id = its_dev->device_id;
 
 	for (i = 0; i < nr_irqs; i++) {
-		lpi = gicv5_alloc_lpi();
+		ret = gicv5_alloc_lpi();
 		if (ret < 0) {
 			pr_debug("Failed to find free LPI!\n");
 			goto out_eventid;

This should be:

Quoted 2 lines

goto out_free_lpi;

Yes, you're right.

Quoted 4 lines

otherwise we miss cleaning up for [0, i - 1] on LPI alloc failure.

I can fix it up - not sure it is worth splitting it into two patches, just let me know please how you want me to handle it.

I don't think it should be split up. As a reviewer I would be annoyed by a split up version of this.

I'm a little bit surprised by the offer to fix it up for me... Is this going through your tree? It's probably easiest if I just send a v2... Let me do that.