From: Sascha Hauer <s.hauer@pengutronix.de> To: linux-pm@vger.kernel.org Cc: Zhang Rui <rui.zhang@intel.com>, Eduardo Valentin <edubezval@gmail.com>, linux-kernel@vger.kernel.org, Stephen Warren <swarren@wwwdotorg.org>, Mikko Perttunen <mikko.perttunen@kapsi.fi>, kernel@pengutronix.de, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Sascha Hauer <s.hauer@pengutronix.de> Subject: [PATCH 04/13] thermal: Fix not emulating critical temperatures Date: Thu, 26 Mar 2015 16:53:51 +0100 [thread overview] Message-ID: <1427385240-6086-5-git-send-email-s.hauer@pengutronix.de> (raw) In-Reply-To: <1427385240-6086-1-git-send-email-s.hauer@pengutronix.de> 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 <s.hauer@pengutronix.de> --- 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; -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: s.hauer@pengutronix.de (Sascha Hauer) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/13] thermal: Fix not emulating critical temperatures Date: Thu, 26 Mar 2015 16:53:51 +0100 [thread overview] Message-ID: <1427385240-6086-5-git-send-email-s.hauer@pengutronix.de> (raw) In-Reply-To: <1427385240-6086-1-git-send-email-s.hauer@pengutronix.de> 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 <s.hauer@pengutronix.de> --- 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; -- 2.1.4
next prev parent reply other threads:[~2015-03-26 15:54 UTC|newest] Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-26 15:53 Thermal: Cleanups, fixes and hardware trip points Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 01/13] thermal: Make temperatures consistently unsigned long Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-27 10:18 ` Punit Agrawal 2015-03-27 10:18 ` Punit Agrawal 2015-03-27 19:07 ` Sascha Hauer 2015-03-27 19:07 ` Sascha Hauer 2015-04-07 1:47 ` Eduardo Valentin 2015-04-07 1:47 ` Eduardo Valentin 2015-04-07 1:45 ` Eduardo Valentin 2015-04-07 1:45 ` Eduardo Valentin 2015-04-27 20:36 ` Pavel Machek 2015-04-27 20:36 ` Pavel Machek 2015-04-28 7:42 ` Sascha Hauer 2015-04-28 7:42 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 02/13] thermal: trivial: fix typo in comment Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 1:49 ` Eduardo Valentin 2015-04-07 1:49 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 03/13] thermal: remove useless call to thermal_zone_device_set_polling Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 2:56 ` Eduardo Valentin 2015-04-07 2:56 ` Eduardo Valentin 2015-03-26 15:53 ` Sascha Hauer [this message] 2015-03-26 15:53 ` [PATCH 04/13] thermal: Fix not emulating critical temperatures Sascha Hauer 2015-03-26 18:13 ` Carlos Hernandez 2015-03-26 18:13 ` Carlos Hernandez 2015-03-26 18:13 ` Carlos Hernandez 2015-03-26 18:55 ` Sascha Hauer 2015-03-26 18:55 ` Sascha Hauer 2015-03-27 3:05 ` amit daniel kachhap 2015-03-27 3:05 ` amit daniel kachhap 2015-03-27 5:23 ` Sascha Hauer 2015-03-27 5:23 ` Sascha Hauer 2015-04-07 2:08 ` Eduardo Valentin 2015-04-07 2:08 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 05/13] thermal: inline only once used function Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 2:23 ` Eduardo Valentin 2015-04-07 2:23 ` Eduardo Valentin 2015-04-14 10:44 ` Sascha Hauer 2015-04-14 10:44 ` Sascha Hauer 2015-04-14 10:44 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 06/13] thermal: streamline get_trend callbacks Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 3:19 ` Eduardo Valentin 2015-04-07 3:19 ` Eduardo Valentin 2015-04-14 10:48 ` Sascha Hauer 2015-04-14 10:48 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 07/13] thermal: of: streamline .get_temp callbacks Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 2:27 ` Eduardo Valentin 2015-04-07 2:27 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 08/13] thermal: Allow sensor ops to fail with -ENOSYS Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 09/13] thermal: of: always set sensor related callbacks Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 3:25 ` Eduardo Valentin 2015-04-07 3:25 ` Eduardo Valentin 2015-04-14 10:54 ` Sascha Hauer 2015-04-14 10:54 ` Sascha Hauer 2015-03-26 15:53 ` [PATCH 10/13] thermal: Make struct thermal_zone_device_ops const Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 3:29 ` Eduardo Valentin 2015-04-07 3:29 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 11/13] thermal: of: make of_thermal_ops const Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 3:27 ` Eduardo Valentin 2015-04-07 3:27 ` Eduardo Valentin 2015-03-26 15:53 ` [PATCH 12/13] thermal: Add support for hardware-tracked trip points Sascha Hauer 2015-03-26 15:53 ` Sascha Hauer 2015-04-07 2:40 ` Eduardo Valentin 2015-04-07 2:40 ` Eduardo Valentin 2015-04-15 18:06 ` Brian Norris 2015-04-15 18:06 ` Brian Norris 2015-03-26 15:54 ` [PATCH 13/13] thermal: of: implement .set_trips for device tree thermal zones Sascha Hauer 2015-03-26 15:54 ` Sascha Hauer 2015-04-07 2:43 ` Eduardo Valentin 2015-04-07 2:43 ` Eduardo Valentin 2015-04-13 6:30 ` Sascha Hauer 2015-04-13 6:30 ` Sascha Hauer 2015-04-15 17:59 ` Brian Norris 2015-04-15 17:59 ` Brian Norris 2015-04-17 5:22 ` Sascha Hauer 2015-04-17 5:22 ` Sascha Hauer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1427385240-6086-5-git-send-email-s.hauer@pengutronix.de \ --to=s.hauer@pengutronix.de \ --cc=edubezval@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-pm@vger.kernel.org \ --cc=mikko.perttunen@kapsi.fi \ --cc=rui.zhang@intel.com \ --cc=swarren@wwwdotorg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.