From: Greg Kroah-Hartman Date: Tue, 11 Mar 2025 10:01:00 +0000 (+0100) Subject: drop queue-6.6/riscv-save-restore-envcfg-csr-during-cpu-suspend.patch X-Git-Tag: v5.4.291~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de39703545d6757bcd2e38a7731df8c3066da047;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.6/riscv-save-restore-envcfg-csr-during-cpu-suspend.patch --- diff --git a/queue-6.6/riscv-save-restore-envcfg-csr-during-cpu-suspend.patch b/queue-6.6/riscv-save-restore-envcfg-csr-during-cpu-suspend.patch deleted file mode 100644 index ff36216361..0000000000 --- a/queue-6.6/riscv-save-restore-envcfg-csr-during-cpu-suspend.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 05ab803d1ad8ac505ade77c6bd3f86b1b4ea0dc4 Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Tue, 27 Feb 2024 22:55:35 -0800 -Subject: riscv: Save/restore envcfg CSR during CPU suspend - -From: Samuel Holland - -commit 05ab803d1ad8ac505ade77c6bd3f86b1b4ea0dc4 upstream. - -The value of the [ms]envcfg CSR is lost when entering a nonretentive -idle state, so the CSR must be rewritten when resuming the CPU. - -Cc: # v6.7+ -Fixes: 43c16d51a19b ("RISC-V: Enable cbo.zero in usermode") -Signed-off-by: Samuel Holland -Reviewed-by: Conor Dooley -Reviewed-by: Andrew Jones -Link: https://lore.kernel.org/r/20240228065559.3434837-4-samuel.holland@sifive.com -Signed-off-by: Palmer Dabbelt -Signed-off-by: Greg Kroah-Hartman ---- - arch/riscv/include/asm/suspend.h | 1 + - arch/riscv/kernel/suspend.c | 4 ++++ - 2 files changed, 5 insertions(+) - ---- a/arch/riscv/include/asm/suspend.h -+++ b/arch/riscv/include/asm/suspend.h -@@ -14,6 +14,7 @@ struct suspend_context { - struct pt_regs regs; - /* Saved and restored by high-level functions */ - unsigned long scratch; -+ unsigned long envcfg; - unsigned long tvec; - unsigned long ie; - #ifdef CONFIG_MMU ---- a/arch/riscv/kernel/suspend.c -+++ b/arch/riscv/kernel/suspend.c -@@ -11,6 +11,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); - -@@ -32,6 +34,8 @@ void suspend_save_csrs(struct suspend_co - 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); - diff --git a/queue-6.6/series b/queue-6.6/series index 329736ba12..f814644295 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -129,7 +129,6 @@ arm64-hugetlb-fix-huge_ptep_get_and_clear-for-non-present-ptes.patch kbuild-hdrcheck-fix-cross-build-with-clang.patch alsa-hda-realtek-fix-incorrect-is_reachable-usage.patch riscv-fix-enabling-cbo.zero-when-running-in-m-mode.patch -riscv-save-restore-envcfg-csr-during-cpu-suspend.patch revert-kvm-e500-always-restore-irqs.patch revert-kvm-ppc-e500-use-__kvm_faultin_pfn-to-handle-page-faults.patch revert-kvm-ppc-e500-mark-struct-page-pfn-accessed-before-dropping-mmu_lock.patch