Re: [PATCH] irqchip: mips-cpu: set IPI domain parent chip

2021-01-10 Thread Marc Zyngier
On Thu, 7 Jan 2021 22:36:03 +0100, Mathias Kresin wrote:
> 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.
> 
> [...]

Applied to irq/irqchip-next, thanks!

[1/1] irqchip: mips-cpu: set IPI domain parent chip
  commit: 599b3063adf4bf041a87a69244ee36aded0d878f

Cheers,

M.
-- 
Without deviation from the norm, progress is not possible.




[PATCH] irqchip: mips-cpu: set IPI domain parent chip

2021-01-07 Thread Mathias Kresin
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:  # v5.10+
Signed-off-by: Mathias Kresin 
---
 drivers/irqchip/irq-mips-cpu.c | 7 +++
 1 file changed, 7 insertions(+)

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;
-- 
2.25.1