diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-02 01:17:36 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-02 01:17:36 +0200 |
| commit | 8fbd4ade93dc67f035914cd4030f1c58797d9e59 (patch) | |
| tree | 13f5333b55aebc7a1913ca7568b69b02e11a5a6b /arch | |
| parent | Linux 4.6-rc1 (diff) | |
| parent | ACPI / processor: Request native thermal interrupt handling via _OSC (diff) | |
| download | linux-8fbd4ade93dc67f035914cd4030f1c58797d9e59.tar.xz linux-8fbd4ade93dc67f035914cd4030f1c58797d9e59.zip | |
Merge branch 'acpi-processor'
* acpi-processor:
ACPI / processor: Request native thermal interrupt handling via _OSC
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/therm_throt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c index 0b445c2ff735..ac780cad3b86 100644 --- a/arch/x86/kernel/cpu/mcheck/therm_throt.c +++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c @@ -384,6 +384,9 @@ static void intel_thermal_interrupt(void) { __u64 msr_val; + if (static_cpu_has(X86_FEATURE_HWP)) + wrmsrl_safe(MSR_HWP_STATUS, 0); + rdmsrl(MSR_IA32_THERM_STATUS, msr_val); /* Check for violation of core thermal thresholds*/ |