Unverified Commit 91612cfb authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Palmer Dabbelt
Browse files

riscv: alternative: proceed one more instruction for auipc/jalr pair 



If we patched auipc + jalr pair, we'd better proceed one more
instruction. Andrew pointed out "There's not a problem now, since
we're only adding a fixup for jal, not jalr, but we should
future-proof this and there's no reason to revisit an already fixed-up
instruction anyway."

Signed-off-by: default avatarJisheng Zhang <jszhang@kernel.org>
Suggested-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Reviewed-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20230115162811.3146-1-jszhang@kernel.org


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent f3af3b00

arch/riscv/kernel/alternative.c

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ void riscv_alternative_fix_offsets(void *alt_ptr, unsigned int len, 


			riscv_alternative_fix_auipc_jalr(alt_ptr + i * sizeof(u32),

							 insn, insn2, patch_offset);

			i++;

		}



		if (riscv_insn_is_jal(insn)) {