Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

irqchip/imx-irqsteer: Support up to 960 input interrupts

The irqsteer IP routes groups of input interrupts to a dedicated system
interrupt per group. Each group handles 64 input interrupts.

The current driver is limited to 8 groups, i.e. 512 input interrupts, which
is sufficient for the existing i.MX SoCs. The upcoming i.MX94 family
extends the irqsteer IP to 15 groups, i.e. 960 interrupts.

Extending the group limit to 15 enables this, but the new SoCs are not
guaranteed to utilize all 15 groups. Unused groups have no mapping for the
underlying output interrupt, which makes the probe function fail as it
expects a valid mapping for each group output.

Remove this limitation and stop the mapping loop, when no valid mapping is
detected.

[ tglx: Massage change log ]

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/all/20250305095522.2177843-1-ping.bai@nxp.com

authored by

Shengjiu Wang and committed by
Thomas Gleixner
7db5fd6b 922ac17c

+8 -6
+8 -6
drivers/irqchip/irq-imx-irqsteer.c
··· 24 24 #define CHAN_MINTDIS(t) (CTRL_STRIDE_OFF(t, 3) + 0x4) 25 25 #define CHAN_MASTRSTAT(t) (CTRL_STRIDE_OFF(t, 3) + 0x8) 26 26 27 - #define CHAN_MAX_OUTPUT_INT 0x8 27 + #define CHAN_MAX_OUTPUT_INT 0xF 28 28 29 29 struct irqsteer_data { 30 30 void __iomem *regs; ··· 228 228 229 229 for (i = 0; i < data->irq_count; i++) { 230 230 data->irq[i] = irq_of_parse_and_map(np, i); 231 - if (!data->irq[i]) { 232 - ret = -EINVAL; 233 - goto out; 234 - } 231 + if (!data->irq[i]) 232 + break; 235 233 236 234 irq_set_chained_handler_and_data(data->irq[i], 237 235 imx_irqsteer_irq_handler, ··· 252 254 struct irqsteer_data *irqsteer_data = platform_get_drvdata(pdev); 253 255 int i; 254 256 255 - for (i = 0; i < irqsteer_data->irq_count; i++) 257 + for (i = 0; i < irqsteer_data->irq_count; i++) { 258 + if (!irqsteer_data->irq[i]) 259 + break; 260 + 256 261 irq_set_chained_handler_and_data(irqsteer_data->irq[i], 257 262 NULL, NULL); 263 + } 258 264 259 265 irq_domain_remove(irqsteer_data->domain); 260 266