Patch "MIPS: math-emu: Allow m{f,t}hc emulation on MIPS R6" has been added to the 4.2-stable tree

Patch "MIPS: math-emu: Allow m{f,t}hc emulation on MIPS R6" has been added to the 4.2-stable tree

[gregkh]

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

    MIPS: math-emu: Allow m{f,t}hc emulation on MIPS R6

to the 4.2-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-math-emu-allow-m-f-t-hc-emulation-on-mips-r6.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From e8f80cc1a6d80587136b015e989a12827e1fcfe5 Mon Sep 17 00:00:00 2001
From: Markos Chandras <markos.chandras@imgtec.com>
Date: Fri, 17 Jul 2015 10:36:03 +0100
Subject: MIPS: math-emu: Allow m{f,t}hc emulation on MIPS R6

From: Markos Chandras <markos.chandras@imgtec.com>

commit e8f80cc1a6d80587136b015e989a12827e1fcfe5 upstream.

The mfhc/mthc instructions are supported on MIPS R6 so emulate
them if needed.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/10737/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/mips/math-emu/cp1emu.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -1137,7 +1137,7 @@ emul:
 			break;
 
 		case mfhc_op:
-			if (!cpu_has_mips_r2)
+			if (!cpu_has_mips_r2_r6)
 				goto sigill;
 
 			/* copregister rd -> gpr[rt] */
@@ -1148,7 +1148,7 @@ emul:
 			break;
 
 		case mthc_op:
-			if (!cpu_has_mips_r2)
+			if (!cpu_has_mips_r2_r6)
 				goto sigill;
 
 			/* copregister rd <- gpr[rt] */


Patches currently in stable-queue which might be from markos.chandras@imgtec.com are

queue-4.2/mips-math-emu-allow-m-f-t-hc-emulation-on-mips-r6.patch
queue-4.2/mips-cps-use-32b-accesses-to-gcrs.patch
queue-4.2/mips-math-emu-emulate-missing-bc1-eq-ne-z-instructions.patch