diff options
| author | Marc Zyngier <maz@kernel.org> | 2023-05-30 11:01:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-21 16:00:54 +0200 |
| commit | 9a9adc42a590208ad3e912c605a7b51b66a6b13f (patch) | |
| tree | fe10b9891cf6a3c41bc47a840d6cbafc426a5ae6 | |
| parent | 22efb27a21b6ebe6be0760949d877141077de701 (diff) | |
| download | linux-stable-9a9adc42a590208ad3e912c605a7b51b66a6b13f.tar.gz linux-stable-9a9adc42a590208ad3e912c605a7b51b66a6b13f.tar.bz2 linux-stable-9a9adc42a590208ad3e912c605a7b51b66a6b13f.zip | |
irqchip/gic: Correctly validate OF quirk descriptors
[ Upstream commit 91539341a3b6e9c868024a4292455dae36e6f58c ]
When checking for OF quirks, make sure either 'compatible' or 'property'
is set, and give up otherwise.
This avoids non-OF quirks being randomly applied as they don't have any
of the OF data that need checking.
Cc: Douglas Anderson <dianders@chromium.org>
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Fixes: 44bd78dd2b88 ("irqchip/gic-v3: Disable pseudo NMIs on Mediatek devices w/ firmware issues")
Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/irqchip/irq-gic-common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-gic-common.c b/drivers/irqchip/irq-gic-common.c index de47b51cdadb..afd6a1841715 100644 --- a/drivers/irqchip/irq-gic-common.c +++ b/drivers/irqchip/irq-gic-common.c @@ -16,6 +16,8 @@ void gic_enable_of_quirks(const struct device_node *np, const struct gic_quirk *quirks, void *data) { for (; quirks->desc; quirks++) { + if (!quirks->compatible && !quirks->property) + continue; if (quirks->compatible && !of_device_is_compatible(np, quirks->compatible)) continue; |