RE: [PATCH] riscv: hibernation: Replace jalr with jr before suspend_restore_regs
From: JeeHeng Sia
Date: Fri May 19 2023 - 06:51:12 EST
looks good to me.
Thanks
Regards
Jee Heng
> -----Original Message-----
> From: Song Shuai <suagrfillet@xxxxxxxxx>
> Sent: Friday, May 19, 2023 2:09 PM
> To: paul.walmsley@xxxxxxxxxx; palmer@xxxxxxxxxxx; aou@xxxxxxxxxxxxxxxxx; JeeHeng Sia <jeeheng.sia@xxxxxxxxxxxxxxxx>; Mason
> Huo <mason.huo@xxxxxxxxxxxxxxxx>; conor.dooley@xxxxxxxxxxxxx
> Cc: linux-riscv@xxxxxxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; Song Shuai <suagrfillet@xxxxxxxxx>
> Subject: [PATCH] riscv: hibernation: Replace jalr with jr before suspend_restore_regs
>
> No need to link the x1/ra reg via jalr before suspend_restore_regs
> So it's better to replace jalr with jr.
>
> Signed-off-by: Song Shuai <suagrfillet@xxxxxxxxx>
> ---
> arch/riscv/kernel/hibernate-asm.S | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/kernel/hibernate-asm.S b/arch/riscv/kernel/hibernate-asm.S
> index effaf5ca5da0..5c76671c7e15 100644
> --- a/arch/riscv/kernel/hibernate-asm.S
> +++ b/arch/riscv/kernel/hibernate-asm.S
> @@ -50,7 +50,7 @@ ENTRY(hibernate_restore_image)
> REG_L s4, restore_pblist
> REG_L a1, relocated_restore_code
>
> - jalr a1
> + jr a1
> END(hibernate_restore_image)
>
> /*
> @@ -73,5 +73,5 @@ ENTRY(hibernate_core_restore_code)
> REG_L s4, HIBERN_PBE_NEXT(s4)
> bnez s4, .Lcopy
>
> - jalr s2
> + jr s2
I am content with these changes, as they do not involve a return after the jump
> END(hibernate_core_restore_code)
> --
> 2.20.1