The following commit has been merged into the irq/irqchip-next branch of irqchip: Commit-ID: e3b7ab025e931accdc2c12acf9b75c6197f1c062 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/e3b7ab025e931accdc2c12acf9b75c6197f1c062 Author: Johan Hovold <johan+linaro@xxxxxxxxxx> AuthorDate: Mon, 13 Feb 2023 11:42:45 +01:00 Committer: Marc Zyngier <maz@xxxxxxxxxx> CommitterDate: Mon, 13 Feb 2023 19:31:24 irqdomain: Drop bogus fwspec-mapping error handling In case a newly allocated IRQ ever ends up not having any associated struct irq_data it would not even be possible to dispose the mapping. Replace the bogus disposal with a WARN_ON(). This will also be used to fix a shared-interrupt mapping race, hence the CC-stable tag. Fixes: 1e2a7d78499e ("irqdomain: Don't set type when mapping an IRQ") Cc: stable@xxxxxxxxxxxxxxx # 4.8 Tested-by: Hsin-Yi Wang <hsinyi@xxxxxxxxxxxx> Tested-by: Mark-PK Tsai <mark-pk.tsai@xxxxxxxxxxxx> Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx> Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx> Link: https://lore.kernel.org/r/20230213104302.17307-4-johan+linaro@xxxxxxxxxx --- kernel/irq/irqdomain.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index f77549a..9f5b96c 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -847,13 +847,8 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) } irq_data = irq_get_irq_data(virq); - if (!irq_data) { - if (irq_domain_is_hierarchy(domain)) - irq_domain_free_irqs(virq, 1); - else - irq_dispose_mapping(virq); + if (WARN_ON(!irq_data)) return 0; - } /* Store trigger type */ irqd_set_trigger_type(irq_data, type);
