Skip to content

Commit cea8cd4

Browse files
mpredfearnralfbaechle
authored andcommitted
MIPS: microMIPS: Fix decoding of swsp16 instruction
When the immediate encoded in the instruction is accessed, it is sign extended due to being a signed value being assigned to a signed integer. The ISA specifies that this operation is an unsigned operation. The sign extension leads us to incorrectly decode: 801e9c8e: cbf1 sw ra,68(sp) As having an immediate of 1073741809. Since the instruction format does not specify signed/unsigned, and this is currently the only location to use this instuction format, change it to an unsigned immediate. Fixes: bb9bc46 ("MIPS: Calculate microMIPS ra properly when unwinding the stack") Suggested-by: Paul Burton <paul.burton@imgtec.com> Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com> Reviewed-by: James Hogan <james.hogan@imgtec.com> Cc: Marcin Nowakowski <marcin.nowakowski@imgtec.com> Cc: Miodrag Dinic <miodrag.dinic@imgtec.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: David Daney <david.daney@cavium.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/16957/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
1 parent a0ae2b0 commit cea8cd4

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

arch/mips/include/uapi/asm/inst.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ struct mm16_r3_format { /* Load from global pointer format */
981981
struct mm16_r5_format { /* Load/store from stack pointer format */
982982
__BITFIELD_FIELD(unsigned int opcode : 6,
983983
__BITFIELD_FIELD(unsigned int rt : 5,
984-
__BITFIELD_FIELD(signed int simmediate : 5,
984+
__BITFIELD_FIELD(unsigned int imm : 5,
985985
__BITFIELD_FIELD(unsigned int : 16, /* Ignored */
986986
;))))
987987
};

arch/mips/kernel/process.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ static inline int is_ra_save_ins(union mips_instruction *ip, int *poff)
214214
if (ip->mm16_r5_format.rt != 31)
215215
return 0;
216216

217-
*poff = ip->mm16_r5_format.simmediate;
217+
*poff = ip->mm16_r5_format.imm;
218218
*poff = (*poff << 2) / sizeof(ulong);
219219
return 1;
220220

0 commit comments

Comments
 (0)