[PATCH 4.9 21/31] MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch

From	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Newsgroups	linux.kernel
Subject	[PATCH 4.9 21/31] MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch
Date	2017-04-16 10:20 +0200
Message-ID	<twNzz-1my-5@gated-at.bofh.it> (permalink)
References	<twNpT-1je-13@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

4.9-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Matt Redfearn <matt.redfearn@imgtec.com>

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")
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>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/mips/kernel/genex.S |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -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

Thread

[PATCH 4.9 00/31] 4.9.23-stable review Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:10 +0200
  [PATCH 4.9 10/31] orangefs: fix buffer size mis-match between kernel space and user space. Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:10 +0200
  [PATCH 4.9 19/31] MIPS: Switch to the irq_stack in interrupts Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:10 +0200
  [PATCH 4.9 06/31] drm/i915: Stop using RP_DOWN_EI on Baytrail Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:10 +0200
  [PATCH 4.9 17/31] MIPS: Stack unwinding while on IRQ stack Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:10 +0200
  [PATCH 4.9 13/31] rt2x00usb: do not anchor rx and tx urbs Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:10 +0200
  [PATCH 4.9 29/31] net/mlx4_core: Fix racy CQ (Completion Queue) free Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:20 +0200
  [PATCH 4.9 21/31] MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:20 +0200
  [PATCH 4.9 28/31] net/mlx4_en: Fix bad WQE issue Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:20 +0200
  [PATCH 4.9 25/31] net/packet: fix overflow in check for priv area size Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:20 +0200
  [PATCH 4.9 20/31] MIPS: Select HAVE_IRQ_EXIT_ON_IRQ_STACK Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:20 +0200
  [PATCH 4.9 07/31] drm/i915: Avoid rcu_barrier() from reclaim paths (shrinker) Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:20 +0200
  [PATCH 4.9 18/31] MIPS: Only change $28 to thread_info if coming from user mode Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:20 +0200
  [PATCH 4.9 08/31] orangefs: fix memory leak of string new on exit path Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:20 +0200
  [PATCH 4.9 12/31] rt2x00usb: fix anchor initialization Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:20 +0200
  [PATCH 4.9 16/31] MIPS: Introduce irq_stack Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:20 +0200
  [PATCH 4.9 05/31] drm/i915: Drop support for I915_EXEC_CONSTANTS_* execbuf parameters. Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:20 +0200
  [PATCH 4.9 09/31] orangefs: Dan Carpenter influenced cleanups... Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:20 +0200
  [PATCH 4.9 26/31] blk-mq: Avoid memory reclaim when remapping queues Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 10:20 +0200
  [PATCH 4.9 24/31] [PATCH] Revert "drm/i915/execlists: Reset RING registers upon resume" Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-16 13:10 +0200
  Re: [PATCH 4.9 00/31] 4.9.23-stable review Guenter Roeck <linux@roeck-us.net> - 2017-04-16 23:30 +0200
  Re: [PATCH 4.9 00/31] 4.9.23-stable review Shuah Khan <shuahkh@osg.samsung.com> - 2017-04-17 20:30 +0200

csiph-web