From patchwork Sat Jul 2 02:49:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 9210679 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 B3F4660752 for ; Sat, 2 Jul 2016 02:49:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A84C4283E4 for ; Sat, 2 Jul 2016 02:49:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 986A7286CC; Sat, 2 Jul 2016 02:49:46 +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 06E4B283E4 for ; Sat, 2 Jul 2016 02:49:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751966AbcGBCtR (ORCPT ); Fri, 1 Jul 2016 22:49:17 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35973 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751426AbcGBCtP (ORCPT ); Fri, 1 Jul 2016 22:49:15 -0400 Received: by mail-pf0-f195.google.com with SMTP id i123so11317258pfg.3; Fri, 01 Jul 2016 19:49:15 -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=dJYgN5bAYQdJyx80MCdyhshE8lpnGVwuGte9pHcLYgM=; b=wZI1Ccixyp+TMEAyH52Ip0NCRg4kDfY+xJq8G1Cqr1i+Ydd19Me60k7yGNERDEb2LD mQgUFLZmckfu+sNdZ4cPoP+zcutfyvEOj+OybSIPdJzbKYhBX3XKOtWK1riqBwy0nYKx a9DBtRahJLSmjexE9/nmIjnrgsrJo8d0WRP/BPGd3CmS+jFmD9ksPY95ENyctcevlF+3 XaWKRHyQhiCixEWfkDGmo4BG2PtR/xbzgsQOT9o9rVdiPo3CwBBbdGKZ+scdl0M4Ne9q N+C/Xgqy9h9ydL3FgT/6XltUobIAse+Dx8/sK7XgAxDd5kZU8ME59eFCcsdCzUVItv/M Zv5A== 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=dJYgN5bAYQdJyx80MCdyhshE8lpnGVwuGte9pHcLYgM=; b=cKXNRhCRdbnaNukBvsvWeZb7amO0WYLDIAE1jio+kloGzgGLloNelKkEIinG61u+FT Rn3M7wirYfMO/Bh6gpKsElMqMiQhLavYxgHnoi8Ubvci7mewkT3kBaFVkJZavpkv+P2T 5zgIOKxMDAa4rmPYMcgCSyBvdsWXLkCwLdDw2mJv54LtixO65BQvPehQXBO5fsvLT1QF mP9i4qZfat2NOP3AFx7NLcVsdQficpamsEQLaadEHGwzfcWHTQajt1QK9ofQXFbW+68c At+vMCjMQBBkkgqx1IrNowuvGlNmn+oReWfr45CfprhRpy14FB2IOlXm/SaE6Zhkyk+U CT6g== X-Gm-Message-State: ALyK8tKQPFFmxQTzlEwyyeOEqJRQkdOIu/Ou88Z6Y3sGjiTAp6INUc05RuwvZ8lsErjQ4A== X-Received: by 10.98.76.211 with SMTP id e80mr2482934pfj.28.1467427754505; Fri, 01 Jul 2016 19:49:14 -0700 (PDT) Received: from localhost ([2601:647:4203:ca60:7256:81ff:febd:926d]) by smtp.gmail.com with ESMTPSA id z9sm882971pax.11.2016.07.01.19.49.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jul 2016 19:49:13 -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: [PATCHv2 1/1] thermal: sysfs: lock tz while on access to mode properties Date: Fri, 1 Jul 2016 19:49:09 -0700 Message-Id: <1467427749-31379-1-git-send-email-edubezval@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1464676296-5610-3-git-send-email-edubezval@gmail.com> References: <1464676296-5610-3-git-send-email-edubezval@gmail.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 Serialized calls to tz.ops in user facing sysfs handler mode_show() and mode_store(). 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. 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 --- 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 | 14 +++++++++++--- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 ----- 6 files changed, 11 insertions(+), 16 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 ee983ca..1e223d4 100644 --- a/drivers/thermal/thermal_sysfs.c +++ b/drivers/thermal/thermal_sysfs.c @@ -62,7 +62,9 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf) if (!tz->ops->get_mode) return -EPERM; + mutex_lock(&tz->lock); result = tz->ops->get_mode(tz, &mode); + mutex_unlock(&tz->lock); if (result) return result; @@ -75,17 +77,23 @@ 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 = THERMAL_DEVICE_DISABLED; 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; + + 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);