From: Zhang Rui <rui.zhang@intel.com>
To: linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org
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@intel.com>,
Amit Kachhap <amit.kachhap@linaro.org>, Wei Ni <wni@nvidia.com>,
Zhang Rui <rui.zhang@intel.com>
Subject: [PATCH 04/16] Thermal: Introduce multiple cooling states support
Date: Thu, 19 Jul 2012 14:31:08 +0800 [thread overview]
Message-ID: <1342679480-5336-5-git-send-email-rui.zhang@intel.com> (raw)
In-Reply-To: <1342679480-5336-1-git-send-email-rui.zhang@intel.com>
This is because general active cooling devices, like fans,
may have multiple speeds, which can be mapped to different cooling states.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
drivers/thermal/thermal_sys.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 95e0d63..63927e3 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -1059,6 +1059,7 @@ void thermal_zone_device_update(struct thermal_zone_device *tz)
enum thermal_trip_type trip_type;
struct thermal_cooling_device_instance *instance;
struct thermal_cooling_device *cdev;
+ unsigned long cur_state, max_state;
mutex_lock(&tz->lock);
@@ -1098,10 +1099,17 @@ void thermal_zone_device_update(struct thermal_zone_device *tz)
cdev = instance->cdev;
+ cdev->ops->get_cur_state(cdev, &cur_state);
+ cdev->ops->get_max_state(cdev, &max_state);
+
if (temp >= trip_temp)
- cdev->ops->set_cur_state(cdev, 1);
+ cur_state = cur_state < max_state ?
+ (cur_state + 1) : max_state;
else
- cdev->ops->set_cur_state(cdev, 0);
+ cur_state = cur_state > 0 ?
+ (cur_state - 1) : 0;
+
+ cdev->ops->set_cur_state(cdev, cur_state);
}
break;
case THERMAL_TRIP_PASSIVE:
--
1.7.9.5
next prev parent reply other threads:[~2012-07-19 6:31 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 ` Zhang Rui [this message]
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
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=1342679480-5336-5-git-send-email-rui.zhang@intel.com \
--to=rui.zhang@intel.com \
--cc=amit.kachhap@linaro.org \
--cc=durgadoss.r@intel.com \
--cc=eduardo.valentin@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=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).