diff options
| author | Richard Cochran <rcochran@linutronix.de> | 2016-03-18 22:26:09 +0100 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2016-05-17 03:59:29 +0200 |
| commit | 5af897e433e6ba2963c0edcb12f2f75c53d5fae4 (patch) | |
| tree | eb38114211a88b15585096ee5ee05587ce3f71d7 /drivers/thermal/x86_pkg_temp_thermal.c | |
| parent | thermal: int340x: processor_thermal: support acpi notification (diff) | |
| download | linux-5af897e433e6ba2963c0edcb12f2f75c53d5fae4.tar.xz linux-5af897e433e6ba2963c0edcb12f2f75c53d5fae4.zip | |
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>
Diffstat (limited to 'drivers/thermal/x86_pkg_temp_thermal.c')
| -rw-r--r-- | drivers/thermal/x86_pkg_temp_thermal.c | 2 |
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 7fc919f7da4d..97f0a2bd93ed 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); |