MIPS: Fix bnezc/jialc return address calculation
authorPaul Burton <paul.burton@imgtec.com>
Fri, 2 Jun 2017 18:35:01 +0000 (11:35 -0700)
committerRaspbian kernel package updater <root@raspbian.org>
Sun, 23 Jul 2017 03:01:32 +0000 (03:01 +0000)
commitc7484e2f206f22cce58c2e311a350f720c122efd
tree06c5f047f43495135d41b1c4e3bf02fc8ac4526d
parent9cf80c3be3e3e9692f7641e4cf65f3563fbbc273
MIPS: Fix bnezc/jialc return address calculation

commit 1a73d9310e093fc3adffba4d0a67b9fab2ee3f63 upstream.

The code handling the pop76 opcode (ie. bnezc & jialc instructions) in
__compute_return_epc_for_insn() needs to set the value of $31 in the
jialc case, which is encoded with rs = 0. However its check to
differentiate bnezc (rs != 0) from jialc (rs = 0) was unfortunately
backwards, meaning that if we emulate a bnezc instruction we clobber $31
& if we emulate a jialc instruction it actually behaves like a jic
instruction.

Fix this by inverting the check of rs to match the way the instructions
are actually encoded.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Fixes: 28d6f93d201d ("MIPS: Emulate the new MIPS R6 BNEZC and JIALC instructions")
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/16178/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/mips/kernel/branch.c