Skip to contentSkip to conversation

Patch "MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message Apr 12, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mips-irq-stack-fix-erroneous-jal-to-plat_irq_dispatch.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From c25f8064c1d5731a2ce5664def890140dcdd3e5c Mon Sep 17 00:00:00 2001

From: Matt Redfearn <[email protected]>
Date: Wed, 25 Jan 2017 17:00:25 +0000
Subject: MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch

From: Matt Redfearn <[email protected]>

commit c25f8064c1d5731a2ce5664def890140dcdd3e5c upstream.

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")
Cc Ralf Baechle <[email protected]>
Cc Paul Burton <[email protected]>

Patchwork: https://patchwork.linux-mips.org/patch/15110/

---
 arch/mips/kernel/genex.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/genex.S +1 -1
@@ -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

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/mips-switch-to-the-irq_stack-in-interrupts.patch queue-4.10/mips-select-have_irq_exit_on_irq_stack.patch queue-4.10/mips-only-change-28-to-thread_info-if-coming-from-user-mode.patch queue-4.10/mips-stack-unwinding-while-on-irq-stack.patch queue-4.10/mips-irq-stack-fix-erroneous-jal-to-plat_irq_dispatch.patch queue-4.10/mips-introduce-irq_stack.patch