summaryrefslogtreecommitdiffstats
path: root/arch/x86/power
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2022-11-02 08:47:09 +0100
committerBorislav Petkov <bp@suse.de>2022-11-10 13:12:45 +0100
commit0b9a6a8bedbfb38e7c6be4d119a267e6277307cc (patch)
treed483fd6ca7b724ff032ceb817bf10531fc2622b0 /arch/x86/power
parent955d0e0805912641230fb46c380aa625f78ecaca (diff)
downloadlinux-stable-0b9a6a8bedbfb38e7c6be4d119a267e6277307cc.tar.gz
linux-stable-0b9a6a8bedbfb38e7c6be4d119a267e6277307cc.tar.bz2
linux-stable-0b9a6a8bedbfb38e7c6be4d119a267e6277307cc.zip
x86/mtrr: Add a stop_machine() handler calling only cache_cpu_init()
Instead of having a stop_machine() handler for either a specific MTRR register or all state at once, add a handler just for calling cache_cpu_init() if appropriate. Add functions for calling stop_machine() with this handler as well. Add a generic replacement for mtrr_bp_restore() and a wrapper for mtrr_bp_init(). Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lore.kernel.org/r/20221102074713.21493-13-jgross@suse.com Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/power')
-rw-r--r--arch/x86/power/cpu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index bb176c72891c..754221c9a1c3 100644
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -23,6 +23,7 @@
#include <asm/fpu/api.h>
#include <asm/debugreg.h>
#include <asm/cpu.h>
+#include <asm/cacheinfo.h>
#include <asm/mmu_context.h>
#include <asm/cpu_device_id.h>
#include <asm/microcode.h>
@@ -261,7 +262,7 @@ static void notrace __restore_processor_state(struct saved_context *ctxt)
do_fpu_end();
tsc_verify_tsc_adjust(true);
x86_platform.restore_sched_clock_state();
- mtrr_bp_restore();
+ cache_bp_restore();
perf_restore_debug_store();
c = &cpu_data(smp_processor_id());