Skip to contentSkip to conversation

Patch "MIPS: Rename `sigill_r6' to `sigill_r2r6' in `__compute_return_epc_for_insn'" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Jul 25, 2017

Subsystems (2)
Stable branch MIPS
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: Rename sigill_r6' to sigill_r2r6' in `__compute_return_epc_for_insn'

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-rename-sigill_r6-to-sigill_r2r6-in-__compute_return_epc_for_insn.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 1f4edde422961397cf4470b347958c13c6a740bb Mon Sep 17 00:00:00 2001

From: "Maciej W. Rozycki" <[email protected]>
Date: Fri, 16 Jun 2017 00:09:23 +0100
Subject: MIPS: Rename sigill_r6' to sigill_r2r6' in `__compute_return_epc_for_insn'

From: Maciej W. Rozycki <[email protected]>

commit 1f4edde422961397cf4470b347958c13c6a740bb upstream.

Use the more accurate `sigill_r2r6' name for the label used in the case of sending SIGILL in the absence of the instruction emulator for an earlier ISA level instruction that has been removed as from the R6 ISA, so that the `sigill_r6' name is freed for the situation where an R6 instruction is not supposed to be interpreted, because the executing processor does not support the R6 ISA.

Signed-off-by Maciej W. Rozycki <[email protected]>
Cc James Hogan <[email protected]>
Cc [email protected]

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

Signed-off-by Ralf Baechle <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 arch/mips/kernel/branch.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
arch/mips/kernel/branch.c +8 -8
@@ -431,7 +431,7 @@ int __compute_return_epc_for_insn(struct
 			/* Fall through */
 		case jr_op:
 			if (NO_R6EMU && insn.r_format.func == jr_op)
-				goto sigill_r6;
+				goto sigill_r2r6;
 			regs->cp0_epc = regs->regs[insn.r_format.rs];
 			break;
 		}

@@ -446,7 +446,7 @@ int __compute_return_epc_for_insn(struct
 		switch (insn.i_format.rt) {
 		case bltzl_op:
 			if (NO_R6EMU)
-				goto sigill_r6;
+				goto sigill_r2r6;
 		case bltz_op:
 			if ((long)regs->regs[insn.i_format.rs] < 0) {
 				epc = epc + 4 + (insn.i_format.simmediate << 2);

@@ -459,7 +459,7 @@ int __compute_return_epc_for_insn(struct
 
 		case bgezl_op:
 			if (NO_R6EMU)
-				goto sigill_r6;
+				goto sigill_r2r6;
 		case bgez_op:
 			if ((long)regs->regs[insn.i_format.rs] >= 0) {
 				epc = epc + 4 + (insn.i_format.simmediate << 2);

@@ -574,7 +574,7 @@ int __compute_return_epc_for_insn(struct
 	 */
 	case beql_op:
 		if (NO_R6EMU)
-			goto sigill_r6;
+			goto sigill_r2r6;
 	case beq_op:
 		if (regs->regs[insn.i_format.rs] ==
 		    regs->regs[insn.i_format.rt]) {

@@ -588,7 +588,7 @@ int __compute_return_epc_for_insn(struct
 
 	case bnel_op:
 		if (NO_R6EMU)
-			goto sigill_r6;
+			goto sigill_r2r6;
 	case bne_op:
 		if (regs->regs[insn.i_format.rs] !=
 		    regs->regs[insn.i_format.rt]) {

@@ -602,7 +602,7 @@ int __compute_return_epc_for_insn(struct
 
 	case blezl_op: /* not really i_format */
 		if (!insn.i_format.rt && NO_R6EMU)
-			goto sigill_r6;
+			goto sigill_r2r6;
 	case blez_op:
 		/*
 		 * Compact branches for R6 for the

@@ -637,7 +637,7 @@ int __compute_return_epc_for_insn(struct
 
 	case bgtzl_op:
 		if (!insn.i_format.rt && NO_R6EMU)
-			goto sigill_r6;
+			goto sigill_r2r6;
 	case bgtz_op:
 		/*
 		 * Compact branches for R6 for the

@@ -848,7 +848,7 @@ sigill_dsp:
 		current->comm);
 	force_sig(SIGILL, current);
 	return -EFAULT;
-sigill_r6:
+sigill_r2r6:
 	pr_info("%s: R2 branch but r2-to-r6 emulator is not preset - sending SIGILL.\n",
 		current->comm);
 	force_sig(SIGILL, current);

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

queue-4.4/mips-send-sigill-for-bposge32-in-__compute_return_epc_for_insn.patch queue-4.4/mips-actually-decode-jalx-in-__compute_return_epc_for_insn.patch queue-4.4/mips-fix-a-typo-s-preset-present-in-r2-to-r6-emulation-error-message.patch queue-4.4/mips-fix-unaligned-pc-interpretation-in-compute_return_epc.patch queue-4.4/mips-rename-sigill_r6-to-sigill_r2r6-in-__compute_return_epc_for_insn.patch queue-4.4/mips-send-sigill-for-linked-branches-in-__compute_return_epc_for_insn.patch queue-4.4/mips-math-emu-prevent-wrong-isa-mode-instruction-emulation.patch