]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
irqchip/loongson-liointc: Set different ISRs for different cores
authorHuacai Chen <chenhuacai@loongson.cn>
Sat, 22 Jun 2024 04:33:38 +0000 (12:33 +0800)
committerThomas Gleixner <tglx@linutronix.de>
Sun, 23 Jun 2024 15:09:26 +0000 (17:09 +0200)
The liointc hardware provides separate Interrupt Status Registers (ISR) for
each core. The current code uses always the ISR of core #0, which works
during boot because by default all interrupts are routed to core #0.

When the interrupt routing changes in the firmware configuration then this
causes interrupts to be lost because they are not configured in the
corresponding core.

Use the core index to access the correct ISR instead of a hardcoded 0.

[ tglx: Massaged changelog ]

Fixes: 0858ed035a85 ("irqchip/loongson-liointc: Add ACPI init support")
Co-developed-by: Tianli Xiong <xiongtianli@loongson.cn>
Signed-off-by: Tianli Xiong <xiongtianli@loongson.cn>
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20240622043338.1566945-1-chenhuacai@loongson.cn
drivers/irqchip/irq-loongson-liointc.c

index e4b33aed1c97b3461e8f66f734f1785743a013f4..7c4fe7ab4b830e499ec36140ae6cd39ad1325ab0 100644 (file)
@@ -28,7 +28,7 @@
 
 #define LIOINTC_INTC_CHIP_START        0x20
 
-#define LIOINTC_REG_INTC_STATUS        (LIOINTC_INTC_CHIP_START + 0x20)
+#define LIOINTC_REG_INTC_STATUS(core)  (LIOINTC_INTC_CHIP_START + 0x20 + (core) * 8)
 #define LIOINTC_REG_INTC_EN_STATUS     (LIOINTC_INTC_CHIP_START + 0x04)
 #define LIOINTC_REG_INTC_ENABLE        (LIOINTC_INTC_CHIP_START + 0x08)
 #define LIOINTC_REG_INTC_DISABLE       (LIOINTC_INTC_CHIP_START + 0x0c)
@@ -217,7 +217,7 @@ static int liointc_init(phys_addr_t addr, unsigned long size, int revision,
                goto out_free_priv;
 
        for (i = 0; i < LIOINTC_NUM_CORES; i++)
-               priv->core_isr[i] = base + LIOINTC_REG_INTC_STATUS;
+               priv->core_isr[i] = base + LIOINTC_REG_INTC_STATUS(i);
 
        for (i = 0; i < LIOINTC_NUM_PARENT; i++)
                priv->handler[i].parent_int_map = parent_int_map[i];