From patchwork Wed Jun 22 05:15:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 9191913 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 57FA76075A for ; Wed, 22 Jun 2016 05:16:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F2B21FFB9 for ; Wed, 22 Jun 2016 05:16:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33B1D283EA; Wed, 22 Jun 2016 05:16:13 +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=ham 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 8810A1FFB9 for ; Wed, 22 Jun 2016 05:16:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751080AbcFVFQL (ORCPT ); Wed, 22 Jun 2016 01:16:11 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:35091 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751002AbcFVFQI (ORCPT ); Wed, 22 Jun 2016 01:16:08 -0400 Received: by mail-pa0-f67.google.com with SMTP id hf6so2997154pac.2; Tue, 21 Jun 2016 22:15:52 -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=2aD3vhBd8Edo1Oy/ud6pGnYzQ6ZIZB9j1yz/yGvcPbU=; b=bOGrYaRtBmAQaj2kFHJEWSkYmnsyv9K6+IOKY7kWqQy4ifDerxdJ7XR9o7kJtFBR/X Ijy/5+oWi+TufLNtTKi9mMhzjT1lICP6TFE3AgtgpF681+TFIVPdIr4hMlugzdrxdESy 1aigFeM3h53h55jxf7ucjTkQAVArqH0xo8H+SRw+WYom51xeVnwxldMtIcl8aoFq+9hp QrhcIS/wQJ/MldwlDZ52M7ZOL3jugD3VEFCTuFfpYhDXBPLLx037fzXfE22GkmrwwZdb 4AIKZq3h0up1XndwJSfp0DnI6H/i9bO9ekBs9JLt89J0q09RrKgEpgi10TC4p1gRlaj+ bTaA== 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=2aD3vhBd8Edo1Oy/ud6pGnYzQ6ZIZB9j1yz/yGvcPbU=; b=BFo7yWIt3SIiTys4cbasyY1Ra3wjB/v7ydjuuKgKvg1weYLkstJ+5+27baEIu2tgva uzmKYF/35hc720EqPXQ2E+ji6la2f0eQM2tH3COdLBMTcZj8V8JpiaO6mJzMteKim9+c 4y4gdfJ2/uLjcYLbmOe9gmz9+0+RWo7rHX+QwmMXH4pSVf94wwoFf9zl4gdQFLkyRu7F XJihcuas9zE/nQmv3ya9+bhi5gjn+vpylIIqcd1qi3g8Nc3lgsEvS1nQeCmhPucXuUT2 nXzxchz0Itwr8+ooGOz2HNQpPDhoVtuNTntbd5wWJ+vWaD141lC76R96xPb7GiRzsJ3K 8Vrw== X-Gm-Message-State: ALyK8tLHBkCc6dQmRVWn+5LP+clP4vTDCaSmuIkdHjsX5WO1V5SjAYfi+1P3onANflg5Xg== X-Received: by 10.66.161.41 with SMTP id xp9mr32196778pab.78.1466572551499; Tue, 21 Jun 2016 22:15:51 -0700 (PDT) Received: from localhost ([2601:647:4203:ca60:7256:81ff:febd:926d]) by smtp.gmail.com with ESMTPSA id o84sm95313694pfj.95.2016.06.21.22.15.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2016 22:15:50 -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: core: call thermal_zone_device_update() after mode update Date: Tue, 21 Jun 2016 22:15:46 -0700 Message-Id: <1466572546-12944-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 --- Please ignore last version. V1-> V2: Cleaned the patch and remove unrelated changes. --- drivers/acpi/thermal.c | 2 -- drivers/platform/x86/acerhdf.c | 1 - drivers/thermal/imx_thermal.c | 1 - drivers/thermal/of-thermal.c | 1 - drivers/thermal/thermal_sysfs.c | 1 + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 82707f9..8582b88 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -519,8 +519,6 @@ static void acpi_thermal_check(void *data) if (!tz->tz_enabled) return; - - thermal_zone_device_update(tz->thermal_zone); } /* sys I/F for generic thermal sysfs support */ 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..4602e2e 100644 --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c @@ -292,7 +292,6 @@ static int of_thermal_set_mode(struct thermal_zone_device *tz, 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..9a5a3a3 100644 --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c @@ -205,7 +205,6 @@ static int ti_thermal_set_mode(struct thermal_zone_device *thermal, 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);