evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Introduce THERMAL_TREND_RAISE/DROP_FULL support for step_wise governor

Browse source 
step_wise governor should set the device cooling state to
upper/lower limit directly when THERMAL_TREND_RAISE/DROP_FULL.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
This commit is contained in:
Zhang Rui 2012-11-19 16:10:20 +08:00
parent d069015e26
commit 3dbfff3dfe
1 changed files with 46 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
drivers/thermal/step_wise.c
View file

@ -35,21 +35,54 @@
* state for this trip point * state for this trip point
* b. if the trend is THERMAL_TREND_DROPPING, use lower cooling * b. if the trend is THERMAL_TREND_DROPPING, use lower cooling
* state for this trip point * state for this trip point
* c. if the trend is THERMAL_TREND_RAISE_FULL, use upper limit
* for this trip point
* d. if the trend is THERMAL_TREND_DROP_FULL, use lower limit
* for this trip point
* If the temperature is lower than a trip point,
* a. if the trend is THERMAL_TREND_RAISING, do nothing
* b. if the trend is THERMAL_TREND_DROPPING, use lower cooling
* state for this trip point, if the cooling state already
* equals lower limit, deactivate the thermal instance
* c. if the trend is THERMAL_TREND_RAISE_FULL, do nothing
* d. if the trend is THERMAL_TREND_DROP_FULL, use lower limit,
* if the cooling state already equals lower limit,
* deactive the thermal instance
*/ */
static unsigned long get_target_state(struct thermal_instance *instance, static unsigned long get_target_state(struct thermal_instance *instance,
enum thermal_trend trend) enum thermal_trend trend, bool throttle)
{ {
struct thermal_cooling_device *cdev = instance->cdev; struct thermal_cooling_device *cdev = instance->cdev;
unsigned long cur_state; unsigned long cur_state;
cdev->ops->get_cur_state(cdev, &cur_state); cdev->ops->get_cur_state(cdev, &cur_state);
if (trend == THERMAL_TREND_RAISING) { switch (trend) {
case THERMAL_TREND_RAISING:
if (throttle)
cur_state = cur_state < instance->upper ? cur_state = cur_state < instance->upper ?
(cur_state + 1) : instance->upper; (cur_state + 1) : instance->upper;
} else if (trend == THERMAL_TREND_DROPPING) { break;
cur_state = cur_state > instance->lower ? case THERMAL_TREND_RAISE_FULL:
(cur_state - 1) : instance->lower; if (throttle)
cur_state = instance->upper;
break;
case THERMAL_TREND_DROPPING:
if (cur_state == instance->lower) {
if (!throttle)
cur_state = -1;
} else
cur_state -= 1;
break;
case THERMAL_TREND_DROP_FULL:
if (cur_state == instance->lower) {
if (!throttle)
cur_state = -1;
} else
cur_state = instance->lower;
break;
default:
break;
} }
return cur_state; return cur_state;
@ -76,7 +109,7 @@ static void update_instance_for_throttle(struct thermal_zone_device *tz,
if (instance->trip != trip) if (instance->trip != trip)
continue; continue;
instance->target = get_target_state(instance, trend); instance->target = get_target_state(instance, trend, true);
/* Activate a passive thermal instance */ /* Activate a passive thermal instance */
if (instance->target == THERMAL_NO_TARGET) if (instance->target == THERMAL_NO_TARGET)
@ -87,28 +120,23 @@ static void update_instance_for_throttle(struct thermal_zone_device *tz,
} }
static void update_instance_for_dethrottle(struct thermal_zone_device *tz, static void update_instance_for_dethrottle(struct thermal_zone_device *tz,
int trip, enum thermal_trip_type trip_type) int trip, enum thermal_trip_type trip_type,
enum thermal_trend trend)
{ {
struct thermal_instance *instance; struct thermal_instance *instance;
struct thermal_cooling_device *cdev;
unsigned long cur_state;
list_for_each_entry(instance, &tz->thermal_instances, tz_node) { list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
if (instance->trip != trip || if (instance->trip != trip ||
instance->target == THERMAL_NO_TARGET) instance->target == THERMAL_NO_TARGET)
continue; continue;
cdev = instance->cdev; instance->target = get_target_state(instance, trend, false);
cdev->ops->get_cur_state(cdev, &cur_state);
instance->target = cur_state > instance->lower ?
(cur_state - 1) : THERMAL_NO_TARGET;
/* Deactivate a passive thermal instance */ /* Deactivate a passive thermal instance */
if (instance->target == THERMAL_NO_TARGET) if (instance->target == THERMAL_NO_TARGET)
update_passive_instance(tz, trip_type, -1); update_passive_instance(tz, trip_type, -1);
cdev->updated = false; /* cdev needs update */ instance->cdev->updated = false; /* cdev needs update */
} }
} }
@ -133,7 +161,7 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)
if (tz->temperature >= trip_temp) if (tz->temperature >= trip_temp)
update_instance_for_throttle(tz, trip, trip_type, trend); update_instance_for_throttle(tz, trip, trip_type, trend);
else else
update_instance_for_dethrottle(tz, trip, trip_type); update_instance_for_dethrottle(tz, trip, trip_type, trend);
mutex_unlock(&tz->lock); mutex_unlock(&tz->lock);
} }