From: Song Shuai songshuaishuai@tinylab.org
[ Upstream commit c6399b893043a5bb634de8677362f96684f1c0c8 ]
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 Signed-off-by: Sasha Levin sashal@kernel.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 effaf5ca5da0e..f3e62e766cb29 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
/* Return zero value. */