Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b2312bd authored by Harvey Hunt's avatar Harvey Hunt Committed by Thomas Gleixner
Browse files

irqchip/mips-gic: Fix IRQs in gic_dev_domain 



When allocating a new device IRQ, gic_dev_domain_alloc() correctly calls
irq_domain_set_hwirq_and_chip(), but gic_irq_domain_alloc() does not. This
means that gic_irq_domain believes all IRQs from the dev domain have an
hwirq of 0 and creates incorrect mappings in the linear_revmap. As
gic_irq_domain is a parent of the gic_dev_domain, this leads to an
inability to boot on devices with a GIC. Excerpt of the error:

[    2.297649] irq 0: nobody cared (try booting with the "irqpoll" option)
...
[    2.436963] handlers:
[    2.439492] Disabling IRQ #0

Fix this by calling irq_domain_set_hwirq_and_chip() for both the dev and
irq domain.

Now that we are modifying the parent domain, be sure to clear it up in
case of an allocation error.

Fixes: c98c1822 ("irqchip/mips-gic: Add device hierarchy domain")
Fixes: 2af70a96 ("irqchip/mips-gic: Add a IPI hierarchy domain")
Signed-off-by: default avatarHarvey Hunt <harvey.hunt@imgtec.com>
Tested-by: Govindraj Raja <Govindraj.Raja@imgtec.com> # On Pistachio SoC
Reviewed-by: default avatarMatt Redfearn <matt.redfearn@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: Qais Yousef <qsyousef@gmail.com>
Cc: jason@lakedaemon.net
Cc: marc.zyngier@arm.com
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/1464001552-31174-1-git-send-email-harvey.hunt@imgtec.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 2eec3707

drivers/irqchip/irq-mips-gic.c

+11 −1
Original line number Diff line number Diff line
@@ -746,6 +746,12 @@ static int gic_irq_domain_alloc(struct irq_domain *d, unsigned int virq, 
		/* verify that it doesn't conflict with an IPI irq */

		if (test_bit(spec->hwirq, ipi_resrv))

			return -EBUSY;



		hwirq = GIC_SHARED_TO_HWIRQ(spec->hwirq);



		return irq_domain_set_hwirq_and_chip(d, virq, hwirq,

						     &gic_level_irq_controller,

						     NULL);

	} else {

		base_hwirq = find_first_bit(ipi_resrv, gic_shared_intrs);

		if (base_hwirq == gic_shared_intrs) {
@@ -867,10 +873,14 @@ static int gic_dev_domain_alloc(struct irq_domain *d, unsigned int virq, 
						    &gic_level_irq_controller,

						    NULL);

		if (ret)

			return ret;

			goto error;

	}



	return 0;



error:

	irq_domain_free_irqs_parent(d, virq, nr_irqs);

	return ret;

}



void gic_dev_domain_free(struct irq_domain *d, unsigned int virq,