Skip to contentSkip to conversation

lib: sbi: Add a simple external interrupt handling framework

PATCH New Anup Patel 4 participants 5 messages Feb 22, 2022 – Feb 28, 2022

lore
Share & tools
lore

Anup Patel

author
#0 lore raw

PATCH 1/1 lib: sbi: Add a simple external interrupt handling framework

Currently, the external interrupt handling is scattered between sbi_init and sbi_trap. This patch moves all external interrupt handling into a simple framework called sbi_irqchip.

---
 include/sbi/sbi_irqchip.h | 44 +++++++++++++++++++++++++++++++
 include/sbi/sbi_trap.h    |  2 --
 lib/sbi/objects.mk        |  1 +
 lib/sbi/sbi_init.c        | 12 ++++-----
 lib/sbi/sbi_irqchip.c     | 54 +++++++++++++++++++++++++++++++++++++++
 lib/sbi/sbi_trap.c        | 26 +++----------------
 lib/utils/irqchip/imsic.c |  4 +--
 7 files changed, 109 insertions(+), 34 deletions(-)
 create mode 100644 include/sbi/sbi_irqchip.h
 create mode 100644 lib/sbi/sbi_irqchip.c
include/sbi/sbi_irqchip.h new file +44 -0
new file mode 100644
index 0000000..6acc6e3
@@ -0,0 +1,44 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022 Ventana Micro Systems Inc.
+ *
+ * Authors:
+ *   Anup Patel <[email protected]>
+ */
+
+#ifndef __SBI_IRQCHIP_H__
+#define __SBI_IRQCHIP_H__
+
+#include <sbi/sbi_types.h>
+
+struct sbi_scratch;
+struct sbi_trap_regs;
+
+/**
+ * Set external interrupt handling function
+ *
+ * This function is called by OpenSBI platform code to set a handler for
+ * external interrupts
+ *
+ * @param fn function pointer for handling external irqs
+ */
+void sbi_irqchip_set_irqfn(int (*fn)(struct sbi_trap_regs *regs));
+
+/**
+ * Process external interrupts
+ *
+ * This function is called by sbi_trap_handler() to handle external
+ * interrupts.
+ *
+ * @param regs pointer for trap registers
+ */
+int sbi_irqchip_process(struct sbi_trap_regs *regs);
+
+/** Initialize interrupt controllers */
+int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot);
+
+/** Exit interrupt controllers */
+void sbi_irqchip_exit(struct sbi_scratch *scratch);
+
+#endif
include/sbi/sbi_trap.h +0 -2
index 4f611fa..d205056 100644
@@ -205,8 +205,6 @@ struct sbi_trap_info {
 int sbi_trap_redirect(struct sbi_trap_regs *regs,
 		      struct sbi_trap_info *trap);
 
-void sbi_trap_set_external_irqfn(int (*fn)(struct sbi_trap_regs *regs));
-
 struct sbi_trap_regs *sbi_trap_handler(struct sbi_trap_regs *regs);
 
 void __noreturn sbi_trap_exit(const struct sbi_trap_regs *regs);
lib/sbi/objects.mk +1 -0
index 7096f24..1ed1983 100644
@@ -32,6 +32,7 @@ libsbi-objs-y += sbi_hsm.o
 libsbi-objs-y += sbi_illegal_insn.o
 libsbi-objs-y += sbi_init.o
 libsbi-objs-y += sbi_ipi.o
+libsbi-objs-y += sbi_irqchip.o
 libsbi-objs-y += sbi_misaligned_ldst.o
 libsbi-objs-y += sbi_platform.o
 libsbi-objs-y += sbi_pmu.o
lib/sbi/sbi_init.c +5 -7
index 6876eb2..2b9e5ae 100644
@@ -18,6 +18,7 @@
 #include <sbi/sbi_hartmask.h>
 #include <sbi/sbi_hsm.h>
 #include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
 #include <sbi/sbi_platform.h>
 #include <sbi/sbi_pmu.h>
 #include <sbi/sbi_system.h>
@@ -270,13 +271,12 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
 
 	sbi_boot_print_banner(scratch);
 
-	rc = sbi_platform_irqchip_init(plat, TRUE);
+	rc = sbi_irqchip_init(scratch, TRUE);
 	if (rc) {
-		sbi_printf("%s: platform irqchip init failed (error %d)\n",
+		sbi_printf("%s: irqchip init failed (error %d)\n",
 			   __func__, rc);
 		sbi_hart_hang();
 	}
-	csr_set(CSR_MIE, MIP_MEIP);
 
 	rc = sbi_ipi_init(scratch, TRUE);
 	if (rc) {
@@ -374,10 +374,9 @@ static void init_warm_startup(struct sbi_scratch *scratch, u32 hartid)
 	if (rc)
 		sbi_hart_hang();
 
-	rc = sbi_platform_irqchip_init(plat, FALSE);
+	rc = sbi_irqchip_init(scratch, FALSE);
 	if (rc)
 		sbi_hart_hang();
-	csr_set(CSR_MIE, MIP_MEIP);
 
 	rc = sbi_ipi_init(scratch, FALSE);
 	if (rc)
@@ -552,8 +551,7 @@ void __noreturn sbi_exit(struct sbi_scratch *scratch)
 
 	sbi_ipi_exit(scratch);
 
-	csr_clear(CSR_MIE, MIP_MEIP);
-	sbi_platform_irqchip_exit(plat);
+	sbi_irqchip_exit(scratch);
 
 	sbi_platform_final_exit(plat);
 
lib/sbi/sbi_irqchip.c new file +54 -0

54 lines not on this page · raw message

lib/sbi/sbi_trap.c +3 -23
index faab90a..86bab6d 100644
@@ -15,6 +15,7 @@
 #include <sbi/sbi_hart.h>
 #include <sbi/sbi_illegal_insn.h>
 #include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
 #include <sbi/sbi_misaligned_ldst.h>
 #include <sbi/sbi_pmu.h>
 #include <sbi/sbi_scratch.h>
@@ -195,27 +196,6 @@ int sbi_trap_redirect(struct sbi_trap_regs *regs,
 	return 0;
 }
 
-static int default_irqfn(struct sbi_trap_regs *regs)
-{
-	return SBI_ENODEV;
-}
-
-static int (*ext_irqfn)(struct sbi_trap_regs *regs) = default_irqfn;
-
-/**
- * Set external irq handler function
- *
- * This function is called by OpenSBI platform code to set a handler for
- * external interrupts
- *
- * @param fn function pointer for handling external irqs
- */
-void sbi_trap_set_external_irqfn(int (*fn)(struct sbi_trap_regs *regs))
-{
-	if (fn)
-		ext_irqfn = fn;
-}
-
 static int sbi_trap_nonaia_irq(struct sbi_trap_regs *regs, ulong mcause)
 {
 	mcause &= ~(1UL << (__riscv_xlen - 1));
@@ -227,7 +207,7 @@ static int sbi_trap_nonaia_irq(struct sbi_trap_regs *regs, ulong mcause)
 		sbi_ipi_process();
 		break;
 	case IRQ_M_EXT:
-		return ext_irqfn(regs);
+		return sbi_irqchip_process(regs);
 	default:
 		return SBI_ENOENT;
 	};
@@ -250,7 +230,7 @@ static int sbi_trap_aia_irq(struct sbi_trap_regs *regs, ulong mcause)
 			sbi_ipi_process();
 			break;
 		case IRQ_M_EXT:
-			rc = ext_irqfn(regs);
+			rc = sbi_irqchip_process(regs);
 			if (rc)
 				return rc;
 			break;
lib/utils/irqchip/imsic.c +2 -2
index 123d01f..b29a1e9 100644
@@ -15,8 +15,8 @@
 #include <sbi/sbi_domain.h>
 #include <sbi/sbi_hartmask.h>
 #include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
 #include <sbi/sbi_error.h>
-#include <sbi/sbi_trap.h>
 #include <sbi_utils/irqchip/imsic.h>
 
 #define IMSIC_MMIO_PAGE_LE		0x00
@@ -268,7 +268,7 @@ int imsic_cold_irqchip_init(struct imsic_data *imsic)
 		return SBI_EINVAL;
 
 	/* Setup external interrupt function for IMSIC */
-	sbi_trap_set_external_irqfn(imsic_external_irqfn);
+	sbi_irqchip_set_irqfn(imsic_external_irqfn);
 
 	/* Add IMSIC regions to the root domain */
 	for (i = 0; i < IMSIC_MAX_REGS && imsic->regs[i].size; i++) {
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 lib: sbi: Add a simple external interrupt handling framework

? 2022-02-22???? 13:48 +0530?Anup Patel???

Quoted 5 lines

Currently, the external interrupt handling is scattered between sbi_init and sbi_trap. This patch moves all external interrupt handling into a simple framework called sbi_irqchip.

Look good to me.

Quoted 295 lines

---

?include/sbi/sbi_irqchip.h | 44 +++++++++++++++++++++++++++++++
?include/sbi/sbi_trap.h??? |? 2 --
?lib/sbi/objects.mk??????? |? 1 +
?lib/sbi/sbi_init.c??????? | 12 ++++-----
?lib/sbi/sbi_irqchip.c???? | 54

+++++++++++++++++++++++++++++++++++++++
?lib/sbi/sbi_trap.c??????? | 26 +++---------------- ?lib/utils/irqchip/imsic.c |? 4 +--
?7 files changed, 109 insertions(+), 34 deletions(-) ?create mode 100644 include/sbi/sbi_irqchip.h ?create mode 100644 lib/sbi/sbi_irqchip.c

include/sbi/sbi_irqchip.h new file +21 -0
new file mode 100644
index 0000000..6acc6e3
@@ -0,0 +1,44 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022 Ventana Micro Systems Inc.
+ *
+ * Authors:
+ *?? Anup Patel <[email protected]>
+ */
+
+#ifndef __SBI_IRQCHIP_H__
+#define __SBI_IRQCHIP_H__
+
+#include <sbi/sbi_types.h>
+
+struct sbi_scratch;
+struct sbi_trap_regs;
+
+/**
+ * Set external interrupt handling function
+ *
+ * This function is called by OpenSBI platform code to set a handler

for
+ * external interrupts
+ *
+ * @param fn function pointer for handling external irqs
+ */

include/sbi/sbi_irqchip.h new file +19 -0
+void sbi_irqchip_set_irqfn(int (*fn)(struct sbi_trap_regs *regs));
+
+/**
+ * Process external interrupts
+ *
+ * This function is called by sbi_trap_handler() to handle external
+ * interrupts.
+ *
+ * @param regs pointer for trap registers
+ */
+int sbi_irqchip_process(struct sbi_trap_regs *regs);
+
+/** Initialize interrupt controllers */
+int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot);
+
+/** Exit interrupt controllers */
+void sbi_irqchip_exit(struct sbi_scratch *scratch);
+
+#endif
include/sbi/sbi_trap.h +0 -0
index 4f611fa..d205056 100644
@@ -205,8 +205,6 @@ struct sbi_trap_info {
 ?int sbi_trap_redirect(struct sbi_trap_regs *regs,
 ????????????????????? struct sbi_trap_info *trap);

?
-void sbi_trap_set_external_irqfn(int (*fn)(struct sbi_trap_regs *regs));
-
?struct sbi_trap_regs *sbi_trap_handler(struct sbi_trap_regs *regs); ?
?void __noreturn sbi_trap_exit(const struct sbi_trap_regs *regs);

lib/sbi/objects.mk +0 -0
index 7096f24..1ed1983 100644
@@ -32,6 +32,7 @@ libsbi-objs-y += sbi_hsm.o

?libsbi-objs-y += sbi_illegal_insn.o
?libsbi-objs-y += sbi_init.o
?libsbi-objs-y += sbi_ipi.o
+libsbi-objs-y += sbi_irqchip.o
?libsbi-objs-y += sbi_misaligned_ldst.o
?libsbi-objs-y += sbi_platform.o
?libsbi-objs-y += sbi_pmu.o

lib/sbi/sbi_init.c +0 -0
index 6876eb2..2b9e5ae 100644
@@ -18,6 +18,7 @@

?#include <sbi/sbi_hartmask.h>
?#include <sbi/sbi_hsm.h>
?#include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
?#include <sbi/sbi_platform.h>
?#include <sbi/sbi_pmu.h>
?#include <sbi/sbi_system.h>

lib/sbi/sbi_init.c +0 -0
@@ -270,13 +271,12 @@ static void __noreturn init_coldboot(struct
 sbi_scratch *scratch, u32 hartid)

?
????????sbi_boot_print_banner(scratch);
?
-???????rc = sbi_platform_irqchip_init(plat, TRUE); +???????rc = sbi_irqchip_init(scratch, TRUE);
????????if (rc) {
-???????????????sbi_printf("%s: platform irqchip init failed (error %d)\n",
+???????????????sbi_printf("%s: irqchip init failed (error %d)\n", ?????????????????????????? __func__, rc); ????????????????sbi_hart_hang();
????????}
-???????csr_set(CSR_MIE, MIP_MEIP);
?
????????rc = sbi_ipi_init(scratch, TRUE);
????????if (rc) {

lib/sbi/sbi_init.c +0 -0
@@ -374,10 +374,9 @@ static void init_warm_startup(struct sbi_scratch
 *scratch, u32 hartid)
 ????????if (rc)
 ????????????????sbi_hart_hang();

?
-???????rc = sbi_platform_irqchip_init(plat, FALSE); +???????rc = sbi_irqchip_init(scratch, FALSE); ????????if (rc) ????????????????sbi_hart_hang(); -???????csr_set(CSR_MIE, MIP_MEIP);
?
????????rc = sbi_ipi_init(scratch, FALSE); ????????if (rc)

lib/sbi/sbi_init.c +0 -0
@@ -552,8 +551,7 @@ void __noreturn sbi_exit(struct sbi_scratch
 *scratch)

?
????????sbi_ipi_exit(scratch);
?
-???????csr_clear(CSR_MIE, MIP_MEIP);
-???????sbi_platform_irqchip_exit(plat);
+???????sbi_irqchip_exit(scratch);
?
????????sbi_platform_final_exit(plat);
?

lib/sbi/sbi_irqchip.c new file +54 -0
new file mode 100644
index 0000000..24128be
@@ -0,0 +1,54 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022 Ventana Micro Systems Inc.
+ *
+ * Authors:
+ *?? Anup Patel <[email protected]>
+ */
+
+#include <sbi/sbi_irqchip.h>
+#include <sbi/sbi_platform.h>
+
+static int default_irqfn(struct sbi_trap_regs *regs)
+{
+???????return SBI_ENODEV;
+}
+
+static int (*ext_irqfn)(struct sbi_trap_regs *regs) = default_irqfn;
+
+void sbi_irqchip_set_irqfn(int (*fn)(struct sbi_trap_regs *regs))
+{
+???????if (fn)
+???????????????ext_irqfn = fn;
+}
+
+int sbi_irqchip_process(struct sbi_trap_regs *regs)
+{
+???????return ext_irqfn(regs);
+}
+
+int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot)
+{
+???????int rc;
+???????const struct sbi_platform *plat = sbi_platform_ptr(scratch);
+
+???????rc = sbi_platform_irqchip_init(plat, cold_boot);
+???????if (rc)
+???????????????return rc;
+
+???????if (ext_irqfn != default_irqfn)
+???????????????csr_set(CSR_MIE, MIP_MEIP);
+
+???????return 0;
+}
+
+void sbi_irqchip_exit(struct sbi_scratch *scratch)
+{
+???????const struct sbi_platform *plat = sbi_platform_ptr(scratch);
+
+???????if (ext_irqfn != default_irqfn)
+???????????????csr_clear(CSR_MIE, MIP_MEIP);
+
+???????sbi_platform_irqchip_exit(plat);
+}
lib/sbi/sbi_trap.c +0 -0
index faab90a..86bab6d 100644
@@ -15,6 +15,7 @@

?#include <sbi/sbi_hart.h>
?#include <sbi/sbi_illegal_insn.h>
?#include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
?#include <sbi/sbi_misaligned_ldst.h>
?#include <sbi/sbi_pmu.h>
?#include <sbi/sbi_scratch.h>

lib/sbi/sbi_trap.c +0 -0
@@ -195,27 +196,6 @@ int sbi_trap_redirect(struct sbi_trap_regs *regs,
 ????????return 0;
 ?}

?

lib/sbi/sbi_trap.c +0 -11
-static int default_irqfn(struct sbi_trap_regs *regs)
-{
-???????return SBI_ENODEV;
-}
-
-static int (*ext_irqfn)(struct sbi_trap_regs *regs) = default_irqfn;
-
-/**
- * Set external irq handler function
- *
- * This function is called by OpenSBI platform code to set a handler

for
- * external interrupts
- *
- * @param fn function pointer for handling external irqs
- */
-void sbi_trap_set_external_irqfn(int (*fn)(struct sbi_trap_regs *regs))

lib/sbi/sbi_trap.c +0 -5
-{
-???????if (fn)
-???????????????ext_irqfn = fn;
-}
-

?static int sbi_trap_nonaia_irq(struct sbi_trap_regs *regs, ulong mcause)
?{
????????mcause &= ~(1UL << (__riscv_xlen - 1));

lib/sbi/sbi_trap.c +0 -0
@@ -227,7 +207,7 @@ static int sbi_trap_nonaia_irq(struct
 sbi_trap_regs *regs, ulong mcause)
 ????????????????sbi_ipi_process();
 ????????????????break;

????????case IRQ_M_EXT:
-???????????????return ext_irqfn(regs);
+???????????????return sbi_irqchip_process(regs);
????????default:
????????????????return SBI_ENOENT;
????????};

lib/sbi/sbi_trap.c +0 -0
@@ -250,7 +230,7 @@ static int sbi_trap_aia_irq(struct sbi_trap_regs
 *regs, ulong mcause)
 ????????????????????????sbi_ipi_process();
 ????????????????????????break;

????????????????case IRQ_M_EXT:
-???????????????????????rc = ext_irqfn(regs); +???????????????????????rc = sbi_irqchip_process(regs); ????????????????????????if (rc) ????????????????????????????????return rc; ????????????????????????break;

lib/utils/irqchip/imsic.c +0 -0
index 123d01f..b29a1e9 100644
@@ -15,8 +15,8 @@

?#include <sbi/sbi_domain.h>
?#include <sbi/sbi_hartmask.h>
?#include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
?#include <sbi/sbi_error.h>
-#include <sbi/sbi_trap.h>
?#include <sbi_utils/irqchip/imsic.h>
?
?#define IMSIC_MMIO_PAGE_LE?????????????0x00

lib/utils/irqchip/imsic.c +0 -0
@@ -268,7 +268,7 @@ int imsic_cold_irqchip_init(struct imsic_data
 *imsic)
 ????????????????return SBI_EINVAL;

?
????????/* Setup external interrupt function for IMSIC */ -???????sbi_trap_set_external_irqfn(imsic_external_irqfn); +???????sbi_irqchip_set_irqfn(imsic_external_irqfn);
?
????????/* Add IMSIC regions to the root domain */ ????????for (i = 0; i < IMSIC_MAX_REGS && imsic->regs[i].size; i++) {

Signature · 1 line
2.25.1
#2 lore raw

PATCH 1/1 lib: sbi: Add a simple external interrupt handling framework

In reply to Anup Patel
Quoted 285 lines · Anup Patel

Currently, the external interrupt handling is scattered between sbi_init and sbi_trap. This patch moves all external interrupt handling into a simple framework called sbi_irqchip.

---
 include/sbi/sbi_irqchip.h | 44 +++++++++++++++++++++++++++++++
 include/sbi/sbi_trap.h    |  2 --
 lib/sbi/objects.mk        |  1 +
 lib/sbi/sbi_init.c        | 12 ++++-----
 lib/sbi/sbi_irqchip.c     | 54 +++++++++++++++++++++++++++++++++++++++
 lib/sbi/sbi_trap.c        | 26 +++----------------
 lib/utils/irqchip/imsic.c |  4 +--
 7 files changed, 109 insertions(+), 34 deletions(-)
 create mode 100644 include/sbi/sbi_irqchip.h
 create mode 100644 lib/sbi/sbi_irqchip.c
include/sbi/sbi_irqchip.h new file +44 -0
new file mode 100644
index 0000000..6acc6e3
@@ -0,0 +1,44 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022 Ventana Micro Systems Inc.
+ *
+ * Authors:
+ *   Anup Patel <[email protected]>
+ */
+
+#ifndef __SBI_IRQCHIP_H__
+#define __SBI_IRQCHIP_H__
+
+#include <sbi/sbi_types.h>
+
+struct sbi_scratch;
+struct sbi_trap_regs;
+
+/**
+ * Set external interrupt handling function
+ *
+ * This function is called by OpenSBI platform code to set a handler for
+ * external interrupts
+ *
+ * @param fn function pointer for handling external irqs
+ */
+void sbi_irqchip_set_irqfn(int (*fn)(struct sbi_trap_regs *regs));
+
+/**
+ * Process external interrupts
+ *
+ * This function is called by sbi_trap_handler() to handle external
+ * interrupts.
+ *
+ * @param regs pointer for trap registers
+ */
+int sbi_irqchip_process(struct sbi_trap_regs *regs);
+
+/** Initialize interrupt controllers */
+int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot);
+
+/** Exit interrupt controllers */
+void sbi_irqchip_exit(struct sbi_scratch *scratch);
+
+#endif
include/sbi/sbi_trap.h +0 -2
index 4f611fa..d205056 100644
@@ -205,8 +205,6 @@ struct sbi_trap_info {
 int sbi_trap_redirect(struct sbi_trap_regs *regs,
                      struct sbi_trap_info *trap);
 
-void sbi_trap_set_external_irqfn(int (*fn)(struct sbi_trap_regs *regs));
-
 struct sbi_trap_regs *sbi_trap_handler(struct sbi_trap_regs *regs);
 
 void __noreturn sbi_trap_exit(const struct sbi_trap_regs *regs);
lib/sbi/objects.mk +1 -0
index 7096f24..1ed1983 100644
@@ -32,6 +32,7 @@ libsbi-objs-y += sbi_hsm.o
 libsbi-objs-y += sbi_illegal_insn.o
 libsbi-objs-y += sbi_init.o
 libsbi-objs-y += sbi_ipi.o
+libsbi-objs-y += sbi_irqchip.o
 libsbi-objs-y += sbi_misaligned_ldst.o
 libsbi-objs-y += sbi_platform.o
 libsbi-objs-y += sbi_pmu.o
lib/sbi/sbi_init.c +5 -7
index 6876eb2..2b9e5ae 100644
@@ -18,6 +18,7 @@
 #include <sbi/sbi_hartmask.h>
 #include <sbi/sbi_hsm.h>
 #include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
 #include <sbi/sbi_platform.h>
 #include <sbi/sbi_pmu.h>
 #include <sbi/sbi_system.h>
@@ -270,13 +271,12 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
 
        sbi_boot_print_banner(scratch);
 
-       rc = sbi_platform_irqchip_init(plat, TRUE);
+       rc = sbi_irqchip_init(scratch, TRUE);
        if (rc) {
-               sbi_printf("%s: platform irqchip init failed (error %d)\n",
+               sbi_printf("%s: irqchip init failed (error %d)\n",
                           __func__, rc);
                sbi_hart_hang();
        }
-       csr_set(CSR_MIE, MIP_MEIP);
 
        rc = sbi_ipi_init(scratch, TRUE);
        if (rc) {
@@ -374,10 +374,9 @@ static void init_warm_startup(struct sbi_scratch *scratch, u32 hartid)
        if (rc)
                sbi_hart_hang();
 
-       rc = sbi_platform_irqchip_init(plat, FALSE);
+       rc = sbi_irqchip_init(scratch, FALSE);
        if (rc)
                sbi_hart_hang();
-       csr_set(CSR_MIE, MIP_MEIP);
 
        rc = sbi_ipi_init(scratch, FALSE);
        if (rc)
@@ -552,8 +551,7 @@ void __noreturn sbi_exit(struct sbi_scratch *scratch)
 
        sbi_ipi_exit(scratch);
 
-       csr_clear(CSR_MIE, MIP_MEIP);
-       sbi_platform_irqchip_exit(plat);
+       sbi_irqchip_exit(scratch);
 
        sbi_platform_final_exit(plat);
 
lib/sbi/sbi_irqchip.c new file +54 -0
new file mode 100644
index 0000000..24128be
@@ -0,0 +1,54 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022 Ventana Micro Systems Inc.
+ *
+ * Authors:
+ *   Anup Patel <[email protected]>
+ */
+
+#include <sbi/sbi_irqchip.h>
+#include <sbi/sbi_platform.h>
+
+static int default_irqfn(struct sbi_trap_regs *regs)
+{
+       return SBI_ENODEV;
+}
+
+static int (*ext_irqfn)(struct sbi_trap_regs *regs) = default_irqfn;
+
+void sbi_irqchip_set_irqfn(int (*fn)(struct sbi_trap_regs *regs))
+{
+       if (fn)
+               ext_irqfn = fn;
+}
+
+int sbi_irqchip_process(struct sbi_trap_regs *regs)
+{
+       return ext_irqfn(regs);
+}
+
+int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot)
+{
+       int rc;
+       const struct sbi_platform *plat = sbi_platform_ptr(scratch);
+
+       rc = sbi_platform_irqchip_init(plat, cold_boot);
+       if (rc)
+               return rc;
+
+       if (ext_irqfn != default_irqfn)
+               csr_set(CSR_MIE, MIP_MEIP);
+
+       return 0;
+}
+
+void sbi_irqchip_exit(struct sbi_scratch *scratch)
+{
+       const struct sbi_platform *plat = sbi_platform_ptr(scratch);
+
+       if (ext_irqfn != default_irqfn)
+               csr_clear(CSR_MIE, MIP_MEIP);
+
+       sbi_platform_irqchip_exit(plat);
+}
lib/sbi/sbi_trap.c +3 -23
index faab90a..86bab6d 100644
@@ -15,6 +15,7 @@
 #include <sbi/sbi_hart.h>
 #include <sbi/sbi_illegal_insn.h>
 #include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
 #include <sbi/sbi_misaligned_ldst.h>
 #include <sbi/sbi_pmu.h>
 #include <sbi/sbi_scratch.h>
@@ -195,27 +196,6 @@ int sbi_trap_redirect(struct sbi_trap_regs *regs,
        return 0;
 }
 
-static int default_irqfn(struct sbi_trap_regs *regs)
-{
-       return SBI_ENODEV;
-}
-
-static int (*ext_irqfn)(struct sbi_trap_regs *regs) = default_irqfn;
-
-/**
- * Set external irq handler function
- *
- * This function is called by OpenSBI platform code to set a handler for
- * external interrupts
- *
- * @param fn function pointer for handling external irqs
- */
-void sbi_trap_set_external_irqfn(int (*fn)(struct sbi_trap_regs *regs))
-{
-       if (fn)
-               ext_irqfn = fn;
-}
-
 static int sbi_trap_nonaia_irq(struct sbi_trap_regs *regs, ulong mcause)
 {
        mcause &= ~(1UL << (__riscv_xlen - 1));
@@ -227,7 +207,7 @@ static int sbi_trap_nonaia_irq(struct sbi_trap_regs *regs, ulong mcause)
                sbi_ipi_process();
                break;
        case IRQ_M_EXT:
-               return ext_irqfn(regs);
+               return sbi_irqchip_process(regs);
        default:
                return SBI_ENOENT;
        };
@@ -250,7 +230,7 @@ static int sbi_trap_aia_irq(struct sbi_trap_regs *regs, ulong mcause)
                        sbi_ipi_process();
                        break;
                case IRQ_M_EXT:
-                       rc = ext_irqfn(regs);
+                       rc = sbi_irqchip_process(regs);
                        if (rc)
                                return rc;
                        break;
lib/utils/irqchip/imsic.c +2 -3
index 123d01f..b29a1e9 100644
@@ -15,8 +15,8 @@
 #include <sbi/sbi_domain.h>
 #include <sbi/sbi_hartmask.h>
 #include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
 #include <sbi/sbi_error.h>
-#include <sbi/sbi_trap.h>
 #include <sbi_utils/irqchip/imsic.h>
 
 #define IMSIC_MMIO_PAGE_LE             0x00
@@ -268,7 +268,7 @@ int imsic_cold_irqchip_init(struct imsic_data *imsic)
                return SBI_EINVAL;
 
        /* Setup external interrupt function for IMSIC */
-       sbi_trap_set_external_irqfn(imsic_external_irqfn);
+       sbi_irqchip_set_irqfn(imsic_external_irqfn);
 
        /* Add IMSIC regions to the root domain */
        for (i = 0; i < IMSIC_MAX_REGS && imsic->regs[i].size; i++) {
--
Quoted 2 lines

2.25.1

Do we need to document the HiFive Unmatched spurious external interrupt bug that is fixed by this patch?

For the patch:

--
Regards,
Atish

#3 lore raw

PATCH 1/1 lib: sbi: Add a simple external interrupt handling framework

Quoted 284 lines · Atish Patra
Quoted 282 lines · Anup Patel

Currently, the external interrupt handling is scattered between sbi_init and sbi_trap. This patch moves all external interrupt handling into a simple framework called sbi_irqchip.

---
 include/sbi/sbi_irqchip.h | 44 +++++++++++++++++++++++++++++++
 include/sbi/sbi_trap.h    |  2 --
 lib/sbi/objects.mk        |  1 +
 lib/sbi/sbi_init.c        | 12 ++++-----
 lib/sbi/sbi_irqchip.c     | 54 +++++++++++++++++++++++++++++++++++++++
 lib/sbi/sbi_trap.c        | 26 +++----------------
 lib/utils/irqchip/imsic.c |  4 +--
 7 files changed, 109 insertions(+), 34 deletions(-)
 create mode 100644 include/sbi/sbi_irqchip.h
 create mode 100644 lib/sbi/sbi_irqchip.c
include/sbi/sbi_irqchip.h new file +44 -0
new file mode 100644
index 0000000..6acc6e3
@@ -0,0 +1,44 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022 Ventana Micro Systems Inc.
+ *
+ * Authors:
+ *   Anup Patel <[email protected]>
+ */
+
+#ifndef __SBI_IRQCHIP_H__
+#define __SBI_IRQCHIP_H__
+
+#include <sbi/sbi_types.h>
+
+struct sbi_scratch;
+struct sbi_trap_regs;
+
+/**
+ * Set external interrupt handling function
+ *
+ * This function is called by OpenSBI platform code to set a handler for
+ * external interrupts
+ *
+ * @param fn function pointer for handling external irqs
+ */
+void sbi_irqchip_set_irqfn(int (*fn)(struct sbi_trap_regs *regs));
+
+/**
+ * Process external interrupts
+ *
+ * This function is called by sbi_trap_handler() to handle external
+ * interrupts.
+ *
+ * @param regs pointer for trap registers
+ */
+int sbi_irqchip_process(struct sbi_trap_regs *regs);
+
+/** Initialize interrupt controllers */
+int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot);
+
+/** Exit interrupt controllers */
+void sbi_irqchip_exit(struct sbi_scratch *scratch);
+
+#endif
include/sbi/sbi_trap.h +0 -2
index 4f611fa..d205056 100644
@@ -205,8 +205,6 @@ struct sbi_trap_info {
 int sbi_trap_redirect(struct sbi_trap_regs *regs,
                      struct sbi_trap_info *trap);
 
-void sbi_trap_set_external_irqfn(int (*fn)(struct sbi_trap_regs *regs));
-
 struct sbi_trap_regs *sbi_trap_handler(struct sbi_trap_regs *regs);
 
 void __noreturn sbi_trap_exit(const struct sbi_trap_regs *regs);
lib/sbi/objects.mk +1 -0
index 7096f24..1ed1983 100644
@@ -32,6 +32,7 @@ libsbi-objs-y += sbi_hsm.o
 libsbi-objs-y += sbi_illegal_insn.o
 libsbi-objs-y += sbi_init.o
 libsbi-objs-y += sbi_ipi.o
+libsbi-objs-y += sbi_irqchip.o
 libsbi-objs-y += sbi_misaligned_ldst.o
 libsbi-objs-y += sbi_platform.o
 libsbi-objs-y += sbi_pmu.o
lib/sbi/sbi_init.c +5 -7
index 6876eb2..2b9e5ae 100644
@@ -18,6 +18,7 @@
 #include <sbi/sbi_hartmask.h>
 #include <sbi/sbi_hsm.h>
 #include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
 #include <sbi/sbi_platform.h>
 #include <sbi/sbi_pmu.h>
 #include <sbi/sbi_system.h>
@@ -270,13 +271,12 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
 
        sbi_boot_print_banner(scratch);
 
-       rc = sbi_platform_irqchip_init(plat, TRUE);
+       rc = sbi_irqchip_init(scratch, TRUE);
        if (rc) {
-               sbi_printf("%s: platform irqchip init failed (error %d)\n",
+               sbi_printf("%s: irqchip init failed (error %d)\n",
                           __func__, rc);
                sbi_hart_hang();
        }
-       csr_set(CSR_MIE, MIP_MEIP);
 
        rc = sbi_ipi_init(scratch, TRUE);
        if (rc) {
@@ -374,10 +374,9 @@ static void init_warm_startup(struct sbi_scratch *scratch, u32 hartid)
        if (rc)
                sbi_hart_hang();
 
-       rc = sbi_platform_irqchip_init(plat, FALSE);
+       rc = sbi_irqchip_init(scratch, FALSE);
        if (rc)
                sbi_hart_hang();
-       csr_set(CSR_MIE, MIP_MEIP);
 
        rc = sbi_ipi_init(scratch, FALSE);
        if (rc)
@@ -552,8 +551,7 @@ void __noreturn sbi_exit(struct sbi_scratch *scratch)
 
        sbi_ipi_exit(scratch);
 
-       csr_clear(CSR_MIE, MIP_MEIP);
-       sbi_platform_irqchip_exit(plat);
+       sbi_irqchip_exit(scratch);
 
        sbi_platform_final_exit(plat);
 
lib/sbi/sbi_irqchip.c new file +54 -0
new file mode 100644
index 0000000..24128be
@@ -0,0 +1,54 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022 Ventana Micro Systems Inc.
+ *
+ * Authors:
+ *   Anup Patel <[email protected]>
+ */
+
+#include <sbi/sbi_irqchip.h>
+#include <sbi/sbi_platform.h>
+
+static int default_irqfn(struct sbi_trap_regs *regs)
+{
+       return SBI_ENODEV;
+}
+
+static int (*ext_irqfn)(struct sbi_trap_regs *regs) = default_irqfn;
+
+void sbi_irqchip_set_irqfn(int (*fn)(struct sbi_trap_regs *regs))
+{
+       if (fn)
+               ext_irqfn = fn;
+}
+
+int sbi_irqchip_process(struct sbi_trap_regs *regs)
+{
+       return ext_irqfn(regs);
+}
+
+int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot)
+{
+       int rc;
+       const struct sbi_platform *plat = sbi_platform_ptr(scratch);
+
+       rc = sbi_platform_irqchip_init(plat, cold_boot);
+       if (rc)
+               return rc;
+
+       if (ext_irqfn != default_irqfn)
+               csr_set(CSR_MIE, MIP_MEIP);
+
+       return 0;
+}
+
+void sbi_irqchip_exit(struct sbi_scratch *scratch)
+{
+       const struct sbi_platform *plat = sbi_platform_ptr(scratch);
+
+       if (ext_irqfn != default_irqfn)
+               csr_clear(CSR_MIE, MIP_MEIP);
+
+       sbi_platform_irqchip_exit(plat);
+}
lib/sbi/sbi_trap.c +3 -23
index faab90a..86bab6d 100644
@@ -15,6 +15,7 @@
 #include <sbi/sbi_hart.h>
 #include <sbi/sbi_illegal_insn.h>
 #include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
 #include <sbi/sbi_misaligned_ldst.h>
 #include <sbi/sbi_pmu.h>
 #include <sbi/sbi_scratch.h>
@@ -195,27 +196,6 @@ int sbi_trap_redirect(struct sbi_trap_regs *regs,
        return 0;
 }
 
-static int default_irqfn(struct sbi_trap_regs *regs)
-{
-       return SBI_ENODEV;
-}
-
-static int (*ext_irqfn)(struct sbi_trap_regs *regs) = default_irqfn;
-
-/**
- * Set external irq handler function
- *
- * This function is called by OpenSBI platform code to set a handler for
- * external interrupts
- *
- * @param fn function pointer for handling external irqs
- */
-void sbi_trap_set_external_irqfn(int (*fn)(struct sbi_trap_regs *regs))
-{
-       if (fn)
-               ext_irqfn = fn;
-}
-
 static int sbi_trap_nonaia_irq(struct sbi_trap_regs *regs, ulong mcause)
 {
        mcause &= ~(1UL << (__riscv_xlen - 1));
@@ -227,7 +207,7 @@ static int sbi_trap_nonaia_irq(struct sbi_trap_regs *regs, ulong mcause)
                sbi_ipi_process();
                break;
        case IRQ_M_EXT:
-               return ext_irqfn(regs);
+               return sbi_irqchip_process(regs);
        default:
                return SBI_ENOENT;
        };
@@ -250,7 +230,7 @@ static int sbi_trap_aia_irq(struct sbi_trap_regs *regs, ulong mcause)
                        sbi_ipi_process();
                        break;
                case IRQ_M_EXT:
-                       rc = ext_irqfn(regs);
+                       rc = sbi_irqchip_process(regs);
                        if (rc)
                                return rc;
                        break;
lib/utils/irqchip/imsic.c +2 -2
index 123d01f..b29a1e9 100644
@@ -15,8 +15,8 @@
 #include <sbi/sbi_domain.h>
 #include <sbi/sbi_hartmask.h>
 #include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
 #include <sbi/sbi_error.h>
-#include <sbi/sbi_trap.h>
 #include <sbi_utils/irqchip/imsic.h>
 
 #define IMSIC_MMIO_PAGE_LE             0x00
@@ -268,7 +268,7 @@ int imsic_cold_irqchip_init(struct imsic_data *imsic)
                return SBI_EINVAL;
 
        /* Setup external interrupt function for IMSIC */
-       sbi_trap_set_external_irqfn(imsic_external_irqfn);
+       sbi_irqchip_set_irqfn(imsic_external_irqfn);
 
Quoted 8 lines
Quoted 5 lines
lib/utils/irqchip/imsic.c +0 -1
        /* Add IMSIC regions to the root domain */
        for (i = 0; i < IMSIC_MAX_REGS && imsic->regs[i].size; i++) {
--

2.25.1

Do we need to document the HiFive Unmatched spurious external interrupt bug that is fixed by this patch?

The HiFive Unmatched external interrupt issue fixed by this patch is actually a byproduct of this patch. If we had this patch earlier (along with AIA series) then we would have never noticed issues on HiFive Unmatched.

I think the right location to document this issue is:
platform/generic/sifive_fu740.c

Regards,
Anup

Quoted 7 lines

For the patch:

--
Regards,
Atish

Applied
#4 lore raw

PATCH 1/1 lib: sbi: Add a simple external interrupt handling framework

In reply to Anup Patel
Quoted 6 lines · Anup Patel

Currently, the external interrupt handling is scattered between sbi_init and sbi_trap. This patch moves all external interrupt handling into a simple framework called sbi_irqchip.

Applied this patch to the riscv/opensbi repo

Regards,
Anup

Quoted 281 lines
---
 include/sbi/sbi_irqchip.h | 44 +++++++++++++++++++++++++++++++
 include/sbi/sbi_trap.h    |  2 --
 lib/sbi/objects.mk        |  1 +
 lib/sbi/sbi_init.c        | 12 ++++-----
 lib/sbi/sbi_irqchip.c     | 54 +++++++++++++++++++++++++++++++++++++++
 lib/sbi/sbi_trap.c        | 26 +++----------------
 lib/utils/irqchip/imsic.c |  4 +--
 7 files changed, 109 insertions(+), 34 deletions(-)
 create mode 100644 include/sbi/sbi_irqchip.h
 create mode 100644 lib/sbi/sbi_irqchip.c
include/sbi/sbi_irqchip.h new file +44 -0
new file mode 100644
index 0000000..6acc6e3
@@ -0,0 +1,44 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022 Ventana Micro Systems Inc.
+ *
+ * Authors:
+ *   Anup Patel <[email protected]>
+ */
+
+#ifndef __SBI_IRQCHIP_H__
+#define __SBI_IRQCHIP_H__
+
+#include <sbi/sbi_types.h>
+
+struct sbi_scratch;
+struct sbi_trap_regs;
+
+/**
+ * Set external interrupt handling function
+ *
+ * This function is called by OpenSBI platform code to set a handler for
+ * external interrupts
+ *
+ * @param fn function pointer for handling external irqs
+ */
+void sbi_irqchip_set_irqfn(int (*fn)(struct sbi_trap_regs *regs));
+
+/**
+ * Process external interrupts
+ *
+ * This function is called by sbi_trap_handler() to handle external
+ * interrupts.
+ *
+ * @param regs pointer for trap registers
+ */
+int sbi_irqchip_process(struct sbi_trap_regs *regs);
+
+/** Initialize interrupt controllers */
+int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot);
+
+/** Exit interrupt controllers */
+void sbi_irqchip_exit(struct sbi_scratch *scratch);
+
+#endif
include/sbi/sbi_trap.h +0 -2
index 4f611fa..d205056 100644
@@ -205,8 +205,6 @@ struct sbi_trap_info {
 int sbi_trap_redirect(struct sbi_trap_regs *regs,
                      struct sbi_trap_info *trap);
 
-void sbi_trap_set_external_irqfn(int (*fn)(struct sbi_trap_regs *regs));
-
 struct sbi_trap_regs *sbi_trap_handler(struct sbi_trap_regs *regs);
 
 void __noreturn sbi_trap_exit(const struct sbi_trap_regs *regs);
lib/sbi/objects.mk +1 -0
index 7096f24..1ed1983 100644
@@ -32,6 +32,7 @@ libsbi-objs-y += sbi_hsm.o
 libsbi-objs-y += sbi_illegal_insn.o
 libsbi-objs-y += sbi_init.o
 libsbi-objs-y += sbi_ipi.o
+libsbi-objs-y += sbi_irqchip.o
 libsbi-objs-y += sbi_misaligned_ldst.o
 libsbi-objs-y += sbi_platform.o
 libsbi-objs-y += sbi_pmu.o
lib/sbi/sbi_init.c +5 -7
index 6876eb2..2b9e5ae 100644
@@ -18,6 +18,7 @@
 #include <sbi/sbi_hartmask.h>
 #include <sbi/sbi_hsm.h>
 #include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
 #include <sbi/sbi_platform.h>
 #include <sbi/sbi_pmu.h>
 #include <sbi/sbi_system.h>
@@ -270,13 +271,12 @@ static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
 
        sbi_boot_print_banner(scratch);
 
-       rc = sbi_platform_irqchip_init(plat, TRUE);
+       rc = sbi_irqchip_init(scratch, TRUE);
        if (rc) {
-               sbi_printf("%s: platform irqchip init failed (error %d)\n",
+               sbi_printf("%s: irqchip init failed (error %d)\n",
                           __func__, rc);
                sbi_hart_hang();
        }
-       csr_set(CSR_MIE, MIP_MEIP);
 
        rc = sbi_ipi_init(scratch, TRUE);
        if (rc) {
@@ -374,10 +374,9 @@ static void init_warm_startup(struct sbi_scratch *scratch, u32 hartid)
        if (rc)
                sbi_hart_hang();
 
-       rc = sbi_platform_irqchip_init(plat, FALSE);
+       rc = sbi_irqchip_init(scratch, FALSE);
        if (rc)
                sbi_hart_hang();
-       csr_set(CSR_MIE, MIP_MEIP);
 
        rc = sbi_ipi_init(scratch, FALSE);
        if (rc)
@@ -552,8 +551,7 @@ void __noreturn sbi_exit(struct sbi_scratch *scratch)
 
        sbi_ipi_exit(scratch);
 
-       csr_clear(CSR_MIE, MIP_MEIP);
-       sbi_platform_irqchip_exit(plat);
+       sbi_irqchip_exit(scratch);
 
        sbi_platform_final_exit(plat);
 
lib/sbi/sbi_irqchip.c new file +54 -0
new file mode 100644
index 0000000..24128be
@@ -0,0 +1,54 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2022 Ventana Micro Systems Inc.
+ *
+ * Authors:
+ *   Anup Patel <[email protected]>
+ */
+
+#include <sbi/sbi_irqchip.h>
+#include <sbi/sbi_platform.h>
+
+static int default_irqfn(struct sbi_trap_regs *regs)
+{
+       return SBI_ENODEV;
+}
+
+static int (*ext_irqfn)(struct sbi_trap_regs *regs) = default_irqfn;
+
+void sbi_irqchip_set_irqfn(int (*fn)(struct sbi_trap_regs *regs))
+{
+       if (fn)
+               ext_irqfn = fn;
+}
+
+int sbi_irqchip_process(struct sbi_trap_regs *regs)
+{
+       return ext_irqfn(regs);
+}
+
+int sbi_irqchip_init(struct sbi_scratch *scratch, bool cold_boot)
+{
+       int rc;
+       const struct sbi_platform *plat = sbi_platform_ptr(scratch);
+
+       rc = sbi_platform_irqchip_init(plat, cold_boot);
+       if (rc)
+               return rc;
+
+       if (ext_irqfn != default_irqfn)
+               csr_set(CSR_MIE, MIP_MEIP);
+
+       return 0;
+}
+
+void sbi_irqchip_exit(struct sbi_scratch *scratch)
+{
+       const struct sbi_platform *plat = sbi_platform_ptr(scratch);
+
+       if (ext_irqfn != default_irqfn)
+               csr_clear(CSR_MIE, MIP_MEIP);
+
+       sbi_platform_irqchip_exit(plat);
+}
lib/sbi/sbi_trap.c +3 -23
index faab90a..86bab6d 100644
@@ -15,6 +15,7 @@
 #include <sbi/sbi_hart.h>
 #include <sbi/sbi_illegal_insn.h>
 #include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
 #include <sbi/sbi_misaligned_ldst.h>
 #include <sbi/sbi_pmu.h>
 #include <sbi/sbi_scratch.h>
@@ -195,27 +196,6 @@ int sbi_trap_redirect(struct sbi_trap_regs *regs,
        return 0;
 }
 
-static int default_irqfn(struct sbi_trap_regs *regs)
-{
-       return SBI_ENODEV;
-}
-
-static int (*ext_irqfn)(struct sbi_trap_regs *regs) = default_irqfn;
-
-/**
- * Set external irq handler function
- *
- * This function is called by OpenSBI platform code to set a handler for
- * external interrupts
- *
- * @param fn function pointer for handling external irqs
- */
-void sbi_trap_set_external_irqfn(int (*fn)(struct sbi_trap_regs *regs))
-{
-       if (fn)
-               ext_irqfn = fn;
-}
-
 static int sbi_trap_nonaia_irq(struct sbi_trap_regs *regs, ulong mcause)
 {
        mcause &= ~(1UL << (__riscv_xlen - 1));
@@ -227,7 +207,7 @@ static int sbi_trap_nonaia_irq(struct sbi_trap_regs *regs, ulong mcause)
                sbi_ipi_process();
                break;
        case IRQ_M_EXT:
-               return ext_irqfn(regs);
+               return sbi_irqchip_process(regs);
        default:
                return SBI_ENOENT;
        };
@@ -250,7 +230,7 @@ static int sbi_trap_aia_irq(struct sbi_trap_regs *regs, ulong mcause)
                        sbi_ipi_process();
                        break;
                case IRQ_M_EXT:
-                       rc = ext_irqfn(regs);
+                       rc = sbi_irqchip_process(regs);
                        if (rc)
                                return rc;
                        break;
lib/utils/irqchip/imsic.c +2 -3
index 123d01f..b29a1e9 100644
@@ -15,8 +15,8 @@
 #include <sbi/sbi_domain.h>
 #include <sbi/sbi_hartmask.h>
 #include <sbi/sbi_ipi.h>
+#include <sbi/sbi_irqchip.h>
 #include <sbi/sbi_error.h>
-#include <sbi/sbi_trap.h>
 #include <sbi_utils/irqchip/imsic.h>
 
 #define IMSIC_MMIO_PAGE_LE             0x00
@@ -268,7 +268,7 @@ int imsic_cold_irqchip_init(struct imsic_data *imsic)
                return SBI_EINVAL;
 
        /* Setup external interrupt function for IMSIC */
-       sbi_trap_set_external_irqfn(imsic_external_irqfn);
+       sbi_irqchip_set_irqfn(imsic_external_irqfn);
 
        /* Add IMSIC regions to the root domain */
        for (i = 0; i < IMSIC_MAX_REGS && imsic->regs[i].size; i++) {
--

2.25.1