OSDN Git Service

MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch
authorMatt Redfearn <matt.redfearn@imgtec.com>
Wed, 25 Jan 2017 17:00:25 +0000 (17:00 +0000)
committerJames Hogan <james.hogan@imgtec.com>
Mon, 13 Feb 2017 18:58:39 +0000 (18:58 +0000)
Commit dda45f701c9d ("MIPS: Switch to the irq_stack in interrupts")
changed both the normal and vectored interrupt handlers. Unfortunately
the vectored version, "except_vec_vi_handler", was incorrectly modified
to unconditionally jal to plat_irq_dispatch, rather than doing a jalr to
the vectored handler that has been set up. This is ok for many platforms
which set the vectored handler to plat_irq_dispatch anyway, but will
cause problems with platforms that use other handlers.

Fixes: dda45f701c9d ("MIPS: Switch to the irq_stack in interrupts")
Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/15110/
Signed-off-by: James Hogan <james.hogan@imgtec.com>
arch/mips/kernel/genex.S

index 0a7ba4b..7ec9612 100644 (file)
@@ -329,7 +329,7 @@ NESTED(except_vec_vi_handler, 0, sp)
        PTR_ADD sp, t0, t1
 
 2:
-       jal     plat_irq_dispatch
+       jalr    v0
 
        /* Restore sp */
        move    sp, s1