From patchwork Fri Jun 30 05:05:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 9818425 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 150EA603F2 for ; Fri, 30 Jun 2017 05:05:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 067DB28573 for ; Fri, 30 Jun 2017 05:05:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED349285C8; Fri, 30 Jun 2017 05:05:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41B4228573 for ; Fri, 30 Jun 2017 05:05:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751818AbdF3FFM (ORCPT ); Fri, 30 Jun 2017 01:05:12 -0400 Received: from mga09.intel.com ([134.134.136.24]:16202 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751696AbdF3FFL (ORCPT ); Fri, 30 Jun 2017 01:05:11 -0400 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jun 2017 22:05:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,284,1496127600"; d="scan'208";a="103017052" Received: from ccui-mobl3.amr.corp.intel.com ([10.254.191.7]) by orsmga004.jf.intel.com with ESMTP; 29 Jun 2017 22:05:07 -0700 Message-ID: <1498799109.2520.15.camel@intel.com> Subject: Re: [PATCH v2 2/2] thermal: core: Allow to disable polling when disabling thermal zone. From: Zhang Rui To: Enric Balletbo i Serra , rjw@rjwysocki.net, Len Brown , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Guenter Roeck , Sameer Nanda , Eduardo Valentin , Linux PM list Date: Fri, 30 Jun 2017 13:05:09 +0800 In-Reply-To: <20170629165035.23101-2-enric.balletbo@collabora.com> References: <20170629165035.23101-1-enric.balletbo@collabora.com> <20170629165035.23101-2-enric.balletbo@collabora.com> X-Mailer: Evolution 3.18.5.2-0ubuntu3 Mime-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, 2017-06-29 at 18:50 +0200, Enric Balletbo i Serra wrote: > Under each thermal zone there is a optional file called "mode". > Writing > enabled or disabled to this file allows a given thermal zone to be > enabled > or disabled, but in current code, the monitoring queue doesn't stops. > Add > the code to disable polling when disabling thermal zone and enable > polling > when enabling the thermal zone. > > This patch is based on the original Sameer Nanda > > patch that implemented this idea for the ACPI thermal driver. > Before these two patches, only platform thermal driver cares about "mode", thermal core does nothing but invokes platform .set_mode() callback upon sysfs I/F write. But after this patch set, "mode" becomes something that we should take into account in thermal core as well. Thus, IMO, we have a couple of things more to do, like the prototype patch attached, which I have not tested yet. From 8bf51fe65bd386b7e8c3c2ca8b9f7d321c92b22f Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Fri, 30 Jun 2017 11:11:45 +0800 Subject: [RFC PATCH] Thermal: introduce thermal zone device mode control Thermal "mode" sysfs attribute is introduced to enable/disable a thermal zone, and .get_mode()/.set_mode() callback is introduced for platform thermal driver to enable/disable the hardware thermal control logic. And thermal core takes no action upon thermal zone enable/disable. Actually, this is not quite right because thermal core still pokes those disabled thermal zones occasionally, e.g. upon system resume. To fix this, a new flag 'mode' is introduced in struct thermal_zone_device to represent the thermal zone mode, and several decisions have been made based on this flag, including 1. check the thermal zone mode right after it's registered. 2. skip updating thermal zone if the zone is disabled 3. stop the polling timer when the thermal zone is disabled Note: basically, this patch doesn't affect the existing always-enabled thermal zones much, with just one exception - thermal zone .get_mode() must be well prepared to reflect the real thermal zone status upon the thermal zone registration. Signed-off-by: Zhang Rui Tested-by: Enric Balletbo i Serra ---  drivers/thermal/thermal_core.c  | 37 +++++++++++++++++++++++++++++++++++--  drivers/thermal/thermal_sysfs.c | 22 ++++++----------------  include/linux/thermal.h         |  3 +++  3 files changed, 44 insertions(+), 18 deletions(-) --  2.7.4 diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 5a51c74..89b2254 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -306,9 +306,9 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz)  {   mutex_lock(&tz->lock);   - if (tz->passive) + if (tz->enabled == THERMAL_DEVICE_ENABLED && tz->passive)   thermal_zone_device_set_polling(tz, tz->passive_delay); - else if (tz->polling_delay) + else if (tz->enabled == THERMAL_DEVICE_ENABLED && tz->polling_delay)   thermal_zone_device_set_polling(tz, tz->polling_delay);   else   thermal_zone_device_set_polling(tz, 0); @@ -464,11 +464,35 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz)   pos->initialized = false;  }   +int thermal_zone_set_mode(struct thermal_zone_device *tz, +  enum thermal_device_mode mode) +{ + int result; + + if (!tz->ops->set_mode) + return -EPERM; + + result = tz->ops->set_mode(tz, mode); + if (result) + return result; + + if (tz->mode != mode) { + tz->mode = mode; + monitor_thermal_zone(tz); + } + return 0; +} +EXPORT_SYMBOL_GPL(thermal_zone_set_mode); +  void thermal_zone_device_update(struct thermal_zone_device *tz,   enum thermal_notify_event event)  {   int count;   + /* Do nothing if the thermal zone is disabled */ + if (tz->mode == THERMAL_DEVICE_DISABLED) + return; +   if (atomic_read(&in_suspend))   return;   @@ -1287,6 +1311,15 @@ thermal_zone_device_register(const char *type, int trips, int mask,   INIT_DELAYED_WORK(&tz->poll_queue, thermal_zone_device_check);     thermal_zone_device_reset(tz); + + if (tz->ops->get_mode()) { + enum thermal_device_mode mode; + + result = tz->ops->get_mode(tz, &mode); + tz->mode = result ? THERMAL_DEVICE_ENABLED : mode; + } else + tz->mode = THERMAL_DEVICE_ENABLED; +   /* Update the new thermal zone and mark it as already updated. */   if (atomic_cmpxchg(&tz->need_update, 1, 0))   thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED); diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c index a694de9..95d2587 100644 --- a/drivers/thermal/thermal_sysfs.c +++ b/drivers/thermal/thermal_sysfs.c @@ -51,17 +51,8 @@ static ssize_t  mode_show(struct device *dev, struct device_attribute *attr, char *buf)  {   struct thermal_zone_device *tz = to_thermal_zone(dev); - enum thermal_device_mode mode; - int result; - - if (!tz->ops->get_mode) - return -EPERM;   - result = tz->ops->get_mode(tz, &mode); - if (result) - return result; - - return sprintf(buf, "%s\n", mode == THERMAL_DEVICE_ENABLED ? "enabled" + return sprintf(buf, "%s\n", tz->mode == THERMAL_DEVICE_ENABLED ? "enabled"          : "disabled");  }   @@ -70,18 +61,17 @@ mode_store(struct device *dev, struct device_attribute *attr,      const char *buf, size_t count)  {   struct thermal_zone_device *tz = to_thermal_zone(dev); + enum thermal_device_mode mode;   int result;   - if (!tz->ops->set_mode) - return -EPERM; -   if (!strncmp(buf, "enabled", sizeof("enabled") - 1)) - result = tz->ops->set_mode(tz, THERMAL_DEVICE_ENABLED); + mode = THERMAL_DEVICE_ENABLED;   else if (!strncmp(buf, "disabled", sizeof("disabled") - 1)) - result = tz->ops->set_mode(tz, THERMAL_DEVICE_DISABLED); + mode = THERMAL_DEVICE_DISABLED;   else - result = -EINVAL; + return -EINVAL;   + result = thermal_zone_set_mode(tz, mode)   if (result)   return result;   diff --git a/include/linux/thermal.h b/include/linux/thermal.h index dab11f9..2f427de 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -210,6 +210,7 @@ struct thermal_zone_device {   struct thermal_attr *trip_type_attrs;   struct thermal_attr *trip_hyst_attrs;   void *devdata; + enum thermal_device_mode mode;   int trips;   unsigned long trips_disabled; /* bitmap for disabled trips */   int passive_delay; @@ -465,6 +466,8 @@ struct thermal_zone_device *thermal_zone_get_zone_by_name(const char *name);  int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);  int thermal_zone_get_slope(struct thermal_zone_device *tz);  int thermal_zone_get_offset(struct thermal_zone_device *tz); +int thermal_zone_set_mode(struct thermal_zone_device *tz, +   enum thermal_device_mode mode);    int get_tz_trend(struct thermal_zone_device *, int);  struct thermal_instance *get_thermal_instance(struct thermal_zone_device *,