| Message ID | 20230221023523.1498500-2-jeeheng.sia@starfivetech.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | RISC-V Hibernation Support | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/cover_letter | success | Series has a cover letter |
| conchuod/tree_selection | success | Guessed tree name to be for-next |
| conchuod/fixes_present | success | Fixes tag not required for -next series |
| conchuod/maintainers_pattern | success | MAINTAINERS pattern errors before the patch: 13 and now 13 |
| 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: 0 this patch: 0 |
| conchuod/module_param | success | Was 0 now: 0 |
| conchuod/build_rv64_gcc_allmodconfig | success | Errors and warnings before: 0 this patch: 0 |
| conchuod/alphanumeric_selects | success | Out of order selects before the patch: 729 and now 729 |
| conchuod/build_rv32_defconfig | success | Build OK |
| conchuod/dtb_warn_rv64 | success | Errors and warnings before: 2 this patch: 2 |
| conchuod/header_inline | success | No static functions without inline keyword in header files |
| conchuod/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 23 lines checked |
| conchuod/source_inline | success | Was 0 now: 0 |
| 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 |
On Tue, Feb 21, 2023 at 10:35:20AM +0800, Sia Jee Heng wrote: > Currently suspend_save_csrs() and suspend_restore_csrs() functions are > statically defined in the suspend.c. Change the function's attribute > to public so that the functions can be used by hibernation as well. > > Signed-off-by: Sia Jee Heng <jeeheng.sia@starfivetech.com> > Reviewed-by: Ley Foon Tan <leyfoon.tan@starfivetech.com> > Reviewed-by: Mason Huo <mason.huo@starfivetech.com> > Reviewed-by: Conor Dooley <conor.dooley@microchip.com> > --- > arch/riscv/include/asm/suspend.h | 3 +++ > arch/riscv/kernel/suspend.c | 4 ++-- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/arch/riscv/include/asm/suspend.h b/arch/riscv/include/asm/suspend.h > index 8be391c2aecb..75419c5ca272 100644 > --- a/arch/riscv/include/asm/suspend.h > +++ b/arch/riscv/include/asm/suspend.h > @@ -33,4 +33,7 @@ int cpu_suspend(unsigned long arg, > /* Low-level CPU resume entry function */ > int __cpu_resume_enter(unsigned long hartid, unsigned long context); > > +/* Used to save and restore the csr */ s/the csr/CSRs/ > +void suspend_save_csrs(struct suspend_context *context); > +void suspend_restore_csrs(struct suspend_context *context); > #endif > diff --git a/arch/riscv/kernel/suspend.c b/arch/riscv/kernel/suspend.c > index 9ba24fb8cc93..3c89b8ec69c4 100644 > --- a/arch/riscv/kernel/suspend.c > +++ b/arch/riscv/kernel/suspend.c > @@ -8,7 +8,7 @@ > #include <asm/csr.h> > #include <asm/suspend.h> > > -static void suspend_save_csrs(struct suspend_context *context) > +void suspend_save_csrs(struct suspend_context *context) > { > context->scratch = csr_read(CSR_SCRATCH); > context->tvec = csr_read(CSR_TVEC); > @@ -29,7 +29,7 @@ static void suspend_save_csrs(struct suspend_context *context) > #endif > } > > -static void suspend_restore_csrs(struct suspend_context *context) > +void suspend_restore_csrs(struct suspend_context *context) > { > csr_write(CSR_SCRATCH, context->scratch); > csr_write(CSR_TVEC, context->tvec); > -- > 2.34.1 > Otherwise, Reviewed-by: Andrew Jones <ajones@ventanamicro.com> Thanks, drew
> -----Original Message----- > From: Andrew Jones <ajones@ventanamicro.com> > Sent: Thursday, 23 February, 2023 2:40 PM > To: JeeHeng Sia <jeeheng.sia@starfivetech.com> > Cc: paul.walmsley@sifive.com; palmer@dabbelt.com; aou@eecs.berkeley.edu; linux-riscv@lists.infradead.org; linux- > kernel@vger.kernel.org; Leyfoon Tan <leyfoon.tan@starfivetech.com>; Mason Huo <mason.huo@starfivetech.com>; Conor Dooley > <conor.dooley@microchip.com> > Subject: Re: [PATCH v4 1/4] RISC-V: Change suspend_save_csrs and suspend_restore_csrs to public function > > On Tue, Feb 21, 2023 at 10:35:20AM +0800, Sia Jee Heng wrote: > > Currently suspend_save_csrs() and suspend_restore_csrs() functions are > > statically defined in the suspend.c. Change the function's attribute > > to public so that the functions can be used by hibernation as well. > > > > Signed-off-by: Sia Jee Heng <jeeheng.sia@starfivetech.com> > > Reviewed-by: Ley Foon Tan <leyfoon.tan@starfivetech.com> > > Reviewed-by: Mason Huo <mason.huo@starfivetech.com> > > Reviewed-by: Conor Dooley <conor.dooley@microchip.com> > > --- > > arch/riscv/include/asm/suspend.h | 3 +++ > > arch/riscv/kernel/suspend.c | 4 ++-- > > 2 files changed, 5 insertions(+), 2 deletions(-) > > > > diff --git a/arch/riscv/include/asm/suspend.h b/arch/riscv/include/asm/suspend.h > > index 8be391c2aecb..75419c5ca272 100644 > > --- a/arch/riscv/include/asm/suspend.h > > +++ b/arch/riscv/include/asm/suspend.h > > @@ -33,4 +33,7 @@ int cpu_suspend(unsigned long arg, > > /* Low-level CPU resume entry function */ > > int __cpu_resume_enter(unsigned long hartid, unsigned long context); > > > > +/* Used to save and restore the csr */ > > s/the csr/CSRs/ > > > +void suspend_save_csrs(struct suspend_context *context); > > +void suspend_restore_csrs(struct suspend_context *context); > > #endif > > diff --git a/arch/riscv/kernel/suspend.c b/arch/riscv/kernel/suspend.c > > index 9ba24fb8cc93..3c89b8ec69c4 100644 > > --- a/arch/riscv/kernel/suspend.c > > +++ b/arch/riscv/kernel/suspend.c > > @@ -8,7 +8,7 @@ > > #include <asm/csr.h> > > #include <asm/suspend.h> > > > > -static void suspend_save_csrs(struct suspend_context *context) > > +void suspend_save_csrs(struct suspend_context *context) > > { > > context->scratch = csr_read(CSR_SCRATCH); > > context->tvec = csr_read(CSR_TVEC); > > @@ -29,7 +29,7 @@ static void suspend_save_csrs(struct suspend_context *context) > > #endif > > } > > > > -static void suspend_restore_csrs(struct suspend_context *context) > > +void suspend_restore_csrs(struct suspend_context *context) > > { > > csr_write(CSR_SCRATCH, context->scratch); > > csr_write(CSR_TVEC, context->tvec); > > -- > > 2.34.1 > > > > Otherwise, > > Reviewed-by: Andrew Jones <ajones@ventanamicro.com> Noted with thanks > > Thanks, > drew
diff --git a/arch/riscv/include/asm/suspend.h b/arch/riscv/include/asm/suspend.h index 8be391c2aecb..75419c5ca272 100644 --- a/arch/riscv/include/asm/suspend.h +++ b/arch/riscv/include/asm/suspend.h @@ -33,4 +33,7 @@ int cpu_suspend(unsigned long arg, /* Low-level CPU resume entry function */ int __cpu_resume_enter(unsigned long hartid, unsigned long context); +/* Used to save and restore the csr */ +void suspend_save_csrs(struct suspend_context *context); +void suspend_restore_csrs(struct suspend_context *context); #endif diff --git a/arch/riscv/kernel/suspend.c b/arch/riscv/kernel/suspend.c index 9ba24fb8cc93..3c89b8ec69c4 100644 --- a/arch/riscv/kernel/suspend.c +++ b/arch/riscv/kernel/suspend.c @@ -8,7 +8,7 @@ #include <asm/csr.h> #include <asm/suspend.h> -static void suspend_save_csrs(struct suspend_context *context) +void suspend_save_csrs(struct suspend_context *context) { context->scratch = csr_read(CSR_SCRATCH); context->tvec = csr_read(CSR_TVEC); @@ -29,7 +29,7 @@ static void suspend_save_csrs(struct suspend_context *context) #endif } -static void suspend_restore_csrs(struct suspend_context *context) +void suspend_restore_csrs(struct suspend_context *context) { csr_write(CSR_SCRATCH, context->scratch); csr_write(CSR_TVEC, context->tvec);