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

Song Shuai songshuaishuai at tinylab.org
Sun May 21 19:50:20 PDT 2023


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 at microchip.com>
Reviewed-by: JeeHeng Sia <jeeheng.sia at starfivetech.com>
Signed-off-by: Song Shuai <songshuaishuai at tinylab.org>
---

Changes since V1:
https://lore.kernel.org/linux-riscv/20230519102908.253458-1-suagrfillet@gmail.com/
- fix incorrect email in the Author and SoB field
- add 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
 
 	/* Return zero value. */
-- 
2.20.1




More information about the linux-riscv mailing list