Skip to content

Commit a7c7e42

Browse files
Sticklyman1936Thomas Gleixner
authored andcommitted
irqchip/gic-v5: Allocate ITS parent LPIs as a range
The ITS MSI domain no longer manages LPI allocation directly. LPIs are allocated and freed by the parent LPI domain, which can now handle a full range of interrupts and unwind partial allocations internally. Make the ITS domain request and release the parent IRQs as a single range instead of iterating over each interrupt. The ITS allocation path then only needs to reserve EventIDs, allocate the parent range, and fill in the ITS irq_data for each MSI. Since no operation in the per-MSI loop can fail, the partial parent-free unwind becomes unnecessary. On teardown, reset the ITS irq_data for the range and then release the parent range in one call, leaving LPI teardown to the LPI domain. Fixes: 0f01013 ("irqchip/gic-v5: Add GICv5 LPI/IPI support") Signed-off-by: Sascha Bischoff <sascha.bischoff@arm.com> Signed-off-by: Thomas Gleixner <tglx@kernel.org> Reviewed-by: Marc Zyngier <maz@kernel.org> Reviewed-by: Lorenzo Pieralisi <lpieralisi@kernel.org> Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260506093634.382062-4-sascha.bischoff@arm.com
1 parent eb6f6d5 commit a7c7e42

1 file changed

Lines changed: 7 additions & 15 deletions

File tree

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -937,6 +937,7 @@ static int gicv5_its_irq_domain_alloc(struct irq_domain *domain, unsigned int vi
937937
int ret, i;
938938

939939
its_dev = info->scratchpad[0].ptr;
940+
device_id = its_dev->device_id;
940941

941942
ret = gicv5_its_alloc_eventid(its_dev, info, nr_irqs, &event_id_base);
942943
if (ret)
@@ -946,14 +947,11 @@ static int gicv5_its_irq_domain_alloc(struct irq_domain *domain, unsigned int vi
946947
if (ret)
947948
goto out_eventid;
948949

949-
device_id = its_dev->device_id;
950+
ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, NULL);
951+
if (ret)
952+
goto out_eventid;
950953

951954
for (i = 0; i < nr_irqs; i++) {
952-
ret = irq_domain_alloc_irqs_parent(domain, virq + i, 1, NULL);
953-
if (ret) {
954-
goto out_free_irqs;
955-
}
956-
957955
/*
958956
* Store eventid and deviceid into the hwirq for later use.
959957
*
@@ -972,12 +970,6 @@ static int gicv5_its_irq_domain_alloc(struct irq_domain *domain, unsigned int vi
972970

973971
return 0;
974972

975-
out_free_irqs:
976-
while (--i >= 0) {
977-
irqd = irq_domain_get_irq_data(domain, virq + i);
978-
irq_domain_reset_irq_data(irqd);
979-
irq_domain_free_irqs_parent(domain, virq + i, 1);
980-
}
981973
out_eventid:
982974
gicv5_its_free_eventid(its_dev, event_id_base, nr_irqs);
983975
return ret;
@@ -1000,14 +992,14 @@ static void gicv5_its_irq_domain_free(struct irq_domain *domain, unsigned int vi
1000992
bitmap_release_region(its_dev->event_map, event_id_base,
1001993
get_count_order(nr_irqs));
1002994

1003-
/* Hierarchically free irq data */
1004995
for (i = 0; i < nr_irqs; i++) {
1005996
d = irq_domain_get_irq_data(domain, virq + i);
1006-
1007997
irq_domain_reset_irq_data(d);
1008-
irq_domain_free_irqs_parent(domain, virq + i, 1);
1009998
}
1010999

1000+
/* Hierarchically free irq data */
1001+
irq_domain_free_irqs_parent(domain, virq, nr_irqs);
1002+
10111003
gicv5_its_syncr(its, its_dev);
10121004
gicv5_irs_syncr();
10131005
}

0 commit comments

Comments
 (0)