For now, thermal governors other than step wise governorr do not support
monitoring of falling temperature. Hence, in case of calls to the governor
for trip points marked as THERMAL_TRIP_MONITOR_FALLING, return doing
nothing.

Signed-off-by: Thara Gopinath <thara.gopin...@linaro.org>
---
 drivers/thermal/gov_bang_bang.c       | 12 ++++++++++++
 drivers/thermal/gov_fair_share.c      | 12 ++++++++++++
 drivers/thermal/gov_power_allocator.c | 12 ++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/drivers/thermal/gov_bang_bang.c b/drivers/thermal/gov_bang_bang.c
index 991a1c54296d..a662047e5961 100644
--- a/drivers/thermal/gov_bang_bang.c
+++ b/drivers/thermal/gov_bang_bang.c
@@ -99,6 +99,18 @@ static void thermal_zone_trip_update(struct 
thermal_zone_device *tz, int trip)
 static int bang_bang_control(struct thermal_zone_device *tz, int trip)
 {
        struct thermal_instance *instance;
+       enum thermal_trip_monitor_type monitor_type =
+                                               THERMAL_TRIP_MONITOR_RISING;
+
+       /*
+        * Return doing nothing if the trip point is monitored for
+        * falling temperature
+        */
+       if (tz->ops->get_trip_mon_type) {
+               tz->ops->get_trip_mon_type(tz, trip, &monitor_type);
+               if (monitor_type == THERMAL_TRIP_MONITOR_FALLING)
+                       return 0;
+       }
 
        thermal_zone_trip_update(tz, trip);
 
diff --git a/drivers/thermal/gov_fair_share.c b/drivers/thermal/gov_fair_share.c
index aaa07180ab48..064ad6ed67ad 100644
--- a/drivers/thermal/gov_fair_share.c
+++ b/drivers/thermal/gov_fair_share.c
@@ -81,6 +81,18 @@ static int fair_share_throttle(struct thermal_zone_device 
*tz, int trip)
        int total_weight = 0;
        int total_instance = 0;
        int cur_trip_level = get_trip_level(tz);
+       enum thermal_trip_monitor_type monitor_type =
+                                               THERMAL_TRIP_MONITOR_RISING;
+
+       /*
+        * Return doing nothing if the trip point is monitored for
+        * falling temperature
+        */
+       if (tz->ops->get_trip_mon_type) {
+               tz->ops->get_trip_mon_type(tz, trip, &monitor_type);
+               if (monitor_type == THERMAL_TRIP_MONITOR_FALLING)
+                       return 0;
+       }
 
        list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
                if (instance->trip != trip)
diff --git a/drivers/thermal/gov_power_allocator.c 
b/drivers/thermal/gov_power_allocator.c
index 5cb518d8f156..0f674cd1b9b8 100644
--- a/drivers/thermal/gov_power_allocator.c
+++ b/drivers/thermal/gov_power_allocator.c
@@ -606,6 +606,8 @@ static int power_allocator_throttle(struct 
thermal_zone_device *tz, int trip)
 {
        int ret;
        int switch_on_temp, control_temp;
+       enum thermal_trip_monitor_type monitor_type =
+                                               THERMAL_TRIP_MONITOR_RISING;
        struct power_allocator_params *params = tz->governor_data;
 
        /*
@@ -615,6 +617,16 @@ static int power_allocator_throttle(struct 
thermal_zone_device *tz, int trip)
        if (trip != params->trip_max_desired_temperature)
                return 0;
 
+       /*
+        * Return doing nothing if the trip point is monitored for
+        * falling temperature
+        */
+       if (tz->ops->get_trip_mon_type) {
+               tz->ops->get_trip_mon_type(tz, trip, &monitor_type);
+               if (monitor_type == THERMAL_TRIP_MONITOR_FALLING)
+                       return 0;
+       }
+
        ret = tz->ops->get_trip_temp(tz, params->trip_switch_on,
                                     &switch_on_temp);
        if (!ret && (tz->temperature < switch_on_temp)) {
-- 
2.25.1

Reply via email to