[PATCH] riscv: hibernation: Remove duplicate call of suspend_restore_csrs

Conor Dooley conor.dooley at microchip.com
Fri May 19 04:28:07 PDT 2023


Hey,

On Fri, May 19, 2023 at 11:14:27AM +0000, JeeHeng Sia wrote:

> > The suspend_restore_csrs is called in both __hibernate_cpu_resume
> > and the `else` of subsequent swsusp_arch_suspend.
> > 
> > Removing the first call makes both suspend_{save,restore}_csrs
> > left in swsusp_arch_suspend for clean code.
> > 
> > Signed-off-by: Song Shuai <suagrfillet at gmail.com>
> > Signed-off-by: Song Shuai <songshuaishuai at tinylab.org>

BTW, why the two email addresses? The tinylab one here seems entirely
redundant - unless it is your employer, in which case should it be the
only SoB address & also in the author field?

Also, Fixes tag?

> > ---
> >  arch/riscv/kernel/hibernate-asm.S | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/arch/riscv/kernel/hibernate-asm.S b/arch/riscv/kernel/hibernate-asm.S
> > index 5c76671c7e15..d698dd7df637 100644
> > --- a/arch/riscv/kernel/hibernate-asm.S
> > +++ b/arch/riscv/kernel/hibernate-asm.S
> > @@ -28,7 +28,6 @@ ENTRY(__hibernate_cpu_resume)
> > 
> >  	REG_L	a0, hibernate_cpu_context
> > 
> > -	suspend_restore_csrs
> >  	suspend_restore_regs

> Good catch. This function is invoked twice to restore the CSRs.
> I am good with removing this function from here.

If that's a review, then please either give an R-b or A-b tag :)

Thanks,
Conor.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-riscv/attachments/20230519/ded0aff1/attachment.sig>


More information about the linux-riscv mailing list