Commit db8c70ec authored Oct 14, 2015 by Marc Zyngier Committed by Thomas Gleixner Oct 15, 2015

irqchip/gic-v3: Fix translation of LPIs after conversion to irq_fwspec



Commit f833f57f ("irqchip: Convert all alloc/xlate users from
of_node to fwnode") converted the GICv3 driver to using irq_fwspec
as part of its 'translate' method.

Too bad it ended up with a copy of the GICv2 'translate' method,
which screws up LPI translation (by not translating them at all).

Restore the code in its original shape, and just change what is
really required...

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Cc: Duc Dang <dhdang@apm.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1444822037-16983-2-git-send-email-marc.zyngier@arm.com


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 7e4ac676

drivers/irqchip/irq-gic-v3.c

+13 −9

Original line number	Diff line number	Diff line
		@@ -746,15 +746,19 @@ static int gic_irq_domain_translate(struct irq_domain *d,
		if (fwspec->param_count < 3)
		return -EINVAL;

		/* Get the interrupt number and add 16 to skip over SGIs */
		switch (fwspec->param[0]) {
		case 0: /* SPI */
		*hwirq = fwspec->param[1] + 32;
		break;
		case 1: /* PPI */
		*hwirq = fwspec->param[1] + 16;

		/*
		* For SPIs, we need to add 16 more to get the GIC irq
		* ID number
		*/
		if (!fwspec->param[0])
		*hwirq += 16;
		break;
		case GIC_IRQ_TYPE_LPI: /* LPI */
		*hwirq = fwspec->param[1];
		break;
		default:
		return -EINVAL;
		}

		*type = fwspec->param[2] & IRQ_TYPE_SENSE_MASK;
		return 0;

Admin message