Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5466d7b authored by Markos Chandras's avatar Markos Chandras Committed by Ralf Baechle
Browse files

MIPS: cp1emu: Fix ISA restrictions for cop1x_op instructions 



Commit 08a07904 ("MIPS: math-emu: Remove most ifdefery") removed
the #ifdef ISA conditions and switched to runtime detection. However,
according to the instruction set manual, the cop1x_op instructions are
available in >=MIPS32r2 as well. This fixes a problem on MIPS32r2
with the ntpd package which failed to execute with a SIGILL exit code due
to the fact that a madd.d instruction was not being emulated.

Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Fixes: 08a07904 ("MIPS: math-emu: Remove most ifdefery")
Cc: <stable@vger.kernel.org> # v3.16+
Cc: linux-mips@linux-mips.org
Reviewed-by: default avatarPaul Burton <paul.burton@imgtec.com>
Reviewed-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Patchwork: https://patchwork.linux-mips.org/patch/8173/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent f114040e

arch/mips/math-emu/cp1emu.c

+2 −2
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, 
					goto emul;



				case cop1x_op:

					if (cpu_has_mips_4_5 || cpu_has_mips64)

					if (cpu_has_mips_4_5 || cpu_has_mips64 || cpu_has_mips32r2)

						/* its one of ours */

						goto emul;
@@ -1068,7 +1068,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx, 
		break;



	case cop1x_op:

		if (!cpu_has_mips_4_5 && !cpu_has_mips64)

		if (!cpu_has_mips_4_5 && !cpu_has_mips64 && !cpu_has_mips32r2)

			return SIGILL;



		sig = fpux_emu(xcp, ctx, ir, fault_addr);