This is a note to let you know that I've just added the patch titled
riscv: hibernation: Remove duplicate call of suspend_restore_csrs
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
riscv-hibernation-remove-duplicate-call-of-suspend_r.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 6c9dffd11ba36d3314fc8c63d106ac67df6e3f68
Author: Song Shuai <songshuaishuai@xxxxxxxxxxx>
Date: Mon May 22 10:50:20 2023 +0800
riscv: hibernation: Remove duplicate call of suspend_restore_csrs
[ 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@xxxxxxxxxxxxx>
Reviewed-by: JeeHeng Sia <jeeheng.sia@xxxxxxxxxxxxxxxx>
Signed-off-by: Song Shuai <songshuaishuai@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230522025020.285042-1-songshuaishuai@xxxxxxxxxxx
Signed-off-by: Palmer Dabbelt <palmer@xxxxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
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. */
