From patchwork Tue Mar 24 05:21:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 6077241 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D8DB6BF90F for ; Tue, 24 Mar 2015 05:23:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EB82720268 for ; Tue, 24 Mar 2015 05:23:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43E8220263 for ; Tue, 24 Mar 2015 05:23:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752974AbbCXFXm (ORCPT ); Tue, 24 Mar 2015 01:23:42 -0400 Received: from mga14.intel.com ([192.55.52.115]:64496 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753115AbbCXFXl (ORCPT ); Tue, 24 Mar 2015 01:23:41 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 23 Mar 2015 22:23:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,456,1422950400"; d="scan'208";a="669624429" Received: from aaronlu.sh.intel.com ([10.239.159.58]) by orsmga001.jf.intel.com with ESMTP; 23 Mar 2015 22:23:42 -0700 From: Zhang Rui To: linux-pm@vger.kernel.org Cc: Zhang Rui , Subject: [PATCH 2/3] Thermal: handle thermal zone device properly during system sleep Date: Tue, 24 Mar 2015 13:21:29 +0800 Message-Id: <1427174490-7974-3-git-send-email-rui.zhang@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1427174490-7974-1-git-send-email-rui.zhang@intel.com> References: <1427174490-7974-1-git-send-email-rui.zhang@intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Current thermal code does not handle system sleep well because 1. the cooling device cooling state may be changed during suspend 2. the previous temperature reading becomes invalid after resumed because it is got before system sleep 3. updating thermal zone device during suspending/resuming is wrong because some devices may have already been suspended or may have not been resumed. Thus, the proper way to do this is to cancel all thermal zone device update requirements during suspend/resume, and after all the devices have been resumed, reset and update every registered thermal zone devices. This also fixes a regression introduced by commit 19593a1fb1f6718406afca5b867dab184289d406 Author: Aaron Lu Date: Tue Nov 19 16:59:20 2013 +0800 ACPI / fan: convert to platform driver Convert ACPI fan driver to a platform driver for the purpose of phasing out ACPI bus. Signed-off-by: Aaron Lu Signed-off-by: Zhang Rui Because, with the commit applied, all the fan devices are attached to the acpi_general_pm_domain, and they are turned on by the pm_domain automatically after resume, without the awareness of thermal core. CC: #3.18+ Reference: https://bugzilla.kernel.org/show_bug.cgi?id=78201 Reference: https://bugzilla.kernel.org/show_bug.cgi?id=91411 Tested-by: Manuel Krause Tested-by: szegad Tested-by: prash Tested-by: amish Tested-by: Matthias Signed-off-by: Zhang Rui --- drivers/thermal/thermal_core.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 9d6f71b..9c03561 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -37,6 +37,7 @@ #include #include #include +#include #define CREATE_TRACE_POINTS #include @@ -59,6 +60,9 @@ static LIST_HEAD(thermal_governor_list); static DEFINE_MUTEX(thermal_list_lock); static DEFINE_MUTEX(thermal_governor_lock); +static struct notifier_block thermal_pm_nb; +static bool no_thermal_update; + static struct thermal_governor *def_governor; static struct thermal_governor *__find_governor(const char *name) @@ -491,6 +495,9 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) { int count; + if (no_thermal_update) + return; + if (!tz->ops->get_temp) return; @@ -1823,6 +1830,33 @@ static void thermal_unregister_governors(void) thermal_gov_user_space_unregister(); } +static int thermal_notify(struct notifier_block *nb, + unsigned long mode, void *_unused) +{ + struct thermal_zone_device *tz; + + switch (mode) { + case PM_HIBERNATION_PREPARE: + case PM_RESTORE_PREPARE: + case PM_SUSPEND_PREPARE: + no_thermal_update = true; + break; + case PM_POST_HIBERNATION: + case PM_POST_RESTORE: + case PM_POST_SUSPEND: + no_thermal_update = false; + list_for_each_entry(tz, &thermal_tz_list, node) { + thermal_zone_device_reset(tz); + thermal_zone_device_update(tz); + } + break; + default: + break; + } + return 0; +} + + static int __init thermal_init(void) { int result; @@ -1843,6 +1877,9 @@ static int __init thermal_init(void) if (result) goto exit_netlink; + thermal_pm_nb.notifier_call = thermal_notify; + register_pm_notifier(&thermal_pm_nb); + return 0; exit_netlink: