Commit ddac9c5b authored Jul 18, 2017 by Matt Redfearn Committed by Thomas Gleixner Jul 18, 2017

irqchip/mips-gic: Remove population of irq domain names



Since commit d59f6617 ("genirq: Allow fwnode to carry name
information only") the irqdomain core sets the names of irq domains.
When the name is allocated the new IRQ_DOMAIN_NAME_ALLOCATED flag is
set. Replacing the allocated name with a constant one is not a good
idea, since calling the new irq_domain_update_bus_token() API, added to
the MIPS GIC driver by commit 96f0d93a ("irqchip/MSI: Use
irq_domain_update_bus_token instead of an open coded access") will
attempt to kfree the pointer, and result in a kernel OOPS.

Fix this by removing the names, now that they are set by the irqdomain
core. This effectively reverts commit 21c57fd1 ("irqchip/mips-gic:
Populate irq_domain names").

Fixes: d59f6617 ("genirq: Allow fwnode to carry name information only")
Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: linux-mips@linux-mips.org
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1500363561-32213-1-git-send-email-matt.redfearn@imgtec.com

parent a696712c

drivers/irqchip/irq-mips-gic.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -950,7 +950,6 @@ static void __init __gic_init(unsigned long gic_base_addr,
		&gic_irq_domain_ops, NULL);
		if (!gic_irq_domain)
		panic("Failed to add GIC IRQ domain");
		gic_irq_domain->name = "mips-gic-irq";

		gic_ipi_domain = irq_domain_add_hierarchy(gic_irq_domain,
		IRQ_DOMAIN_FLAG_IPI_PER_CPU,
		@@ -959,7 +958,6 @@ static void __init __gic_init(unsigned long gic_base_addr,
		if (!gic_ipi_domain)
		panic("Failed to add GIC IPI domain");

		gic_ipi_domain->name = "mips-gic-ipi";
		irq_domain_update_bus_token(gic_ipi_domain, DOMAIN_BUS_IPI);

		if (node &&