diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2017-06-02 11:35:01 -0700 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-06-25 22:02:22 -0400 |
| commit | cedbfb3dc38c128f7541a5e6050862ee038e7583 (patch) | |
| tree | cb4174d751a5f00cb097b1cfab692adbb065f86e /kernel | |
| parent | d490b0caf87fa4d743b6cc2c00a16aa1f84d2c74 (diff) | |
MIPS: Fix bnezc/jialc return address calculation
[ Upstream commit 1a73d9310e093fc3adffba4d0a67b9fab2ee3f63 ]
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: stable <stable@vger.kernel.org> # v4.0+
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: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions