Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

thermal: step_wise: set throttle target within thermal instance limits

Browse source 
When selecting a target cooling state in get_target_state(), make sure
that the state is at least as high as the minimum when the temperature
is rising and at least as low as the maximum when the temperature is
falling.  This is necessary because, in the THREAML_TREND_RAISING and
THERMAL_TREND_DROPPING cases, the current state may only be incremented
or decremented by one even if it is outside the bounds of the thermal
instance.  This might occur, for example, if the CPU is heating up
and hits a thermal trip point for the first time when it's frequency
is much higher than the range specified by the thermal instance
corresponding to the trip point.

Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
This commit is contained in:
Andrew Bresticker 2013-04-09 21:59:47 +00:00 committed by Zhang Rui
parent 8837295a73
commit e79fe642cc
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/thermal/step_wise.c
View file

@ -59,9 +59,12 @@ static unsigned long get_target_state(struct thermal_instance *instance,
switch (trend) {
case THERMAL_TREND_RAISING:
if (throttle)
if (throttle) {
cur_state = cur_state < instance->upper ?
(cur_state + 1) : instance->upper;
if (cur_state < instance->lower)
cur_state = instance->lower;
}
break;
case THERMAL_TREND_RAISE_FULL:
if (throttle)
@ -71,8 +74,11 @@ static unsigned long get_target_state(struct thermal_instance *instance,
if (cur_state == instance->lower) {
if (!throttle)
cur_state = -1;
} else
} else {
cur_state -= 1;
if (cur_state > instance->upper)
cur_state = instance->upper;
}
break;
case THERMAL_TREND_DROP_FULL:
if (cur_state == instance->lower) {