MIPS R6 removed the BGEZL instruction so do not try to emulate it
if the R2-to-R6 emulator is not present.
Signed-off-by: Markos Chandras <markos.chandras@xxxxxxxxxx>
---
arch/mips/kernel/branch.c | 5 +++++
arch/mips/math-emu/cp1emu.c | 2 ++
2 files changed, 7 insertions(+)
diff --git a/arch/mips/kernel/branch.c b/arch/mips/kernel/branch.c
index 502bf2aeb834..b8cc0a2e20a4 100644
--- a/arch/mips/kernel/branch.c
+++ b/arch/mips/kernel/branch.c
@@ -452,6 +452,11 @@ int __compute_return_epc_for_insn(struct pt_regs *regs,
case bgez_op:
case bgezl_op:
+ if (NO_R6EMU && (insn.i_format.rt == bgezl_op)) {
+ /* not emulating the branch likely for R6 */
+ ret = -SIGILL;
+ break;
+ }
if ((long)regs->regs[insn.i_format.rs] >= 0) {
epc = epc + 4 + (insn.i_format.simmediate << 2);
if (insn.i_format.rt == bgezl_op)
diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
index e70513d552f6..4028d536cd1c 100644
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -484,6 +484,8 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
/* Fall through */
case bgez_op:
case bgezl_op:
+ if (NO_R6EMU && (insn.i_format.rt == bgezl_op))
+ break;
if ((long)regs->regs[insn.i_format.rs] >= 0)
*contpc = regs->cp0_epc +
dec_insn.pc_inc +
--
2.2.1
