[PATCH 07/10] MIPS: Implement get_mips_sw_int hook

Jiaxun Yang
2024-06-16T21:03:51Z

For MIPS CPUs with VEIC, SW0 and SW1 interrupts are also
routed through external sources.

We need such hook to allow architecture code to get interrupt
source from platform EIC controllers.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
arch/mips/include/asm/irq.h | 1 +
arch/mips/include/asm/irq_cpu.h | 3 +++
arch/mips/kernel/irq.c | 17 +++++++++++++++++
drivers/irqchip/irq-mips-cpu.c | 11 +++++++++++
4 files changed, 32 insertions(+)

diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h
index 3a848e7e69f7..6edad40ef663 100644
--- a/arch/mips/include/asm/irq.h
+++ b/arch/mips/include/asm/irq.h
@@ -51,6 +51,7 @@ static inline int irq_canonicalize(int irq)
#else
#define irq_canonicalize(irq) (irq) /* Sane hardware, sane code ... */
#endif
+int get_mips_sw_int(int hwint);

asmlinkage void plat_irq_dispatch(void);

diff --git a/arch/mips/include/asm/irq_cpu.h b/arch/mips/include/asm/irq_cpu.h
index 83d7331ab215..50a99ba2d503 100644
--- a/arch/mips/include/asm/irq_cpu.h
+++ b/arch/mips/include/asm/irq_cpu.h
@@ -9,7 +9,10 @@
#ifndef _ASM_IRQ_CPU_H
#define _ASM_IRQ_CPU_H

+#include <linux/irqdomain.h>
+
extern void mips_cpu_irq_init(void);
+extern int mips_cpu_get_sw_int(int hwint);

#ifdef CONFIG_IRQ_DOMAIN
struct device_node;
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index c3ea8d80e0cb..c79504b12134 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -26,10 +26,27 @@
#include <linux/atomic.h>
#include <linux/uaccess.h>

+#include <asm/irq_cpu.h>
#include <asm/ipi.h>

void *irq_stack[NR_CPUS];

+int __weak get_mips_sw_int(int hwint)
+{
+ /* Only SW0 and SW1 */
+ WARN_ON(hwint > 1);
+
+ /* SW int is routed to external source */
+ if (cpu_has_veic)
+ return 0;
+
+#ifdef CONFIG_IRQ_MIPS_CPU
+ return mips_cpu_get_sw_int(hwint);
+#endif
+
+ return MIPS_CPU_IRQ_BASE + hwint;
+}
+
/*
* 'what should we do if we get a hw irq event on an illegal vector'.
* each architecture has to answer this themselves.
diff --git a/drivers/irqchip/irq-mips-cpu.c b/drivers/irqchip/irq-mips-cpu.c
index 0c7ae71a0af0..7b3501485d95 100644
--- a/drivers/irqchip/irq-mips-cpu.c
+++ b/drivers/irqchip/irq-mips-cpu.c
@@ -254,6 +254,17 @@ static inline void mips_cpu_register_ipi_domain(struct device_node *of_node) {}

#endif /* !CONFIG_GENERIC_IRQ_IPI */

+int mips_cpu_get_sw_int(int hwint)
+{
+ /* Only 0 and 1 for SW INT */
+ WARN_ON(hwint > 1);
+
+ if (!irq_domain)
+ return 0;
+
+ return irq_create_mapping(irq_domain, hwint);
+}
+
static void __init __mips_cpu_irq_init(struct device_node *of_node)
{
/* Mask interrupts. */

--
2.43.0