diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-11-22 17:57:04 +0000 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2016-11-30 10:24:20 +0800 |
| commit | 768bd13c93c043a7793dca6d98ba75572bb9b956 (patch) | |
| tree | 55b32a835508b2e740e7ccd799022241bd96d2c9 | |
| parent | c6068a6edd50569fc34340c3abb30c24e24b8909 (diff) | |
| download | linux-768bd13c93c043a7793dca6d98ba75572bb9b956.tar.bz2 | |
thermal/x86_pkg_temp: Cleanup thermal interrupt handling
Wenn a package is removed nothing restores the thermal interrupt MSR so
the content will be stale when a CPU of that package becomes online again.
Aside of that the work function reenables interrupts before acknowledging
the current one, which is the wrong order to begin with.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
| -rw-r--r-- | drivers/thermal/x86_pkg_temp_thermal.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c index 95f4c1bcdb4c..bbaade89b8ad 100644 --- a/drivers/thermal/x86_pkg_temp_thermal.c +++ b/drivers/thermal/x86_pkg_temp_thermal.c @@ -334,7 +334,6 @@ static void pkg_temp_thermal_threshold_work_fn(struct work_struct *work) pkg_work_scheduled[phy_id] = 0; spin_unlock_irqrestore(&pkg_work_lock, flags); - enable_pkg_thres_interrupt(); rdmsrl(MSR_IA32_PACKAGE_THERM_STATUS, msr_val); if (msr_val & THERM_LOG_THRESHOLD0) { wrmsrl(MSR_IA32_PACKAGE_THERM_STATUS, @@ -346,6 +345,9 @@ static void pkg_temp_thermal_threshold_work_fn(struct work_struct *work) msr_val & ~THERM_LOG_THRESHOLD1); notify = true; } + + enable_pkg_thres_interrupt(); + if (notify) { pr_debug("thermal_zone_device_update\n"); thermal_zone_device_update(phdev->tzone, @@ -505,6 +507,13 @@ static int pkg_temp_thermal_device_remove(unsigned int cpu) list_for_each_entry_safe(phdev, n, &phy_dev_list, list) { if (phdev->phys_proc_id == phys_proc_id) { thermal_zone_device_unregister(phdev->tzone); + /* + * Restore original MSR value for package + * thermal interrupt. + */ + wrmsr_on_cpu(cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT, + phdev->start_pkg_therm_low, + phdev->start_pkg_therm_high); list_del(&phdev->list); kfree(phdev); break; |