of/irq: Don't ignore interrupt-controller when interrupt-map failed
authorMarc Zyngier <maz@kernel.org>
Fri, 12 Nov 2021 14:10:39 +0000 (14:10 +0000)
committerMarc Zyngier <maz@kernel.org>
Fri, 12 Nov 2021 16:10:00 +0000 (16:10 +0000)
commit10a20b34d735fb4a4af067919b9c0a1c870dac99
treefd32730314fd307b3eaf1573f2b7845e3cd16f46
parent69ea463021be0d159ab30f96195fb0dd18ee2272
of/irq: Don't ignore interrupt-controller when interrupt-map failed

Since 041284181226 ("of/irq: Allow matching of an interrupt-map local
to an interrupt controller"), the irq code favors using an interrupt-map
over a interrupt-controller property if both are available, while the
earlier behaviour was to ignore the interrupt-map altogether.

However, we now end-up with the opposite behaviour, which is to
ignore the interrupt-controller property even if the interrupt-map
fails to match its input. This new behaviour breaks the AmigaOne
X1000 machine, which ships with an extremely "creative" (read:
broken) device tree.

Fix this by allowing the interrupt-controller property to be selected
when interrupt-map fails to match anything.

Fixes: 041284181226 ("of/irq: Allow matching of an interrupt-map local to an interrupt controller")
Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/78308692-02e6-9544-4035-3171a8e1e6d4@xenosoft.de
Link: https://lore.kernel.org/r/20211112143644.434995-1-maz@kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
drivers/of/irq.c