summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Cochran <rcochran@linutronix.de>2016-03-18 21:26:09 (GMT)
committerZhang Rui <rui.zhang@intel.com>2016-05-17 01:59:29 (GMT)
commit5af897e433e6ba2963c0edcb12f2f75c53d5fae4 (patch)
treeeb38114211a88b15585096ee5ee05587ce3f71d7
parentf1ba9eb85b5e2ad79a3fcd594c6fe4d6956fd163 (diff)
downloadlinux-5af897e433e6ba2963c0edcb12f2f75c53d5fae4.tar.xz
thermal: x86_pkg_temp: Handle the FROZEN hot plug notifier actions.
When performing a suspend operation, the kernel brings all of the non-boot CPUs offline, calling the hot plug notifiers with the flag, CPU_TASKS_FROZEN, set in the action code. Similarly, during resume, the CPUs are brought back online, but again the notifiers have the FROZEN flag set. While some very few drivers really need to treat suspend/resume specially, this driver unintentionally ignores the notifications. This patch changes the driver to cancel its work item when the CPU goes down, even during a suspend operation. As a result, the suspended state is no longer a special case. Cc: Zhang Rui <rui.zhang@intel.com> Cc: Eduardo Valentin <edubezval@gmail.com> Cc: linux-pm@vger.kernel.org Signed-off-by: Richard Cochran <rcochran@linutronix.de> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
-rw-r--r--drivers/thermal/x86_pkg_temp_thermal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
index 7fc919f..97f0a2b 100644
--- a/drivers/thermal/x86_pkg_temp_thermal.c
+++ b/drivers/thermal/x86_pkg_temp_thermal.c
@@ -555,7 +555,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
{
unsigned int cpu = (unsigned long) hcpu;
- switch (action) {
+ switch (action & ~CPU_TASKS_FROZEN) {
case CPU_ONLINE:
case CPU_DOWN_FAILED:
get_core_online(cpu);