2023-05-19 06:24:13

by Song Shuai

[permalink] [raw]
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 <[email protected]>
---
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
END(hibernate_core_restore_code)
--
2.20.1



2023-05-19 11:16:02

by Sia Jee Heng

[permalink] [raw]
Subject: RE: [PATCH] riscv: hibernation: Replace jalr with jr before suspend_restore_regs

looks good to me.

Thanks
Regards
Jee Heng
> -----Original Message-----
> From: Song Shuai <[email protected]>
> Sent: Friday, May 19, 2023 2:09 PM
> To: [email protected]; [email protected]; [email protected]; JeeHeng Sia <[email protected]>; Mason
> Huo <[email protected]>; [email protected]
> Cc: [email protected]; [email protected]; Song Shuai <[email protected]>
> 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 <[email protected]>
> ---
> 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


2023-05-22 01:24:24

by Sia Jee Heng

[permalink] [raw]
Subject: RE: [PATCH] riscv: hibernation: Replace jalr with jr before suspend_restore_regs



> -----Original Message-----
> From: JeeHeng Sia
> Sent: Friday, May 19, 2023 6:45 PM
> To: 'Song Shuai' <[email protected]>; [email protected]; [email protected]; [email protected]; Mason Huo
> <[email protected]>; [email protected]
> Cc: [email protected]; [email protected]
> Subject: RE: [PATCH] riscv: hibernation: Replace jalr with jr before suspend_restore_regs
>
> looks good to me.
>
> Thanks
> Regards
> Jee Heng
> > -----Original Message-----
> > From: Song Shuai <[email protected]>
> > Sent: Friday, May 19, 2023 2:09 PM
> > To: [email protected]; [email protected]; [email protected]; JeeHeng Sia <[email protected]>;
> Mason
> > Huo <[email protected]>; [email protected]
> > Cc: [email protected]; [email protected]; Song Shuai <[email protected]>
> > 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 <[email protected]>
> > ---
> > 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
Reviewed-by: JeeHeng Sia <[email protected] >

Thanks
Regards
Jee Heng
> > END(hibernate_core_restore_code)
> > --
> > 2.20.1


2023-06-20 01:04:55

by Palmer Dabbelt

[permalink] [raw]
Subject: Re: [PATCH] riscv: hibernation: Replace jalr with jr before suspend_restore_regs


On Fri, 19 May 2023 14:08:54 +0800, Song Shuai wrote:
> No need to link the x1/ra reg via jalr before suspend_restore_regs
> So it's better to replace jalr with jr.
>
>

Applied, thanks!

[1/1] riscv: hibernation: Replace jalr with jr before suspend_restore_regs
https://git.kernel.org/palmer/c/650ea2a1dd96

Best regards,
--
Palmer Dabbelt <[email protected]>


Subject: Re: [PATCH] riscv: hibernation: Replace jalr with jr before suspend_restore_regs

Hello:

This patch was applied to riscv/linux.git (for-next)
by Palmer Dabbelt <[email protected]>:

On Fri, 19 May 2023 14:08:54 +0800 you wrote:
> 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 <[email protected]>
> ---
> arch/riscv/kernel/hibernate-asm.S | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Here is the summary with links:
- riscv: hibernation: Replace jalr with jr before suspend_restore_regs
https://git.kernel.org/riscv/c/650ea2a1dd96

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html