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 <[email protected]>
Reviewed-by: JeeHeng Sia <[email protected]>
Signed-off-by: Song Shuai <[email protected]>
---
Changes since V1:
https://lore.kernel.org/linux-riscv/[email protected]/
- 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
On Mon, 22 May 2023 10:50:20 +0800, Song Shuai 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.
>
>
> [...]
Applied, thanks!
[1/1] riscv: hibernation: Remove duplicate call of suspend_restore_csrs
https://git.kernel.org/palmer/c/c6399b893043
Best regards,
--
Palmer Dabbelt <[email protected]>
Hello:
This patch was applied to riscv/linux.git (for-next)
by Palmer Dabbelt <[email protected]>:
On Mon, 22 May 2023 10:50:20 +0800 you 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.
>
> Fixes: c0317210012e ("RISC-V: Add arch functions to support hibernation/suspend-to-disk")
> Reviewed-by: Conor Dooley <[email protected]>
> Reviewed-by: JeeHeng Sia <[email protected]>
> Signed-off-by: Song Shuai <[email protected]>
>
> [...]
Here is the summary with links:
- [V2] riscv: hibernation: Remove duplicate call of suspend_restore_csrs
https://git.kernel.org/riscv/c/c6399b893043
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html