https://github.com/torvalds/linux
Revision 1a73d9310e093fc3adffba4d0a67b9fab2ee3f63 authored by Paul Burton on 02 June 2017, 18:35:01 UTC, committed by Ralf Baechle on 15 June 2017, 09:47:42 UTC
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>
1 parent 698b851
History
Tip revision: 1a73d9310e093fc3adffba4d0a67b9fab2ee3f63 authored by Paul Burton on 02 June 2017, 18:35:01 UTC
MIPS: Fix bnezc/jialc return address calculation
Tip revision: 1a73d93
File Mode Size
Atmel
Marvell
OMAP
SA1100
SH-Mobile
SPEAr
Samsung
Samsung-S3C24XX
VFP
keystone
nwfpe
pxa
sti
stm32
sunxi
00-INDEX -rw-r--r-- 1.4 KB
Booting -rw-r--r-- 7.9 KB
CCN.txt -rw-r--r-- 2.4 KB
IXP4xx -rw-r--r-- 6.3 KB
Interrupts -rw-r--r-- 6.6 KB
Netwinder -rw-r--r-- 1.5 KB
Porting -rw-r--r-- 4.4 KB
README -rw-r--r-- 7.6 KB
Setup -rw-r--r-- 3.5 KB
cluster-pm-race-avoidance.txt -rw-r--r-- 16.2 KB
firmware.txt -rw-r--r-- 2.2 KB
kernel_mode_neon.txt -rw-r--r-- 5.6 KB
kernel_user_helpers.txt -rw-r--r-- 6.6 KB
mem_alignment -rw-r--r-- 2.4 KB
memory.txt -rw-r--r-- 3.1 KB
swp_emulation -rw-r--r-- 1.2 KB
tcm.txt -rw-r--r-- 5.0 KB
uefi.txt -rw-r--r-- 2.9 KB
vlocks.txt -rw-r--r-- 6.6 KB

README

back to top