Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

of/irq: Handle explicit interrupt parent

If an interrupt controller is used as a proxy, it may have an
"interrupt-parent" property, but lack "interrupts" and
"interrupts-extended" properties. In that case, the "interrupt-parent"
property in the interrupt controller node is ignored, causing the
interrupt controller to fail to probe, and leading to system boot
failures or crashes.

Fix this by also considering an explicit "interrupt-parent" property in
the interrupt controller node itself.

Fixes: 1b1f04d8271e7ba7 ("of/irq: Ignore interrupt parent for nodes without interrupts")
Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Closes: https://lore.kernel.org/20251118115037.1866871-1-m.szyprowski@samsung.com
Reported-by: Mark Brown <broonie@kernel.org>
Closes: https://lore.kernel.org/b037f67a-b241-4689-9914-57ff578c1454@sirena.org.uk
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Mark Brown <broonie@kernel.org>
Link: https://patch.msgid.link/e89669c9b3a4fbac4a972ffadcbe00fddb365472.1763557994.git.geert+renesas@glider.be
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>

authored by

Geert Uytterhoeven and committed by
Rob Herring (Arm)
6ba51b7b d8c8a575

+2
+2
drivers/of/irq.c
··· 595 595 desc->interrupt_parent = of_parse_phandle(np, "interrupts-extended", 0); 596 596 if (!desc->interrupt_parent && of_property_present(np, "interrupts")) 597 597 desc->interrupt_parent = of_irq_find_parent(np); 598 + else if (!desc->interrupt_parent) 599 + desc->interrupt_parent = of_parse_phandle(np, "interrupt-parent", 0); 598 600 if (desc->interrupt_parent == np) { 599 601 of_node_put(desc->interrupt_parent); 600 602 desc->interrupt_parent = NULL;