diff mbox

[RESEND,04/16] Thermal: Introduce multiple cooling states support

Message ID 1343182273-32096-5-git-send-email-rui.zhang@intel.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Zhang Rui July 25, 2012, 2:11 a.m. UTC
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(-)

Comments

Rafael Wysocki July 25, 2012, 8:06 p.m. UTC | #1
On Wednesday, July 25, 2012, Zhang Rui wrote:
> 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>

Reviewed-by: Rafael J. Wysocki <rjw@sisk.pl>

> ---
>  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 2d7a9fe..05f42cd 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:
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Zhang Rui July 26, 2012, 2:33 a.m. UTC | #2
On ?, 2012-07-25 at 22:06 +0200, Rafael J. Wysocki wrote:
> On Wednesday, July 25, 2012, Zhang Rui wrote:
> > 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>
> 
> Reviewed-by: Rafael J. Wysocki <rjw@sisk.pl>
> 
again, thanks for reviewing this patch set, Rafael!

-rui

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 2d7a9fe..05f42cd 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: