diff options
| author | Eric Auger <eric.auger@redhat.com> | 2020-04-02 16:52:17 +0200 |
|---|---|---|
| committer | Andrew Jones <drjones@redhat.com> | 2020-04-03 10:03:45 +0200 |
| commit | 25f6632704f3c2f6b92272e491e36b5f15d3d8fc (patch) | |
| tree | 8f55eb5e9c7041b817675c2b14a7a00d4daa118d | |
| parent | f22e527df02ffaba5fdf104fd1028d8ac74f51b1 (diff) | |
| download | kvm-unit-tests-25f6632704f3c2f6b92272e491e36b5f15d3d8fc.tar.gz | |
arm/arm64: gic: Introduce setup_irq() helper
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@redhat.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>
| -rw-r--r-- | arm/gic.c | 19 | ||||
| -rw-r--r-- | lib/arm/asm/processor.h | 2 |
2 files changed, 8 insertions, 13 deletions
@@ -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 1e1132d..e26ef89 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); |