drivers: intc_dw: support multiple instances

Update the initializers to support platforms with multiple instances
of the DesignWare interrupt aggregator. Also ensure that the initialize
function calls irq_enable(). The calculation of the _sw_isr_table entry
also now takes CONFIG_GEN_IRQ_START_VECTOR into account.

Signed-off-by: Aaron Fong <afong@tenstorrent.com>

Author: afongTT

drivers/interrupt_controller/intc_dw.c

@@ -30,7 +30,7 @@ static ALWAYS_INLINE void dw_ictl_dispatch_child_isrs(uint32_t intr_status,
 	while (intr_status) {
 		intr_bitpos = find_lsb_set(intr_status) - 1;
 		intr_status &= ~(1 << intr_bitpos);
-		intr_offset = isr_base_offset + intr_bitpos;
+		intr_offset = isr_base_offset + intr_bitpos - CONFIG_GEN_IRQ_START_VECTOR;
 		_sw_isr_table[intr_offset].isr(
 			_sw_isr_table[intr_offset].arg);
 	}
@@ -46,6 +46,8 @@ static int dw_ictl_initialize(const struct device *dev)
 	regs->irq_inten_l = 0U;
 	regs->irq_inten_h = 0U;
 
+	config->config_func();
+
 	return 0;
 }
 
@@ -130,34 +132,33 @@ static int dw_ictl_intr_get_line_state(const struct device *dev,
 	return 0;
 }
 
-static void dw_ictl_config_irq(const struct device *dev);
-
-static const struct dw_ictl_config dw_config = {
-	.base_addr = DT_INST_REG_ADDR(0),
-	.numirqs = DT_INST_PROP(0, num_irqs),
-	.isr_table_offset = CONFIG_DW_ISR_TBL_OFFSET,
-	.config_func = dw_ictl_config_irq,
-};
-
 static const struct irq_next_level_api dw_ictl_apis = {
 	.intr_enable = dw_ictl_intr_enable,
 	.intr_disable = dw_ictl_intr_disable,
 	.intr_get_state = dw_ictl_intr_get_state,
 	.intr_get_line_state = dw_ictl_intr_get_line_state,
 };
 
-DEVICE_DT_INST_DEFINE(0, dw_ictl_initialize, NULL,
-		NULL, &dw_config, PRE_KERNEL_1,
-		CONFIG_DW_ICTL_INIT_PRIORITY, &dw_ictl_apis);
-
-static void dw_ictl_config_irq(const struct device *port)
-{
-	IRQ_CONNECT(DT_INST_IRQN(0),
-		    DT_INST_IRQ(0, priority),
-		    dw_ictl_isr,
-		    DEVICE_DT_INST_GET(0),
-		    DT_INST_IRQ(0, sense));
-}
-
-IRQ_PARENT_ENTRY_DEFINE(intc_dw, DEVICE_DT_INST_GET(0), DT_INST_IRQN(0),
-			INTC_INST_ISR_TBL_OFFSET(0), DT_INST_INTC_GET_AGGREGATOR_LEVEL(0));
+#define INTC_DW_DEVICE_INIT(inst)                                                                  \
+                                                                                                   \
+	static void dw_ictl_config_irq_##inst(void)                                                \
+	{                                                                                          \
+		IRQ_CONNECT(DT_INST_IRQN(inst), DT_INST_IRQ(inst, priority), dw_ictl_isr,          \
+			    DEVICE_DT_INST_GET(inst), DT_INST_IRQ(inst, sense));                   \
+		irq_enable(DT_INST_IRQN(inst));                                                    \
+	}                                                                                          \
+	IRQ_PARENT_ENTRY_DEFINE(intc_dw##inst, DEVICE_DT_INST_GET(inst), DT_INST_IRQN(inst),       \
+				INTC_INST_ISR_TBL_OFFSET(inst),                                    \
+				DT_INST_INTC_GET_AGGREGATOR_LEVEL(inst));                          \
+                                                                                                   \
+	static const struct dw_ictl_config dw_config_##inst = {                                    \
+		.base_addr = DT_INST_REG_ADDR(inst),                                               \
+		.numirqs = DT_INST_PROP(inst, num_irqs),                                           \
+		.isr_table_offset = INTC_INST_ISR_TBL_OFFSET(inst),                                \
+		.config_func = dw_ictl_config_irq_##inst,                                          \
+	};                                                                                         \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(inst, dw_ictl_initialize, NULL, NULL, &dw_config_##inst,             \
+			      PRE_KERNEL_1, CONFIG_DW_ICTL_INIT_PRIORITY, &dw_ictl_apis);
+
+DT_INST_FOREACH_STATUS_OKAY(INTC_DW_DEVICE_INIT)

drivers/interrupt_controller/intc_dw.h

@@ -13,7 +13,7 @@
 extern "C" {
 #endif
 
-typedef void (*dw_ictl_config_irq_t)(const struct device *dev);
+typedef void (*dw_ictl_config_irq_t)(void);
 
 struct dw_ictl_config {
 	uint32_t base_addr;