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

[JeeHeng Sia]

looks good to me.

Thanks
Regards
Jee Heng

> -----Original Message-----
> From: Song Shuai <suagrfillet at gmail.com>
> Sent: Friday, May 19, 2023 6:29 PM
> To: paul.walmsley at sifive.com; palmer at dabbelt.com; aou at eecs.berkeley.edu; suagrfillet at gmail.com; Mason Huo
> <mason.huo at starfivetech.com>; Leyfoon Tan <leyfoon.tan at starfivetech.com>; ajones at ventanamicro.com; JeeHeng Sia
> <jeeheng.sia at starfivetech.com>
> Cc: linux-riscv at lists.infradead.org; linux-kernel at vger.kernel.org; Song Shuai <songshuaishuai at tinylab.org>
> Subject: [PATCH] riscv: hibernation: Remove duplicate call of suspend_restore_csrs
> 
> 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>
> ---
>  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.
> 
>  	/* Return zero value. */
> --
> 2.20.1