From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Zhang Rui <rui.zhang@intel.com>, Amit Kachhap <amit.kachhap@linaro.org>
Cc: linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org,
Matthew Garrett <mjg@redhat.com>, Len Brown <lenb@kernel.org>,
R Durgadoss <durgadoss.r@intel.com>, Wei Ni <wni@nvidia.com>
Subject: Re: [PATCH 06/16] Thermal: set upper and lower limits
Date: Thu, 19 Jul 2012 22:55:43 +0200 [thread overview]
Message-ID: <201207192255.43570.rjw@sisk.pl> (raw)
In-Reply-To: <1342679480-5336-7-git-send-email-rui.zhang@intel.com>
On Thursday, July 19, 2012, Zhang Rui wrote:
> set upper and lower limits when binding
> a thermal cooling device to a thermal zone device.
>
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> ---
> Documentation/thermal/sysfs-api.txt | 6 ++++-
> drivers/acpi/thermal.c | 49 ++++++++++++++++++++++-------------
> drivers/platform/x86/acerhdf.c | 2 +-
> drivers/thermal/thermal_sys.c | 20 +++++++++-----
> include/linux/thermal.h | 3 ++-
> 5 files changed, 53 insertions(+), 27 deletions(-)
>
> diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt
> index b7b3609..f169821 100644
> --- a/Documentation/thermal/sysfs-api.txt
> +++ b/Documentation/thermal/sysfs-api.txt
> @@ -84,7 +84,7 @@ temperature) and throttle appropriate devices.
>
> 1.3 interface for binding a thermal zone device with a thermal cooling device
> 1.3.1 int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
> - int trip, struct thermal_cooling_device *cdev);
> + int trip, struct thermal_cooling_device *cdev, long upper, long lower);
>
> This interface function bind a thermal cooling device to the certain trip
> point of a thermal zone device.
> @@ -93,6 +93,10 @@ temperature) and throttle appropriate devices.
> cdev: thermal cooling device
> trip: indicates which trip point the cooling devices is associated with
> in this thermal zone.
> + upper:the Maximum cooling state for this trip point.
> + -1 means no upper limit, and the cooling device can be in max_state.
> + lower:the Minimum cooling state can be used for this trip point.
> + -1 means no lower limit, and the cooling device can be in cooling state 0.
If we have to use -1 (or all ones for unsigned long), I'd suggest to define a
constant called CS_NO_LIMIT or something like that and use it instead of the
plain numbers.
And perhaps change the name of the above to
thermal_zone_bind_cooling_device_limits() and define
thermal_zone_bind_cooling_device() as a static inline that will not take the
extra two arguments and make it call thermal_zone_bind_cooling_device_limits()
with the CS_NO_LIMIT values in there.
> 1.3.2 int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz,
> int trip, struct thermal_cooling_device *cdev);
> diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
> index 8275e7b..a7c97f5 100644
> --- a/drivers/acpi/thermal.c
> +++ b/drivers/acpi/thermal.c
> @@ -727,11 +727,9 @@ static int thermal_notify(struct thermal_zone_device *thermal, int trip,
> return 0;
> }
>
> -typedef int (*cb)(struct thermal_zone_device *, int,
> - struct thermal_cooling_device *);
> static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
> struct thermal_cooling_device *cdev,
> - cb action)
> + int bind)
Should 'bind' be a bool?
> {
> struct acpi_device *device = cdev->devdata;
> struct acpi_thermal *tz = thermal->devdata;
> @@ -755,11 +753,18 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
> i++) {
> handle = tz->trips.passive.devices.handles[i];
> status = acpi_bus_get_device(handle, &dev);
> - if (ACPI_SUCCESS(status) && (dev == device)) {
> - result = action(thermal, trip, cdev);
> - if (result)
> - goto failed;
> - }
> + if (ACPI_FAILURE(status) || dev != device)
> + continue;
> + if (bind)
> + result =
> + thermal_zone_bind_cooling_device
> + (thermal, trip, cdev, -1, -1);
> + else
> + result =
> + thermal_zone_unbind_cooling_device
> + (thermal, trip, cdev);
> + if (result)
> + goto failed;
> }
> }
>
> @@ -772,11 +777,16 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
> j++) {
> handle = tz->trips.active[i].devices.handles[j];
> status = acpi_bus_get_device(handle, &dev);
> - if (ACPI_SUCCESS(status) && (dev == device)) {
> - result = action(thermal, trip, cdev);
> - if (result)
> - goto failed;
> - }
> + if (ACPI_FAILURE(status) || dev != device)
> + continue;
> + if (bind)
> + result = thermal_zone_bind_cooling_device
> + (thermal, trip, cdev, -1, -1);
> + else
> + result = thermal_zone_unbind_cooling_device
> + (thermal, trip, cdev);
> + if (result)
> + goto failed;
> }
> }
>
> @@ -784,7 +794,12 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal,
> handle = tz->devices.handles[i];
> status = acpi_bus_get_device(handle, &dev);
> if (ACPI_SUCCESS(status) && (dev == device)) {
> - result = action(thermal, -1, cdev);
> + if (bind)
> + result = thermal_zone_bind_cooling_device
> + (thermal, -1, cdev, -1, -1);
> + else
> + result = thermal_zone_unbind_cooling_device
> + (thermal, -1, cdev);
> if (result)
> goto failed;
> }
> @@ -798,16 +813,14 @@ static int
> acpi_thermal_bind_cooling_device(struct thermal_zone_device *thermal,
> struct thermal_cooling_device *cdev)
> {
> - return acpi_thermal_cooling_device_cb(thermal, cdev,
> - thermal_zone_bind_cooling_device);
> + return acpi_thermal_cooling_device_cb(thermal, cdev, 1);
> }
>
> static int
> acpi_thermal_unbind_cooling_device(struct thermal_zone_device *thermal,
> struct thermal_cooling_device *cdev)
> {
> - return acpi_thermal_cooling_device_cb(thermal, cdev,
> - thermal_zone_unbind_cooling_device);
> + return acpi_thermal_cooling_device_cb(thermal, cdev, 0);
> }
>
> static const struct thermal_zone_device_ops acpi_thermal_zone_ops = {
> diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
> index 39abb15..278aa0e 100644
> --- a/drivers/platform/x86/acerhdf.c
> +++ b/drivers/platform/x86/acerhdf.c
> @@ -329,7 +329,7 @@ static int acerhdf_bind(struct thermal_zone_device *thermal,
> if (cdev != cl_dev)
> return 0;
>
> - if (thermal_zone_bind_cooling_device(thermal, 0, cdev)) {
> + if (thermal_zone_bind_cooling_device(thermal, 0, cdev, -1, -1)) {
> pr_err("error binding cooling dev\n");
> return -EINVAL;
> }
> diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
> index 4267a49..db35300 100644
> --- a/drivers/thermal/thermal_sys.c
> +++ b/drivers/thermal/thermal_sys.c
> @@ -316,7 +316,7 @@ passive_store(struct device *dev, struct device_attribute *attr,
> sizeof("Processor")))
> thermal_zone_bind_cooling_device(tz,
> THERMAL_TRIPS_NONE,
> - cdev);
> + cdev, -1, -1);
> }
> mutex_unlock(&thermal_list_lock);
> if (!tz->passive_delay)
> @@ -801,7 +801,8 @@ static void thermal_zone_device_check(struct work_struct *work)
> */
> int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
> int trip,
> - struct thermal_cooling_device *cdev)
> + struct thermal_cooling_device *cdev,
> + long upper, long lower)
upper and lower were unsigned long in the previous patch. Can we please
use the same data type for them everywhere?
> {
> struct thermal_cooling_device_instance *dev;
> struct thermal_cooling_device_instance *pos;
> @@ -825,6 +826,15 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
> if (tz != pos1 || cdev != pos2)
> return -EINVAL;
>
> + cdev->ops->get_max_state(cdev, &max_state);
> +
> + /* lower default 0, upper default max_state */
> + lower = lower < 0 ? 0 : lower;
> + upper = upper < 0 ? max_state : upper;
> +
> + if (lower > upper || upper > max_state)
> + return -EINVAL;
> +
> dev =
> kzalloc(sizeof(struct thermal_cooling_device_instance), GFP_KERNEL);
> if (!dev)
> @@ -832,10 +842,8 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
> dev->tz = tz;
> dev->cdev = cdev;
> dev->trip = trip;
> -
> - cdev->ops->get_max_state(dev, &max_state);
> - dev->upper = max_state;
> - dev->lower = 0;
> + dev->upper = upper;
> + dev->lower = lower;
>
> result = get_idr(&tz->idr, &tz->lock, &dev->id);
> if (result)
> diff --git a/include/linux/thermal.h b/include/linux/thermal.h
> index cfc8d90..b355c62 100644
> --- a/include/linux/thermal.h
> +++ b/include/linux/thermal.h
> @@ -157,7 +157,8 @@ struct thermal_zone_device *thermal_zone_device_register(char *, int, int,
> void thermal_zone_device_unregister(struct thermal_zone_device *);
>
> int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
> - struct thermal_cooling_device *);
> + struct thermal_cooling_device *,
> + long, long);
> int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int,
> struct thermal_cooling_device *);
> void thermal_zone_device_update(struct thermal_zone_device *);
>
Thanks,
Rafael
next prev parent reply other threads:[~2012-07-19 20:50 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-19 6:31 [PATCH 00/16] Thermal: generic thermal layer enhancement Zhang Rui
2012-07-19 6:31 ` [PATCH 01/16] Thermal: Make Thermal trip points writeable Zhang Rui
2012-07-19 10:35 ` R, Durgadoss
2012-07-19 19:38 ` Rafael J. Wysocki
2012-07-23 8:11 ` Zhang Rui
2012-07-19 20:27 ` Rafael J. Wysocki
2012-07-23 8:22 ` Zhang Rui
2012-07-23 10:25 ` Rafael J. Wysocki
2012-07-19 6:31 ` [PATCH 02/16] Thermal: Add Hysteresis attributes Zhang Rui
2012-07-19 10:40 ` R, Durgadoss
2012-07-19 20:00 ` Rafael J. Wysocki
2012-07-19 6:31 ` [PATCH 03/16] Thermal: Documentation update Zhang Rui
2012-07-19 10:51 ` R, Durgadoss
2012-07-23 8:36 ` Zhang Rui
2012-07-19 6:31 ` [PATCH 04/16] Thermal: Introduce multiple cooling states support Zhang Rui
2012-07-19 6:31 ` [PATCH 05/16] Thermal: Introduce cooling states range support Zhang Rui
2012-07-19 6:31 ` [PATCH 06/16] Thermal: set upper and lower limits Zhang Rui
2012-07-19 20:55 ` Rafael J. Wysocki [this message]
2012-07-23 8:45 ` Zhang Rui
2012-07-23 19:15 ` Rafael J. Wysocki
2012-07-19 6:31 ` [PATCH 07/16] Thermal: Introduce .get_trend() callback Zhang Rui
2012-07-19 21:13 ` Rafael J. Wysocki
2012-07-24 1:42 ` Zhang Rui
2012-07-24 9:22 ` Rafael J. Wysocki
2012-07-19 22:09 ` Jacob Pan
2012-07-20 9:53 ` Rafael J. Wysocki
2012-07-20 16:12 ` Jacob Pan
2012-07-19 6:31 ` [PATCH 08/16] Thermal: Remove tc1/tc2 in generic thermal layer Zhang Rui
2012-07-19 6:31 ` [PATCH 09/16] Thermal: Introduce thermal_zone_trip_update() Zhang Rui
2012-07-19 21:19 ` Rafael J. Wysocki
2012-07-24 1:47 ` Zhang Rui
2012-07-24 9:27 ` Rafael J. Wysocki
2012-07-25 1:38 ` Zhang Rui
2012-07-25 11:07 ` Rafael J. Wysocki
2012-07-26 0:49 ` Zhang Rui
[not found] ` <CAK44p21hNYGH4YkH5E+XK-pM2upingQbvm77WkJbttCRp6ZamQ@mail.gmail.com>
2012-07-24 7:11 ` Zhang Rui
2012-07-24 8:06 ` Amit Kachhap
2012-07-26 5:08 ` Zhang Rui
2012-07-26 6:01 ` R, Durgadoss
2012-07-24 7:57 ` Amit Kachhap
2012-07-19 6:31 ` [PATCH 10/16] Thermal: rename structure thermal_cooling_device_instance to thermal_instance Zhang Rui
2012-07-19 6:31 ` [PATCH 11/16] Thermal: Rename thermal_zone_device.cooling_devices to thermal_zone_device.instances Zhang Rui
2012-07-19 21:22 ` Rafael J. Wysocki
2012-07-24 1:48 ` Zhang Rui
2012-07-19 6:31 ` [PATCH 12/16] Thermal: Rename thermal_instance.node to thermal_instance.tz_node Zhang Rui
2012-07-19 6:31 ` [PATCH 13/16] Thermal: List thermal_instance in thermal_cooling_device Zhang Rui
2012-07-19 21:25 ` Rafael J. Wysocki
2012-07-24 1:48 ` Zhang Rui
2012-07-19 6:31 ` [PATCH 14/16] Thermal: Introduce simple arbitrator for setting device cooling state Zhang Rui
2012-07-19 21:39 ` Rafael J. Wysocki
2012-07-24 1:49 ` Zhang Rui
2012-07-19 6:31 ` [PATCH 15/16] Thermal: Unify the code for both active and passive cooling Zhang Rui
2012-07-19 6:31 ` [PATCH 16/16] Thermal: use plist instead of list Zhang Rui
2012-07-19 21:45 ` Rafael J. Wysocki
2012-07-24 2:13 ` Zhang Rui
2012-07-19 6:37 ` [PATCH 00/16] Thermal: generic thermal layer enhancement Zhang Rui
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=201207192255.43570.rjw@sisk.pl \
--to=rjw@sisk.pl \
--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=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).