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 12/13] thermal: Add support for hardware-tracked trip points Date: Thu, 26 Mar 2015 16:53:59 +0100 [thread overview] Message-ID: <1427385240-6086-13-git-send-email-s.hauer@pengutronix.de> (raw) In-Reply-To: <1427385240-6086-1-git-send-email-s.hauer@pengutronix.de> This adds support for hardware-tracked trip points to the device tree thermal sensor framework. The framework supports an arbitrary number of trip points. Whenever the current temperature is updated, the trip points immediately below and above the current temperature are found. A .set_trips callback is then called with the temperatures. If there is no trip point above or below the current temperature, the passed trip temperature will be ULONG_MAX or 0 respectively. In this callback, the driver should program the hardware such that it is notified when either of these trip points are triggered. When a trip point is triggered, the driver should call `thermal_zone_device_update' for the respective thermal zone. This will cause the trip points to be updated again. If .set_trips is not implemented, the framework behaves as before. This patch is based on an earlier version from Mikko Perttunen <mikko.perttunen@kapsi.fi> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/thermal/thermal_core.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/linux/thermal.h | 3 +++ 2 files changed, 44 insertions(+) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index dcdf45e..7138f8f 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -434,6 +434,45 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, unsigned long *temp) } EXPORT_SYMBOL_GPL(thermal_zone_get_temp); +static void thermal_zone_set_trips(struct thermal_zone_device *tz) +{ + unsigned long low = 0; + unsigned long high = ULONG_MAX; + unsigned long trip_temp, hysteresis; + unsigned long temp = tz->temperature; + int i; + + if (!tz->ops->set_trips) + return; + + /* No need to change trip points */ + if (temp > tz->prev_low_trip && temp < tz->prev_high_trip) + return; + + for (i = 0; i < tz->trips; i++) { + unsigned long trip_low; + + tz->ops->get_trip_temp(tz, i, &trip_temp); + tz->ops->get_trip_hyst(tz, i, &hysteresis); + + trip_low = trip_temp - hysteresis; + + if (trip_low < temp && trip_low > low) + low = trip_low; + + if (trip_temp > temp && trip_temp < high) + high = trip_temp; + } + + tz->prev_low_trip = low; + tz->prev_high_trip = high; + + dev_dbg(&tz->device, "new temperature boundaries: %lu < x < %lu\n", + low, high); + + tz->ops->set_trips(tz, low, high); +} + void thermal_zone_device_update(struct thermal_zone_device *tz) { int count; @@ -460,6 +499,8 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) dev_dbg(&tz->device, "last_temperature=%lu, current_temperature=%lu\n", tz->last_temperature, tz->temperature); + thermal_zone_set_trips(tz); + for (count = 0; count < tz->trips; count++) handle_thermal_trip(tz, count); } diff --git a/include/linux/thermal.h b/include/linux/thermal.h index ac2897c..b870702 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -87,6 +87,7 @@ struct thermal_zone_device_ops { int (*unbind) (struct thermal_zone_device *, struct thermal_cooling_device *); int (*get_temp) (struct thermal_zone_device *, unsigned long *); + int (*set_trips) (struct thermal_zone_device *, unsigned long, unsigned long); int (*get_mode) (struct thermal_zone_device *, enum thermal_device_mode *); int (*set_mode) (struct thermal_zone_device *, @@ -183,6 +184,8 @@ struct thermal_zone_device { unsigned long temperature; unsigned long last_temperature; unsigned long emul_temperature; + unsigned long prev_low_trip; + unsigned long prev_high_trip; int passive; unsigned int forced_passive; const struct thermal_zone_device_ops *ops; -- 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 12/13] thermal: Add support for hardware-tracked trip points Date: Thu, 26 Mar 2015 16:53:59 +0100 [thread overview] Message-ID: <1427385240-6086-13-git-send-email-s.hauer@pengutronix.de> (raw) In-Reply-To: <1427385240-6086-1-git-send-email-s.hauer@pengutronix.de> This adds support for hardware-tracked trip points to the device tree thermal sensor framework. The framework supports an arbitrary number of trip points. Whenever the current temperature is updated, the trip points immediately below and above the current temperature are found. A .set_trips callback is then called with the temperatures. If there is no trip point above or below the current temperature, the passed trip temperature will be ULONG_MAX or 0 respectively. In this callback, the driver should program the hardware such that it is notified when either of these trip points are triggered. When a trip point is triggered, the driver should call `thermal_zone_device_update' for the respective thermal zone. This will cause the trip points to be updated again. If .set_trips is not implemented, the framework behaves as before. This patch is based on an earlier version from Mikko Perttunen <mikko.perttunen@kapsi.fi> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/thermal/thermal_core.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/linux/thermal.h | 3 +++ 2 files changed, 44 insertions(+) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index dcdf45e..7138f8f 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -434,6 +434,45 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, unsigned long *temp) } EXPORT_SYMBOL_GPL(thermal_zone_get_temp); +static void thermal_zone_set_trips(struct thermal_zone_device *tz) +{ + unsigned long low = 0; + unsigned long high = ULONG_MAX; + unsigned long trip_temp, hysteresis; + unsigned long temp = tz->temperature; + int i; + + if (!tz->ops->set_trips) + return; + + /* No need to change trip points */ + if (temp > tz->prev_low_trip && temp < tz->prev_high_trip) + return; + + for (i = 0; i < tz->trips; i++) { + unsigned long trip_low; + + tz->ops->get_trip_temp(tz, i, &trip_temp); + tz->ops->get_trip_hyst(tz, i, &hysteresis); + + trip_low = trip_temp - hysteresis; + + if (trip_low < temp && trip_low > low) + low = trip_low; + + if (trip_temp > temp && trip_temp < high) + high = trip_temp; + } + + tz->prev_low_trip = low; + tz->prev_high_trip = high; + + dev_dbg(&tz->device, "new temperature boundaries: %lu < x < %lu\n", + low, high); + + tz->ops->set_trips(tz, low, high); +} + void thermal_zone_device_update(struct thermal_zone_device *tz) { int count; @@ -460,6 +499,8 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) dev_dbg(&tz->device, "last_temperature=%lu, current_temperature=%lu\n", tz->last_temperature, tz->temperature); + thermal_zone_set_trips(tz); + for (count = 0; count < tz->trips; count++) handle_thermal_trip(tz, count); } diff --git a/include/linux/thermal.h b/include/linux/thermal.h index ac2897c..b870702 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -87,6 +87,7 @@ struct thermal_zone_device_ops { int (*unbind) (struct thermal_zone_device *, struct thermal_cooling_device *); int (*get_temp) (struct thermal_zone_device *, unsigned long *); + int (*set_trips) (struct thermal_zone_device *, unsigned long, unsigned long); int (*get_mode) (struct thermal_zone_device *, enum thermal_device_mode *); int (*set_mode) (struct thermal_zone_device *, @@ -183,6 +184,8 @@ struct thermal_zone_device { unsigned long temperature; unsigned long last_temperature; unsigned long emul_temperature; + unsigned long prev_low_trip; + unsigned long prev_high_trip; int passive; unsigned int forced_passive; const struct thermal_zone_device_ops *ops; -- 2.1.4
next prev parent reply other threads:[~2015-03-26 15:56 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 ` [PATCH 04/13] thermal: Fix not emulating critical temperatures Sascha Hauer 2015-03-26 15:53 ` 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 ` Sascha Hauer [this message] 2015-03-26 15:53 ` [PATCH 12/13] thermal: Add support for hardware-tracked trip points 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-13-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.