Skip to contentSkip to conversation

Patch "MIPS: Handle microMIPS jumps in the same way as MIPS32/MIPS64 jumps" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Mar 8, 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: Handle microMIPS jumps in the same way as MIPS32/MIPS64 jumps

to the 4.4-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-handle-micromips-jumps-in-the-same-way-as-mips32-mips64-jumps.patch
and it can be found in the queue-4.4 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 096a0de427ea333f56f0ee00328cff2a2731bcf1 Mon Sep 17 00:00:00 2001

From: Paul Burton <[email protected]>
Date: Mon, 7 Nov 2016 15:07:07 +0000
Subject: MIPS: Handle microMIPS jumps in the same way as MIPS32/MIPS64 jumps

From: Paul Burton <[email protected]>

commit 096a0de427ea333f56f0ee00328cff2a2731bcf1 upstream.

is_jump_ins() checks for plain jump ("j") instructions since commit e7438c4b893e ("MIPS: Fix sibling call handling in get_frame_info") but that commit didn't make the same change to the microMIPS code, leaving it inconsistent with the MIPS32/MIPS64 code. Handle the microMIPS encoding of the jump instruction too such that it behaves consistently.

Fixes e7438c4b893e ("MIPS: Fix sibling call handling in get_frame_info")
Cc Tony Wu <[email protected]>

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

---
 arch/mips/kernel/process.c |    2 ++
 1 file changed, 2 insertions(+)
arch/mips/kernel/process.c +2 -0
@@ -289,6 +289,8 @@ static inline int is_jump_ins(union mips
 		return 0;
 	}
 
+	if (ip->j_format.opcode == mm_j32_op)
+		return 1;
 	if (ip->j_format.opcode == mm_jal32_op)
 		return 1;
 	if (ip->r_format.opcode != mm_pool32a_op ||

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

queue-4.4/mips-calculate-micromips-ra-properly-when-unwinding-the-stack.patch queue-4.4/mips-fix-get_frame_info-handling-of-micromips-function-size.patch queue-4.4/mips-handle-micromips-jumps-in-the-same-way-as-mips32-mips64-jumps.patch queue-4.4/mips-fix-is_jump_ins-handling-of-16b-micromips-instructions.patch queue-4.4/mips-clear-isa-bit-correctly-in-get_frame_info.patch queue-4.4/mips-prevent-unaligned-accesses-during-stack-unwinding.patch