drivers: interrupt_controller: intc_nxp_irqsteer: fix system INTID

yangbolu1991 · kartben · commit 605335716a2d · 2025-03-11T18:54:40.000+01:00
Current system INTID calcualtion only worked for SoCs whose extended
interrupts started from IRQ 0.
Otherwise, FSL_FEATURE_IRQSTEER_IRQ_START_INDEX should be added for
system INTID.

Signed-off-by: Yangbo Lu &lt;yangbo.lu@nxp.com&gt;
diff --git a/drivers/interrupt_controller/intc_nxp_irqsteer.c b/drivers/interrupt_controller/intc_nxp_irqsteer.c
@@ -307,7 +307,7 @@ static int to_zephyr_irq(uint32_t regmap, uint32_t irq,
 {
 	int i, idx;
 
-	idx = irq;
+	idx = irq - FSL_FEATURE_IRQSTEER_IRQ_START_INDEX;
 
 	for (i = dispatcher->master_index - 1; i >= 0; i--) {
 		idx -= IRQSTEER_GetMasterIrqCount(UINT_TO_IRQSTEER(regmap), i);
@@ -325,10 +325,10 @@ static int to_system_irq(uint32_t regmap, int irq, int master_index)
 		irq += IRQSTEER_GetMasterIrqCount(UINT_TO_IRQSTEER(regmap), i);
 	}
 
-	return irq;
+	return irq + FSL_FEATURE_IRQSTEER_IRQ_START_INDEX;
 }
 
-/* used to convert zephyr INTID to system INTID */
+/* used to convert zephyr INTID (level 2) to system INTID */
 static int from_zephyr_irq(uint32_t regmap, uint32_t irq, uint32_t master_index)
 {
 	int i, idx;
@@ -339,7 +339,7 @@ static int from_zephyr_irq(uint32_t regmap, uint32_t irq, uint32_t master_index)
 		idx += IRQSTEER_GetMasterIrqCount(UINT_TO_IRQSTEER(regmap), i);
 	}
 
-	return idx;
+	return idx + FSL_FEATURE_IRQSTEER_IRQ_START_INDEX;
 }
 
 static void _irqstr_disp_enable_disable(struct irqsteer_dispatcher *disp,

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ static int to_zephyr_irq(uint32_t regmap, uint32_t irq,`
`307`	`307`	`{`
`308`	`308`	`int i, idx;`
`309`	`309`
`310`		`- idx = irq;`
	`310`	`+ idx = irq - FSL_FEATURE_IRQSTEER_IRQ_START_INDEX;`
`311`	`311`
`312`	`312`	`for (i = dispatcher->master_index - 1; i >= 0; i--) {`
`313`	`313`	`idx -= IRQSTEER_GetMasterIrqCount(UINT_TO_IRQSTEER(regmap), i);`
`@@ -325,10 +325,10 @@ static int to_system_irq(uint32_t regmap, int irq, int master_index)`
`325`	`325`	`irq += IRQSTEER_GetMasterIrqCount(UINT_TO_IRQSTEER(regmap), i);`
`326`	`326`	`}`
`327`	`327`
`328`		`- return irq;`
	`328`	`+ return irq + FSL_FEATURE_IRQSTEER_IRQ_START_INDEX;`
`329`	`329`	`}`
`330`	`330`
`331`		`-/* used to convert zephyr INTID to system INTID */`
	`331`	`+/* used to convert zephyr INTID (level 2) to system INTID */`
`332`	`332`	`static int from_zephyr_irq(uint32_t regmap, uint32_t irq, uint32_t master_index)`
`333`	`333`	`{`
`334`	`334`	`int i, idx;`
`@@ -339,7 +339,7 @@ static int from_zephyr_irq(uint32_t regmap, uint32_t irq, uint32_t master_index)`
`339`	`339`	`idx += IRQSTEER_GetMasterIrqCount(UINT_TO_IRQSTEER(regmap), i);`
`340`	`340`	`}`
`341`	`341`
`342`		`- return idx;`
	`342`	`+ return idx + FSL_FEATURE_IRQSTEER_IRQ_START_INDEX;`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`static void _irqstr_disp_enable_disable(struct irqsteer_dispatcher *disp,`