| Message ID | 20230519102908.253458-1-suagrfillet@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c6399b893043a5bb634de8677362f96684f1c0c8 |
| Headers | show |
| Series | riscv: hibernation: Remove duplicate call of suspend_restore_csrs | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/cover_letter | success | Single patches do not need cover letters |
| conchuod/tree_selection | success | Guessed tree name to be for-next at HEAD ac9a78681b92 |
| conchuod/fixes_present | success | Fixes tag not required for -next series |
| conchuod/maintainers_pattern | success | MAINTAINERS pattern errors before the patch: 6 and now 6 |
| conchuod/verify_signedoff | success | Signed-off-by tag matches author and committer |
| conchuod/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| conchuod/build_rv64_clang_allmodconfig | success | Errors and warnings before: 14 this patch: 14 |
| conchuod/module_param | success | Was 0 now: 0 |
| conchuod/build_rv64_gcc_allmodconfig | success | Errors and warnings before: 28 this patch: 28 |
| conchuod/build_rv32_defconfig | success | Build OK |
| conchuod/dtb_warn_rv64 | success | Errors and warnings before: 3 this patch: 3 |
| conchuod/header_inline | success | No static functions without inline keyword in header files |
| conchuod/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 7 lines checked |
| conchuod/build_rv64_nommu_k210_defconfig | success | Build OK |
| conchuod/verify_fixes | success | No Fixes tag |
| conchuod/build_rv64_nommu_virt_defconfig | success | Build OK |
looks good to me. Thanks Regards Jee Heng > -----Original Message----- > From: Song Shuai <suagrfillet@gmail.com> > Sent: Friday, May 19, 2023 6:29 PM > To: paul.walmsley@sifive.com; palmer@dabbelt.com; aou@eecs.berkeley.edu; suagrfillet@gmail.com; Mason Huo > <mason.huo@starfivetech.com>; Leyfoon Tan <leyfoon.tan@starfivetech.com>; ajones@ventanamicro.com; JeeHeng Sia > <jeeheng.sia@starfivetech.com> > Cc: linux-riscv@lists.infradead.org; linux-kernel@vger.kernel.org; Song Shuai <songshuaishuai@tinylab.org> > Subject: [PATCH] riscv: hibernation: Remove duplicate call of suspend_restore_csrs > > 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. > > Signed-off-by: Song Shuai <suagrfillet@gmail.com> > Signed-off-by: Song Shuai <songshuaishuai@tinylab.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 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 Good catch. This function is invoked twice to restore the CSRs. I am good with removing this function from here. > > /* Return zero value. */ > -- > 2.20.1
Hey, On Fri, May 19, 2023 at 11:14:27AM +0000, JeeHeng Sia 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. > > > > Signed-off-by: Song Shuai <suagrfillet@gmail.com> > > Signed-off-by: Song Shuai <songshuaishuai@tinylab.org> BTW, why the two email addresses? The tinylab one here seems entirely redundant - unless it is your employer, in which case should it be the only SoB address & also in the author field? Also, 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 > Good catch. This function is invoked twice to restore the CSRs. > I am good with removing this function from here. If that's a review, then please either give an R-b or A-b tag :) Thanks, Conor.
On Fri, May 19, 2023 at 12:28:07PM +0100, Conor Dooley wrote: > Hey, > > On Fri, May 19, 2023 at 11:14:27AM +0000, JeeHeng Sia 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. It took me embarrassingly long to wrap my head around the control flow here again. I'm not sure that I agree with you that splitting the calls between asm & c is cleaner, but whatever: Reviewed-by: Conor Dooley <conor.dooley@microchip.com> > > > > > > Signed-off-by: Song Shuai <suagrfillet@gmail.com> > > > Signed-off-by: Song Shuai <songshuaishuai@tinylab.org> > > BTW, why the two email addresses? The tinylab one here seems entirely > redundant - unless it is your employer, in which case should it be the > only SoB address & also in the author field? Deja vu with my questioning your email address, but does your tinylab address actually repeat "shuai"? > Also, 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 > > > Good catch. This function is invoked twice to restore the CSRs. > > I am good with removing this function from here. > > If that's a review, then please either give an R-b or A-b tag :) > > Thanks, > Conor.
> -----Original Message----- > From: Conor Dooley <conor@kernel.org> > Sent: Saturday, May 20, 2023 4:07 AM > To: Conor Dooley <conor.dooley@microchip.com> > Cc: JeeHeng Sia <jeeheng.sia@starfivetech.com>; Song Shuai <suagrfillet@gmail.com>; paul.walmsley@sifive.com; > palmer@dabbelt.com; aou@eecs.berkeley.edu; Mason Huo <mason.huo@starfivetech.com>; Leyfoon Tan > <leyfoon.tan@starfivetech.com>; ajones@ventanamicro.com; linux-riscv@lists.infradead.org; linux-kernel@vger.kernel.org; Song > Shuai <songshuaishuai@tinylab.org> > Subject: Re: [PATCH] riscv: hibernation: Remove duplicate call of suspend_restore_csrs > > On Fri, May 19, 2023 at 12:28:07PM +0100, Conor Dooley wrote: > > Hey, > > > > On Fri, May 19, 2023 at 11:14:27AM +0000, JeeHeng Sia 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. > > It took me embarrassingly long to wrap my head around the control flow > here again. I'm not sure that I agree with you that splitting the calls > between asm & c is cleaner, but whatever: > Reviewed-by: Conor Dooley <conor.dooley@microchip.com> > > > > > > > > > Signed-off-by: Song Shuai <suagrfillet@gmail.com> > > > > Signed-off-by: Song Shuai <songshuaishuai@tinylab.org> > > > > BTW, why the two email addresses? The tinylab one here seems entirely > > redundant - unless it is your employer, in which case should it be the > > only SoB address & also in the author field? > > Deja vu with my questioning your email address, but does your > tinylab address actually repeat "shuai"? > > > Also, 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 > > > > > Good catch. This function is invoked twice to restore the CSRs. > > > I am good with removing this function from here. > > > > If that's a review, then please either give an R-b or A-b tag :) Reviewed-by: JeeHeng Sia <jeeheng.sia@starfivetech.com > > > > > Thanks, > > Conor. >
Conor Dooley <conor@kernel.org> 于2023年5月19日周五 20:07写道： > > On Fri, May 19, 2023 at 12:28:07PM +0100, Conor Dooley wrote: > > Hey, > > > > On Fri, May 19, 2023 at 11:14:27AM +0000, JeeHeng Sia 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. > > It took me embarrassingly long to wrap my head around the control flow > here again. I'm not sure that I agree with you that splitting the calls > between asm & c is cleaner, but whatever: > Reviewed-by: Conor Dooley <conor.dooley@microchip.com> > > > > > > > > > Signed-off-by: Song Shuai <suagrfillet@gmail.com> > > > > Signed-off-by: Song Shuai <songshuaishuai@tinylab.org> > > > > BTW, why the two email addresses? The tinylab one here seems entirely > > redundant - unless it is your employer, in which case should it be the > > only SoB address & also in the author field? > > Deja vu with my questioning your email address, but does your > tinylab address actually repeat "shuai"? > Yes, that's my full name. As you noticed, I'm switching my email from Gmail to Tinylab but did something wrong. Thanks for your correction, I'll re-send this patch with your suggestions applied. > > Also, 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 > > > > > Good catch. This function is invoked twice to restore the CSRs. > > > I am good with removing this function from here. > > > > If that's a review, then please either give an R-b or A-b tag :) > > > > Thanks, > > Conor. > >
Hello: This patch was applied to riscv/linux.git (for-next) by Palmer Dabbelt <palmer@rivosinc.com>: On Fri, 19 May 2023 18:29:08 +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. > > Signed-off-by: Song Shuai <suagrfillet@gmail.com> > Signed-off-by: Song Shuai <songshuaishuai@tinylab.org> > > [...] Here is the summary with links: - riscv: hibernation: Remove duplicate call of suspend_restore_csrs https://git.kernel.org/riscv/c/c6399b893043 You are awesome, thank you!
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. */
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. Signed-off-by: Song Shuai <suagrfillet@gmail.com> Signed-off-by: Song Shuai <songshuaishuai@tinylab.org> --- arch/riscv/kernel/hibernate-asm.S | 1 - 1 file changed, 1 deletion(-)