Skip to content

Commit 678c607

Browse files
avpatelKAGA-KOKO
authored andcommitted
irqchip/riscv-intc: Fix low-level interrupt handler setup for AIA
Use riscv_intc_aia_irq() as the low-level interrupt handler instead of the existing riscv_intc_irq() default handler to make demultiplexing work correctly. Also print "using AIA" in the INTC boot banner when AIA is available. Fixes: 3c46fc5 ("irqchip/riscv-intc: Add support for RISC-V AIA") Signed-off-by: Anup Patel <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent c147e1e commit 678c607

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

drivers/irqchip/irq-riscv-intc.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,16 +183,20 @@ static int __init riscv_intc_init_common(struct fwnode_handle *fn, struct irq_ch
183183
return -ENXIO;
184184
}
185185

186-
rc = set_handle_irq(&riscv_intc_irq);
186+
if (riscv_isa_extension_available(NULL, SxAIA))
187+
rc = set_handle_irq(&riscv_intc_aia_irq);
188+
else
189+
rc = set_handle_irq(&riscv_intc_irq);
187190
if (rc) {
188191
pr_err("failed to set irq handler\n");
189192
return rc;
190193
}
191194

192195
riscv_set_intc_hwnode_fn(riscv_intc_hwnode);
193196

194-
pr_info("%d local interrupts mapped\n",
195-
riscv_isa_extension_available(NULL, SxAIA) ? 64 : riscv_intc_nr_irqs);
197+
pr_info("%d local interrupts mapped%s\n",
198+
riscv_isa_extension_available(NULL, SxAIA) ? 64 : riscv_intc_nr_irqs,
199+
riscv_isa_extension_available(NULL, SxAIA) ? " using AIA" : "");
196200
if (riscv_intc_custom_nr_irqs)
197201
pr_info("%d custom local interrupts mapped\n", riscv_intc_custom_nr_irqs);
198202

0 commit comments

Comments
 (0)