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

of/irq: Ignore interrupt parent for nodes without interrupts

The Devicetree Specification states:

The root of the interrupt tree is determined when traversal of the
interrupt tree reaches an interrupt controller node without an
interrupts property and thus no explicit interrupt parent.

However, of_irq_init() gratuitously assumes that a node without
interrupts has an actual interrupt parent if it finds an
interrupt-parent property higher up in the device tree. Hence when such
a property is present (e.g. in the root node), the root interrupt
controller may not be detected as such, causing a panic:

OF: of_irq_init: children remain, but no parents
Kernel panic - not syncing: No interrupt controller found.

Commit e91033621d56e055 ("of/irq: Use interrupts-extended to find
parent") already fixed a first part, by checking for the presence of an
interrupts-extended property. Fix the second part by only calling
of_irq_find_parent() when an interrupts property is present.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://patch.msgid.link/fbe6fc3657070fe2df7f0529043542b52b827449.1763116833.git.geert+renesas@glider.be
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>

authored by

Geert Uytterhoeven and committed by
Rob Herring (Arm)
1b1f04d8 c7496597

+1 -1
+1 -1
drivers/of/irq.c
··· 593 593 * are the same distance away from the root irq controller. 594 594 */ 595 595 desc->interrupt_parent = of_parse_phandle(np, "interrupts-extended", 0); 596 - if (!desc->interrupt_parent) 596 + if (!desc->interrupt_parent && of_property_present(np, "interrupts")) 597 597 desc->interrupt_parent = of_irq_find_parent(np); 598 598 if (desc->interrupt_parent == np) { 599 599 of_node_put(desc->interrupt_parent);