riscv: hibernation: Remove duplicate call of suspend_restore_csrs
authorSong Shuai <songshuaishuai@tinylab.org>
Mon, 22 May 2023 02:50:20 +0000 (10:50 +0800)
committerPalmer Dabbelt <palmer@rivosinc.com>
Mon, 19 Jun 2023 16:27:57 +0000 (09:27 -0700)
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.

Fixes: c0317210012e ("RISC-V: Add arch functions to support hibernation/suspend-to-disk")
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Reviewed-by: JeeHeng Sia <jeeheng.sia@starfivetech.com>
Signed-off-by: Song Shuai <songshuaishuai@tinylab.org>
Link: https://lore.kernel.org/r/20230522025020.285042-1-songshuaishuai@tinylab.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
arch/riscv/kernel/hibernate-asm.S

index 5c76671..d698dd7 100644 (file)
@@ -28,7 +28,6 @@ ENTRY(__hibernate_cpu_resume)
 
        REG_L   a0, hibernate_cpu_context
 
-       suspend_restore_csrs
        suspend_restore_regs
 
        /* Return zero value. */