From patchwork Thu Mar 26 15:53:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 6100621 Return-Path: X-Original-To: patchwork-linux-mediatek@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 7CE02BF90F for ; Thu, 26 Mar 2015 15:58:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 93EA02041F for ; Thu, 26 Mar 2015 15:58:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0BE4E203EC for ; Thu, 26 Mar 2015 15:58:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YbAB7-0004bX-V2; Thu, 26 Mar 2015 15:58:41 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YbA7P-0001IX-9h for linux-mediatek@bombadil.infradead.org; Thu, 26 Mar 2015 15:54:51 +0000 Received: from [2001:6f8:1178:4:290:27ff:fe1d:cc33] (helo=metis.ext.pengutronix.de) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YbA7M-0007y3-Ut for linux-mediatek@lists.infradead.org; Thu, 26 Mar 2015 15:54:49 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YbA6g-0007fg-PH; Thu, 26 Mar 2015 16:54:06 +0100 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.84) (envelope-from ) id 1YbA6e-0001di-MH; Thu, 26 Mar 2015 16:54:04 +0100 From: Sascha Hauer To: linux-pm@vger.kernel.org Subject: [PATCH 04/13] thermal: Fix not emulating critical temperatures Date: Thu, 26 Mar 2015 16:53:51 +0100 Message-Id: <1427385240-6086-5-git-send-email-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427385240-6086-1-git-send-email-s.hauer@pengutronix.de> References: <1427385240-6086-1-git-send-email-s.hauer@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-mediatek@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150326_115449_302594_D80F1ECE X-CRM114-Status: GOOD ( 16.84 ) X-Spam-Score: -1.1 (-) Cc: Stephen Warren , Sascha Hauer , linux-kernel@vger.kernel.org, Eduardo Valentin , Mikko Perttunen , linux-mediatek@lists.infradead.org, kernel@pengutronix.de, Zhang Rui , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 commit e6e238c38 (thermal: sysfs: Add a new sysfs node emul_temp for thermal emulation) promised not to emulate critical temperatures, but the check for critical temperatures is broken in multiple ways: - The code should only accept an emulated temperature when the emulated temperature is lower than the critical temperature. Instead the code accepts an emulated temperature whenever the real temperature is lower than the critical temperature. This makes no sense and trying to emulate a temperature higher than the critical temperature halts the system. - When trying to emulate a higher-than-critical temperature we should either limit the emulated temperature to the maximum non critical temperature or refuse to emulate this temperature. Instead the code just silently ignores the emulated temperature and continues with the real temperature. This patch moves the test for illegal emulated temperature to the sysfs write function so that we can properly refuse illegal temperatures here. Trying to write illegal temperatures results in an error message. While at it use IS_ENABLED() instead of #ifdefs. Signed-off-by: Sascha Hauer --- drivers/thermal/thermal_core.c | 46 ++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index dcea909..ebca854 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -414,11 +414,6 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip) int thermal_zone_get_temp(struct thermal_zone_device *tz, unsigned long *temp) { int ret = -EINVAL; -#ifdef CONFIG_THERMAL_EMULATION - int count; - unsigned long crit_temp = -1UL; - enum thermal_trip_type type; -#endif if (!tz || IS_ERR(tz) || !tz->ops->get_temp) goto exit; @@ -426,25 +421,10 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, unsigned long *temp) mutex_lock(&tz->lock); ret = tz->ops->get_temp(tz, temp); -#ifdef CONFIG_THERMAL_EMULATION - if (!tz->emul_temperature) - goto skip_emul; - - for (count = 0; count < tz->trips; count++) { - ret = tz->ops->get_trip_type(tz, count, &type); - if (!ret && type == THERMAL_TRIP_CRITICAL) { - ret = tz->ops->get_trip_temp(tz, count, &crit_temp); - break; - } - } - - if (ret) - goto skip_emul; - if (*temp < crit_temp) + if (IS_ENABLED(CONFIG_THERMAL_EMULATION) && tz->emul_temperature) *temp = tz->emul_temperature; -skip_emul: -#endif + mutex_unlock(&tz->lock); exit: return ret; @@ -788,10 +768,32 @@ emul_temp_store(struct device *dev, struct device_attribute *attr, struct thermal_zone_device *tz = to_thermal_zone(dev); int ret = 0; unsigned long temperature; + int trip; + unsigned long crit_temp; + enum thermal_trip_type type; if (kstrtoul(buf, 10, &temperature)) return -EINVAL; + for (trip = 0; trip < tz->trips; trip++) { + ret = tz->ops->get_trip_type(tz, trip, &type); + if (ret) + return ret; + + if (type != THERMAL_TRIP_CRITICAL) + continue; + + ret = tz->ops->get_trip_temp(tz, trip, &crit_temp); + if (ret) + return ret; + + if (temperature >= crit_temp) { + dev_err(&tz->device, "Will not emulate critical temperature %luC (tcrit=%luC)\n", + temperature / 1000, crit_temp / 1000); + return -EINVAL; + } + } + if (!tz->ops->set_emul_temp) { mutex_lock(&tz->lock); tz->emul_temperature = temperature;