[v2] irqchip: irq-imx-irqsteer: Update the CHAN_MAX_OUTPUT_INT to 15

Commit Message

Jacky Bai March 5, 2025, 9:55 a.m. UTC

From: Shengjiu Wang <[e-mail]>

For the irqsteer channel, it can support up to 960 interrupt
inputs. All the interrupt inputs are divided into groups of 64
each. Each group of interrupts uses one irqsteer interrupt output
connected to the parent interrupt controller like GIC.

The CHAN_MAX_OUTPUT_INT is used to define the max interrupt outputs
from the irqsteer. For previous i.MX SoCs, the irqsteer instance is
designed with max 512 interrupt inputs. If the max interrupt
inputs is 512, the max interrupt outputs is 512 / 64 = 8. But for
i.MX94 family, the irqsteer is design with max 960 interrupt inputs
capability, The CHAN_MAX_OUTPUT_INT is 15.

Update the CHAN_MAX_OUTPUT_INT to 15 and do necessary code changes
to support the max 960 interrupt inputs case.

Signed-off-by: Shengjiu Wang <[e-mail]>
Signed-off-by: Jacky Bai <[e-mail]>
Reviewed-by: Ye Li <[e-mail]>
Reviewed-by: Peng Fan <[e-mail]>
Reviewed-by: Frank Li <[e-mail]>
---
 - v2 changes:
  - Improve the changelog
---
 drivers/irqchip/irq-imx-irqsteer.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Patch

diff --git a/drivers/irqchip/irq-imx-irqsteer.c b/drivers/irqchip/irq-imx-irqsteer.c
index b0e9788c0045..afbfcce3b1e3 100644
--- a/drivers/irqchip/irq-imx-irqsteer.c
+++ b/drivers/irqchip/irq-imx-irqsteer.c
@@ -24,7 +24,7 @@ 
 #define CHAN_MINTDIS(t)		(CTRL_STRIDE_OFF(t, 3) + 0x4)
 #define CHAN_MASTRSTAT(t)	(CTRL_STRIDE_OFF(t, 3) + 0x8)
 
-#define CHAN_MAX_OUTPUT_INT	0x8
+#define CHAN_MAX_OUTPUT_INT	0xF
 
 struct irqsteer_data {
 	void __iomem		*regs;
@@ -228,10 +228,8 @@  static int imx_irqsteer_probe(struct platform_device *pdev)
 
 	for (i = 0; i < data->irq_count; i++) {
 		data->irq[i] = irq_of_parse_and_map(np, i);
-		if (!data->irq[i]) {
-			ret = -EINVAL;
-			goto out;
-		}
+		if (!data->irq[i])
+			break;
 
 		irq_set_chained_handler_and_data(data->irq[i],
 						 imx_irqsteer_irq_handler,
@@ -254,9 +252,13 @@  static void imx_irqsteer_remove(struct platform_device *pdev)
 	struct irqsteer_data *irqsteer_data = platform_get_drvdata(pdev);
 	int i;
 
-	for (i = 0; i < irqsteer_data->irq_count; i++)
+	for (i = 0; i < irqsteer_data->irq_count; i++) {
+		if (!irqsteer_data->irq[i])
+			break;
+
 		irq_set_chained_handler_and_data(irqsteer_data->irq[i],
 						 NULL, NULL);
+	}
 
 	irq_domain_remove(irqsteer_data->domain);