summaryrefslogtreecommitdiffstats
path: root/arch/riscv/kernel/suspend.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2024-03-13 18:22:15 +0000
committerMark Brown <broonie@kernel.org>2024-03-13 18:22:15 +0000
commite25293d9d92cce24aa4ca21b90064661fe4d3fcf (patch)
tree50f45e19a3e397db28b6681d9bf3975f3c6dee8e /arch/riscv/kernel/suspend.c
parent23fb6bc2696119391ec3a92ccaffe50e567c515e (diff)
parente8f897f4afef0031fe618a8e94127a0934896aba (diff)
downloadlinux-stable-e25293d9d92cce24aa4ca21b90064661fe4d3fcf.tar.gz
linux-stable-e25293d9d92cce24aa4ca21b90064661fe4d3fcf.tar.bz2
linux-stable-e25293d9d92cce24aa4ca21b90064661fe4d3fcf.zip
ASoC: Merge up release
In order to apply additional fixes that depend on the fixes merged for v6.8 merge up the final release.
Diffstat (limited to 'arch/riscv/kernel/suspend.c')
-rw-r--r--arch/riscv/kernel/suspend.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/riscv/kernel/suspend.c b/arch/riscv/kernel/suspend.c
index 239509367e42..299795341e8a 100644
--- a/arch/riscv/kernel/suspend.c
+++ b/arch/riscv/kernel/suspend.c
@@ -15,6 +15,8 @@
void suspend_save_csrs(struct suspend_context *context)
{
context->scratch = csr_read(CSR_SCRATCH);
+ if (riscv_cpu_has_extension_unlikely(smp_processor_id(), RISCV_ISA_EXT_XLINUXENVCFG))
+ context->envcfg = csr_read(CSR_ENVCFG);
context->tvec = csr_read(CSR_TVEC);
context->ie = csr_read(CSR_IE);
@@ -36,6 +38,8 @@ void suspend_save_csrs(struct suspend_context *context)
void suspend_restore_csrs(struct suspend_context *context)
{
csr_write(CSR_SCRATCH, context->scratch);
+ if (riscv_cpu_has_extension_unlikely(smp_processor_id(), RISCV_ISA_EXT_XLINUXENVCFG))
+ csr_write(CSR_ENVCFG, context->envcfg);
csr_write(CSR_TVEC, context->tvec);
csr_write(CSR_IE, context->ie);