From patchwork Wed Jun 22 15:03:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 9193137 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 C7170601C0 for ; Wed, 22 Jun 2016 15:03:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B77FC24EE5 for ; Wed, 22 Jun 2016 15:03:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ABF69262FF; Wed, 22 Jun 2016 15:03:41 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 AF1F524EE5 for ; Wed, 22 Jun 2016 15:03:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752812AbcFVPD0 (ORCPT ); Wed, 22 Jun 2016 11:03:26 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36422 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752807AbcFVPDY (ORCPT ); Wed, 22 Jun 2016 11:03:24 -0400 Received: by mail-pf0-f193.google.com with SMTP id i123so4277360pfg.3; Wed, 22 Jun 2016 08:03:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tFIDXK/BPbzAxEjMVz2jhDJ/swgtWmi3zLWwyrcM79g=; b=WiKceZqrwHkHIO5pYkbGI+rhArZE7MlynrOdeUhyoQVQkWOhwFUVv6Kpih2Zw0gqKp 8/U3urgTIPrpFE6opz//Hc1tTz2hEZEZzOgKCuEfvaE819tRM2XlVYvKSRGtdkh6XiXD JF05A1TBgjM93bEk9lK2Q+G2zKyXOcnOVoLzMmZ7AXCUC6x6pJkMqhIh/1Pu4cPr1B4/ aFuaHQJU3PFs5/IEh0FaWSy+CI3hA70iXS0aN01Dt//vIBsmdsexPGMmFzF00geOwwVX Up7NGWSIoJPJTKxfmiJME52qqaQx/DVvvEg82Z/+kFnPZz+Lv9BxZPqu1LJuwa8JKFIa 9r5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tFIDXK/BPbzAxEjMVz2jhDJ/swgtWmi3zLWwyrcM79g=; b=JMYoVFvVGvS2x1ZkmeXhhduq/wmg2BLaFzKlDPcRmYOMKM5lW9W4s7byID1k2LtHEJ X3XH9bL8kvRdgUDyKdGBoPeELsXNiHDgZpaUpOCqBHx1238spO+zJ0HqFzEpbn20mQCy 6nKwhvSuNvirEl6BjuToEQ+pApMCZdb4b0qBRgZWY00QBmSoPGBi1slXnpSvX0Cpk2J0 ZTD3buePIXnvlfjNQ/diES4uA6wSQN2I3gXAIXvKc4KjjaH5ieAyOemtozvGGgRsNYnR IseEK6k03d7ijLhp6UqcnptuV0KkWubClb8VjL22EbnSSNqOsC/v3iZnL5UGIsiV9iVq duCg== X-Gm-Message-State: ALyK8tId6UgaysjAsc7thZTkLW8SXF2fJ90yXmIRVH0gUrXZ456dlgUPxceCDN6ei9xCcA== X-Received: by 10.98.206.77 with SMTP id y74mr34853523pfg.55.1466607803012; Wed, 22 Jun 2016 08:03:23 -0700 (PDT) Received: from localhost ([2601:647:4203:ca60:7256:81ff:febd:926d]) by smtp.gmail.com with ESMTPSA id qc16sm677466pab.1.2016.06.22.08.03.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jun 2016 08:03:21 -0700 (PDT) From: Eduardo Valentin To: Rui Zhang Cc: Eduardo Valentin , "Rafael J. Wysocki" , Len Brown , linux-acpi@vger.kernel.org, "Lee, Chun-Yi" , Darren Hart , Keerthy , linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCHv4 1/1] thermal: core: call thermal_zone_device_update() after mode update Date: Wed, 22 Jun 2016 08:03:18 -0700 Message-Id: <1466607798-30025-1-git-send-email-edubezval@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1466563538.2471.10.camel@intel.com> References: <1466563538.2471.10.camel@intel.com> Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Because several drivers do the following pattern: .set_mode() ... local_data->mode = new_mode; thermal_zone_device_update(tz); makes sense to simply do the thermal_zone_device_update() in thermal core, after setting the new mode. Also, this patch also remove deadlocks on drivers that call thermal_zone_device_update() on .set_mode(), as .set_mode() is now called always with tz->lock held. Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: linux-acpi@vger.kernel.org Cc: "Lee, Chun-Yi" Cc: Darren Hart Cc: Zhang Rui Cc: Keerthy Cc: linux-kernel@vger.kernel.org Cc: linux-omap@vger.kernel.org Cc: platform-driver-x86@vger.kernel.org Cc: linux-pm@vger.kernel.org Signed-off-by: Eduardo Valentin Tested-by: Keerthy --- Hello, V3->V4: - ti-soc: Removed extra locking from TI SoC in set_mode - ACPI: Kept the update on check as it is called on other places BR, Eduardo drivers/acpi/thermal.c | 1 - drivers/platform/x86/acerhdf.c | 1 - drivers/thermal/imx_thermal.c | 1 - drivers/thermal/of-thermal.c | 5 ----- drivers/thermal/thermal_sysfs.c | 1 + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 ----- 6 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 82707f9..03c3460 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -581,7 +581,6 @@ static int thermal_set_mode(struct thermal_zone_device *thermal, ACPI_DEBUG_PRINT((ACPI_DB_INFO, "%s kernel ACPI thermal control\n", tz->tz_enabled ? "Enable" : "Disable")); - acpi_thermal_check(tz); } return 0; } diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c index 460fa67..aee33ba 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c @@ -405,7 +405,6 @@ static inline void acerhdf_enable_kernelmode(void) kernelmode = 1; thz_dev->polling_delay = interval*1000; - thermal_zone_device_update(thz_dev); pr_notice("kernel mode fan control ON\n"); } diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index c5547bd..a413eb6 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -246,7 +246,6 @@ static int imx_set_mode(struct thermal_zone_device *tz, } data->mode = mode; - thermal_zone_device_update(tz); return 0; } diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c index b8e509c..95c47da 100644 --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c @@ -282,17 +282,12 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, { struct __thermal_zone *data = tz->devdata; - mutex_lock(&tz->lock); - if (mode == THERMAL_DEVICE_ENABLED) tz->polling_delay = data->polling_delay; else tz->polling_delay = 0; - mutex_unlock(&tz->lock); - data->mode = mode; - thermal_zone_device_update(tz); return 0; } diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c index 743df50..3d0dc30 100644 --- a/drivers/thermal/thermal_sysfs.c +++ b/drivers/thermal/thermal_sysfs.c @@ -100,6 +100,7 @@ mode_store(struct device *dev, struct device_attribute *attr, mutex_lock(&tz->lock); result = tz->ops->set_mode(tz, mode); mutex_unlock(&tz->lock); + thermal_zone_device_update(tz); if (result) return result; diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c index 15c0a9a..5dce053 100644 --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c @@ -193,19 +193,14 @@ static int ti_thermal_set_mode(struct thermal_zone_device *thermal, return 0; } - mutex_lock(&data->ti_thermal->lock); - if (mode == THERMAL_DEVICE_ENABLED) data->ti_thermal->polling_delay = FAST_TEMP_MONITORING_RATE; else data->ti_thermal->polling_delay = 0; - mutex_unlock(&data->ti_thermal->lock); - data->mode = mode; ti_bandgap_write_update_interval(bgp, data->sensor_id, data->ti_thermal->polling_delay); - thermal_zone_device_update(data->ti_thermal); dev_dbg(&thermal->device, "thermal polling set for duration=%d msec\n", data->ti_thermal->polling_delay);