MIPS: Emulate the new MIPS R6 BNVC, BNEC and BNEZLAC instructions

MIPS R6 uses the <R6 DADDI opcode for the new BNVC, BNEC and
BNEZLAC instructions.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c
index 80a073ced200..37c752757346 100644
--- a/arch/mips/kernel/branch.c
+++ b/arch/mips/kernel/branch.c
@@ -791,12 +791,16 @@ int __compute_return_epc_for_insn(struct pt_regs *regs,
                 break;
 #endif
         case cbcond0_op:
+        case cbcond1_op:
                 /* Only valid for MIPS R6 */
                 if (!cpu_has_mips_r6) {
                         ret = -SIGILL;
                         break;
                 }
-                /* Compact branches: bovc, beqc, beqzalc */
+                /*
+                 * Compact branches:
+                 * bovc, beqc, beqzalc, bnvc, bnec, bnezlac
+                 */
                 if (insn.i_format.rt && !insn.i_format.rs)
                         regs->regs[31] = epc + 4;
                 regs->cp0_epc += 8;