summaryrefslogtreecommitdiffstats
path: root/arch/x86/power
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-12-13 13:14:17 +0000
committerThomas Gleixner <tglx@linutronix.de>2016-12-15 11:44:29 +0100
commit6a369583178d0b89c2c3919c4456ee22fee0f249 (patch)
treeeaaebee6ac4102b724483d19a1c6f920c5406b67 /arch/x86/power
parent31f8a651fc5784a9e6f482be5ef0dd111a535e88 (diff)
downloadlinux-6a369583178d0b89c2c3919c4456ee22fee0f249.tar.gz
linux-6a369583178d0b89c2c3919c4456ee22fee0f249.tar.bz2
linux-6a369583178d0b89c2c3919c4456ee22fee0f249.zip
x86/tsc: Validate TSC_ADJUST after resume
Some 'feature' BIOSes fiddle with the TSC_ADJUST register during suspend/resume which renders the TSC unusable. Add sanity checks into the resume path and restore the original value if it was adjusted. Reported-and-tested-by: Roland Scheidegger <rscheidegger_lists@hispeed.ch> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Bruce Schlobohm <bruce.schlobohm@intel.com> Cc: Kevin Stanton <kevin.b.stanton@intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Allen Hung <allen_hung@dell.com> Cc: Borislav Petkov <bp@alien8.de> Link: http://lkml.kernel.org/r/20161213131211.317654500@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/power')
-rw-r--r--arch/x86/power/cpu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index 53cace2ec0e2..66ade16c7693 100644
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -252,6 +252,7 @@ static void notrace __restore_processor_state(struct saved_context *ctxt)
fix_processor_context();
do_fpu_end();
+ tsc_verify_tsc_adjust(true);
x86_platform.restore_sched_clock_state();
mtrr_bp_restore();
perf_restore_debug_store();