diff options
| author | Vladimir Murzin <vladimir.murzin@arm.com> | 2021-12-01 11:02:59 +0000 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2021-12-06 12:49:16 +0100 |
| commit | 52d24087176055d5994ac98378426421b2d6d653 (patch) | |
| tree | 45f693276ec1446ada9c1743c308f916a8fd81a5 /arch/arm/kernel/entry-v7m.S | |
| parent | 54f481a2308efab49d2b14c3f8263b34fdb1c65e (diff) | |
| download | lwn-52d24087176055d5994ac98378426421b2d6d653.tar.gz lwn-52d24087176055d5994ac98378426421b2d6d653.zip | |
irqchip: nvic: Use GENERIC_IRQ_MULTI_HANDLER
Rather then restructuring the ARMv7M entrly logic per TODO, just move
NVIC to GENERIC_IRQ_MULTI_HANDLER.
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Tested-by: Marc Zyngier <maz@kernel.org>
Tested-by: Vladimir Murzin <vladimir.murzin@arm.com> # ARMv7M
Diffstat (limited to 'arch/arm/kernel/entry-v7m.S')
| -rw-r--r-- | arch/arm/kernel/entry-v7m.S | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/kernel/entry-v7m.S b/arch/arm/kernel/entry-v7m.S index 7bde93c10962..520dd43e7e08 100644 --- a/arch/arm/kernel/entry-v7m.S +++ b/arch/arm/kernel/entry-v7m.S @@ -39,14 +39,10 @@ __irq_entry: @ @ Invoke the IRQ handler @ - mrs r0, ipsr - ldr r1, =V7M_xPSR_EXCEPTIONNO - and r0, r1 - sub r0, #16 - mov r1, sp + mov r0, sp stmdb sp!, {lr} - @ routine called with r0 = irq number, r1 = struct pt_regs * - bl nvic_handle_irq + @ routine called with r0 = struct pt_regs * + bl generic_handle_arch_irq pop {lr} @ |