From: Eric Auger <eric.auger@xxxxxxxxxx>
ipi_enable() code would be reusable for other interrupts
than IPI. Let's rename it setup_irq() and pass an interrupt
handler pointer.
Signed-off-by: Eric Auger <eric.auger@xxxxxxxxxx>
Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx>
---
arm/gic.c | 19 ++++++-------------
lib/arm/asm/processor.h | 2 ++
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/arm/gic.c b/arm/gic.c
index fcf4c1ff3875..2f904b0ef375 100644
--- a/arm/gic.c
+++ b/arm/gic.c
@@ -215,20 +215,20 @@ static void ipi_test_smp(void)
report_prefix_pop();
}
-static void ipi_enable(void)
+static void setup_irq(irq_handler_fn handler)
{
gic_enable_defaults();
#ifdef __arm__
- install_exception_handler(EXCPTN_IRQ, ipi_handler);
+ install_exception_handler(EXCPTN_IRQ, handler);
#else
- install_irq_handler(EL1H_IRQ, ipi_handler);
+ install_irq_handler(EL1H_IRQ, handler);
#endif
local_irq_enable();
}
static void ipi_send(void)
{
- ipi_enable();
+ setup_irq(ipi_handler);
wait_on_ready();
ipi_test_self();
ipi_test_smp();
@@ -238,7 +238,7 @@ static void ipi_send(void)
static void ipi_recv(void)
{
- ipi_enable();
+ setup_irq(ipi_handler);
cpumask_set_cpu(smp_processor_id(), &ready);
while (1)
wfi();
@@ -295,14 +295,7 @@ static void ipi_clear_active_handler(struct pt_regs *regs __unused)
static void run_active_clear_test(void)
{
report_prefix_push("active");
- gic_enable_defaults();
-#ifdef __arm__
- install_exception_handler(EXCPTN_IRQ, ipi_clear_active_handler);
-#else
- install_irq_handler(EL1H_IRQ, ipi_clear_active_handler);
-#endif
- local_irq_enable();
-
+ setup_irq(ipi_clear_active_handler);
ipi_test_self();
report_prefix_pop();
}
diff --git a/lib/arm/asm/processor.h b/lib/arm/asm/processor.h
index 1e1132dafd2b..e26ef89000a8 100644
--- a/lib/arm/asm/processor.h
+++ b/lib/arm/asm/processor.h
@@ -26,7 +26,9 @@ enum vector {
EXCPTN_MAX,
};
+typedef void (*irq_handler_fn)(struct pt_regs *regs);
typedef void (*exception_fn)(struct pt_regs *);
+
extern void install_exception_handler(enum vector v, exception_fn fn);
extern void show_regs(struct pt_regs *regs);
--
2.25.1
_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
