From: Eduardo Valentin <eduardo.valentin@ti.com>
To: Zhang Rui <rui.zhang@intel.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>,
Matthew Garrett <mjg@redhat.com>, Len Brown <lenb@kernel.org>,
R Durgadoss <durgadoss.r@intel.com>,
Eduardo Valentin <eduardo.valentin@ti.com>,
Amit Kachhap <amit.kachhap@linaro.org>, Wei Ni <wni@nvidia.com>,
linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org
Subject: Re: [PATCH V4 12/13] Thermal: Unify the code for both active and passive cooling
Date: Mon, 20 Aug 2012 18:45:56 +0300 [thread overview]
Message-ID: <20120820154556.GC9833@besouro> (raw)
In-Reply-To: <1343292083-2047-13-git-send-email-rui.zhang@intel.com>
On Thu, Jul 26, 2012 at 04:41:22PM +0800, Zhang Rui wrote:
> Remove thermal_zone_device_passive(). And use
> thermal_zone_trip_update() and thermal_zone_do_update()
> for both active and passive cooling.
>
> Reviewed-by: Rafael J. Wysocki <rjw@sisk.pl>
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Eduardo Valentin <eduardo.valentin@ti.com>
> ---
> drivers/thermal/thermal_sys.c | 110 ++++++++++-------------------------------
> include/linux/thermal.h | 2 +-
> 2 files changed, 26 insertions(+), 86 deletions(-)
>
> diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
> index 027b8e2..7f3a891 100644
> --- a/drivers/thermal/thermal_sys.c
> +++ b/drivers/thermal/thermal_sys.c
> @@ -715,84 +715,6 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,
> msecs_to_jiffies(delay));
> }
>
> -static void thermal_zone_device_passive(struct thermal_zone_device *tz,
> - int temp, int trip_temp, int trip)
> -{
> - enum thermal_trend trend;
> - struct thermal_instance *instance;
> - struct thermal_cooling_device *cdev;
> - long state, max_state;
> -
> - if (!tz->ops->get_trend || tz->ops->get_trend(tz, trip, &trend)) {
> - /*
> - * compare the current temperature and previous temperature
> - * to get the thermal trend, if no special requirement
> - */
> - if (tz->temperature > tz->last_temperature)
> - trend = THERMAL_TREND_RAISING;
> - else if (tz->temperature < tz->last_temperature)
> - trend = THERMAL_TREND_DROPPING;
> - else
> - trend = THERMAL_TREND_STABLE;
> - }
> -
> - /*
> - * Above Trip?
> - * -----------
> - * Calculate the thermal trend (using the passive cooling equation)
> - * and modify the performance limit for all passive cooling devices
> - * accordingly. Note that we assume symmetry.
> - */
> - if (temp >= trip_temp) {
> - tz->passive = true;
> -
> - /* Heating up? */
> - if (trend == THERMAL_TREND_RAISING) {
> - list_for_each_entry(instance, &tz->thermal_instances,
> - tz_node) {
> - if (instance->trip != trip)
> - continue;
> - cdev = instance->cdev;
> - cdev->ops->get_cur_state(cdev, &state);
> - cdev->ops->get_max_state(cdev, &max_state);
> - if (state++ < max_state)
> - cdev->ops->set_cur_state(cdev, state);
> - }
> - } else if (trend == THERMAL_TREND_DROPPING) { /* Cooling off? */
> - list_for_each_entry(instance, &tz->thermal_instances,
> - tz_node) {
> - if (instance->trip != trip)
> - continue;
> - cdev = instance->cdev;
> - cdev->ops->get_cur_state(cdev, &state);
> - cdev->ops->get_max_state(cdev, &max_state);
> - if (state > 0)
> - cdev->ops->set_cur_state(cdev, --state);
> - }
> - }
> - return;
> - }
> -
> - /*
> - * Below Trip?
> - * -----------
> - * Implement passive cooling hysteresis to slowly increase performance
> - * and avoid thrashing around the passive trip point. Note that we
> - * assume symmetry.
> - */
> - list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
> - if (instance->trip != trip)
> - continue;
> - cdev = instance->cdev;
> - cdev->ops->get_cur_state(cdev, &state);
> - cdev->ops->get_max_state(cdev, &max_state);
> - if (state > 0)
> - cdev->ops->set_cur_state(cdev, --state);
> - if (state == 0)
> - tz->passive = false;
> - }
> -}
> -
> static void thermal_zone_device_check(struct work_struct *work)
> {
> struct thermal_zone_device *tz = container_of(work, struct
> @@ -1114,7 +1036,7 @@ static void thermal_zone_do_update(struct thermal_zone_device *tz)
> }
>
> /*
> - * Cooling algorithm for active trip points
> + * Cooling algorithm for both active and passive cooling
> *
> * 1. if the temperature is higher than a trip point,
> * a. if the trend is THERMAL_TREND_RAISING, use higher cooling
> @@ -1136,9 +1058,16 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz,
> struct thermal_cooling_device *cdev = NULL;
> unsigned long cur_state, max_state;
> long trip_temp;
> + enum thermal_trip_type trip_type;
> enum thermal_trend trend;
>
> - tz->ops->get_trip_temp(tz, trip, &trip_temp);
> + if (trip == THERMAL_TRIPS_NONE) {
> + trip_temp = tz->forced_passive;
> + trip_type = THERMAL_TRIPS_NONE;
> + } else {
> + tz->ops->get_trip_temp(tz, trip, &trip_temp);
> + tz->ops->get_trip_type(tz, trip, &trip_type);
> + }
>
> if (!tz->ops->get_trend || tz->ops->get_trend(tz, trip, &trend)) {
> /*
> @@ -1170,6 +1099,13 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz,
> cur_state = cur_state > instance->lower ?
> (cur_state - 1) : instance->lower;
> }
> +
> + /* activate a passive thermal instance */
> + if ((trip_type == THERMAL_TRIP_PASSIVE ||
> + trip_type == THERMAL_TRIPS_NONE) &&
> + instance->target == THERMAL_NO_TARGET)
> + tz->passive++;
> +
> instance->target = cur_state;
> cdev->updated = false; /* cooling device needs update */
> }
> @@ -1186,6 +1122,12 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz,
>
> cur_state = cur_state > instance->lower ?
> (cur_state - 1) : THERMAL_NO_TARGET;
> +
> + /* deactivate a passive thermal instance */
> + if ((trip_type == THERMAL_TRIP_PASSIVE ||
> + trip_type == THERMAL_TRIPS_NONE) &&
> + cur_state == THERMAL_NO_TARGET)
> + tz->passive--;
> instance->target = cur_state;
> cdev->updated = false; /* cooling device needs update */
> }
> @@ -1242,16 +1184,14 @@ void thermal_zone_device_update(struct thermal_zone_device *tz)
> break;
> case THERMAL_TRIP_PASSIVE:
> if (temp >= trip_temp || tz->passive)
> - thermal_zone_device_passive(tz, temp,
> - trip_temp, count);
> + thermal_zone_trip_update(tz, count, temp);
> break;
> }
> }
>
> - thermal_zone_do_update(tz);
> if (tz->forced_passive)
> - thermal_zone_device_passive(tz, temp, tz->forced_passive,
> - THERMAL_TRIPS_NONE);
> + thermal_zone_trip_update(tz, THERMAL_TRIPS_NONE, temp);
> + thermal_zone_do_update(tz);
>
> leave:
> if (tz->passive)
> diff --git a/include/linux/thermal.h b/include/linux/thermal.h
> index 3e66214..06fd04d 100644
> --- a/include/linux/thermal.h
> +++ b/include/linux/thermal.h
> @@ -121,7 +121,7 @@ struct thermal_zone_device {
> int polling_delay;
> int temperature;
> int last_temperature;
> - bool passive;
> + int passive;
> unsigned int forced_passive;
> const struct thermal_zone_device_ops *ops;
> struct list_head thermal_instances;
> --
> 1.7.9.5
>
next prev parent reply other threads:[~2012-08-20 15:46 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-26 8:41 [PATCH V4 00/13] Thermal: generic thermal layer enhancement Zhang Rui
2012-07-26 8:41 ` [PATCH V4 01/13] Thermal: Introduce multiple cooling states support Zhang Rui
2012-08-08 12:02 ` Valentin, Eduardo
2012-08-09 0:58 ` Zhang Rui
2012-07-26 8:41 ` [PATCH V4 02/13] Thermal: Introduce cooling states range support Zhang Rui
2012-08-20 15:51 ` Eduardo Valentin
2012-07-26 8:41 ` [PATCH V4 03/13] Thermal: set upper and lower limits Zhang Rui
2012-08-20 15:50 ` Eduardo Valentin
2012-07-26 8:41 ` [PATCH V4 04/13] Thermal: Introduce .get_trend() callback Zhang Rui
2012-07-26 20:11 ` Rafael J. Wysocki
2012-08-01 2:42 ` Zhang Rui
2012-08-08 13:46 ` Valentin, Eduardo
2012-08-08 13:44 ` Valentin, Eduardo
2012-07-26 8:41 ` [PATCH V4 05/13] Thermal: Remove tc1/tc2 in generic thermal layer Zhang Rui
2012-07-26 20:11 ` Rafael J. Wysocki
2012-08-08 14:06 ` Valentin, Eduardo
2012-08-09 0:57 ` Zhang Rui
2012-08-09 8:05 ` Valentin, Eduardo
2012-08-09 15:10 ` Valentin, Eduardo
2012-08-20 12:18 ` Eduardo Valentin
2012-08-21 0:49 ` Zhang Rui
2012-08-21 14:20 ` Eduardo Valentin
2012-07-26 8:41 ` [PATCH V4 06/13] Thermal: Introduce thermal_zone_trip_update() Zhang Rui
2012-07-26 20:12 ` Rafael J. Wysocki
2012-08-20 15:47 ` Eduardo Valentin
2012-08-20 15:48 ` Eduardo Valentin
2012-07-26 8:41 ` [PATCH V4 07/13] Thermal: rename structure thermal_cooling_device_instance to thermal_instance Zhang Rui
2012-08-20 15:47 ` Eduardo Valentin
2012-07-26 8:41 ` [PATCH V4 08/13] Thermal: Rename thermal_zone_device.cooling_devices Zhang Rui
2012-08-20 15:47 ` Eduardo Valentin
2012-07-26 8:41 ` [PATCH V4 09/13] Thermal: Rename thermal_instance.node to thermal_instance.tz_node Zhang Rui
2012-08-20 15:47 ` Eduardo Valentin
2012-07-26 8:41 ` [PATCH V4 10/13] Thermal: List thermal_instance in thermal_cooling_device Zhang Rui
2012-08-20 15:46 ` Eduardo Valentin
2012-07-26 8:41 ` [PATCH V4 11/13] Thermal: Introduce simple arbitrator for setting device cooling state Zhang Rui
2012-08-20 15:46 ` Eduardo Valentin
2012-07-26 8:41 ` [PATCH V4 12/13] Thermal: Unify the code for both active and passive cooling Zhang Rui
2012-08-20 15:45 ` Eduardo Valentin [this message]
2012-07-26 8:41 ` [PATCH V4 13/13] Thermal: Introduce locking for cdev.thermal_instances list Zhang Rui
2012-07-26 20:13 ` Rafael J. Wysocki
2012-08-20 15:45 ` Eduardo Valentin
2012-08-21 0:53 ` Zhang Rui
2012-08-21 5:01 ` Eduardo Valentin
2012-08-20 15:53 ` [PATCH V4 00/13] Thermal: generic thermal layer enhancement Eduardo Valentin
2012-08-21 5:10 ` Eduardo Valentin
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=20120820154556.GC9833@besouro \
--to=eduardo.valentin@ti.com \
--cc=amit.kachhap@linaro.org \
--cc=durgadoss.r@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mjg@redhat.com \
--cc=rjw@sisk.pl \
--cc=rui.zhang@intel.com \
--cc=wni@nvidia.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).