diff options
| author | Mathias Kresin <dev@kresin.me> | 2021-01-07 22:36:03 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-01-10 11:20:24 +0100 |
| commit | 599b3063adf4bf041a87a69244ee36aded0d878f (patch) | |
| tree | 4ebec8a437de5f9be50b19843d486969033a0648 /drivers/irqchip/irq-mips-cpu.c | |
| parent | irqchip/pruss: Simplify the TI_PRUSS_INTC Kconfig (diff) | |
| download | linux-599b3063adf4bf041a87a69244ee36aded0d878f.tar.xz linux-599b3063adf4bf041a87a69244ee36aded0d878f.zip | |
irqchip/mips-cpu: Set IPI domain parent chip
Since commit 55567976629e ("genirq/irqdomain: Allow partial trimming of
irq_data hierarchy") the irq_data chain is valided.
The irq_domain_trim_hierarchy() function doesn't consider the irq + ipi
domain hierarchy as valid, since the ipi domain has the irq domain set
as parent, but the parent domain has no chip set. Hence the boot ends in
a kernel panic.
Set the chip for the parent domain as it is done in the mips gic irq
driver, to have a valid irq_data chain.
Fixes: 3838a547fda2 ("irqchip: mips-cpu: Introduce IPI IRQ domain support")
Cc: <stable@vger.kernel.org> # v5.10+
Signed-off-by: Mathias Kresin <dev@kresin.me>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210107213603.1637781-1-dev@kresin.me
Diffstat (limited to 'drivers/irqchip/irq-mips-cpu.c')
| -rw-r--r-- | drivers/irqchip/irq-mips-cpu.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-mips-cpu.c b/drivers/irqchip/irq-mips-cpu.c index 95d4fd8f7a96..0bbb0b2d0dd5 100644 --- a/drivers/irqchip/irq-mips-cpu.c +++ b/drivers/irqchip/irq-mips-cpu.c @@ -197,6 +197,13 @@ static int mips_cpu_ipi_alloc(struct irq_domain *domain, unsigned int virq, if (ret) return ret; + ret = irq_domain_set_hwirq_and_chip(domain->parent, virq + i, hwirq, + &mips_mt_cpu_irq_controller, + NULL); + + if (ret) + return ret; + ret = irq_set_irq_type(virq + i, IRQ_TYPE_LEVEL_HIGH); if (ret) return ret; |