Add notification calls for trip points that are being monitored for
falling temperatures.

Signed-off-by: Thara Gopinath <thara.gopin...@linaro.org>
---
 drivers/thermal/thermal_core.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 72bf159bcecc..bfd436379408 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -417,6 +417,7 @@ static void handle_critical_trips(struct 
thermal_zone_device *tz,
 static void handle_thermal_trip(struct thermal_zone_device *tz, int trip)
 {
        enum thermal_trip_type type;
+       enum thermal_trip_monitor_type mon_type;
        int trip_temp, hyst = 0;
 
        /* Ignore disabled trip points */
@@ -428,13 +429,25 @@ static void handle_thermal_trip(struct 
thermal_zone_device *tz, int trip)
        if (tz->ops->get_trip_hyst)
                tz->ops->get_trip_hyst(tz, trip, &hyst);
 
+       if (tz->ops->get_trip_mon_type)
+               tz->ops->get_trip_mon_type(tz, trip, &mon_type);
+
        if (tz->last_temperature != THERMAL_TEMP_INVALID) {
-               if (tz->last_temperature < trip_temp &&
-                   tz->temperature >= trip_temp)
-                       thermal_notify_tz_trip_up(tz->id, trip);
-               if (tz->last_temperature >= trip_temp &&
-                   tz->temperature < (trip_temp - hyst))
-                       thermal_notify_tz_trip_down(tz->id, trip);
+               if (mon_type == THERMAL_TRIP_MONITOR_FALLING) {
+                       if (tz->last_temperature > trip_temp &&
+                           tz->temperature <= trip_temp)
+                               thermal_notify_tz_trip_down(tz->id, trip);
+                       if (tz->last_temperature <= trip_temp &&
+                           tz->temperature > (trip_temp + hyst))
+                               thermal_notify_tz_trip_up(tz->id, trip);
+               } else {
+                       if (tz->last_temperature < trip_temp &&
+                           tz->temperature >= trip_temp)
+                               thermal_notify_tz_trip_up(tz->id, trip);
+                       if (tz->last_temperature >= trip_temp &&
+                           tz->temperature < (trip_temp - hyst))
+                               thermal_notify_tz_trip_down(tz->id, trip);
+               }
        }
 
        if (type == THERMAL_TRIP_CRITICAL || type == THERMAL_TRIP_HOT)
-- 
2.25.1

Reply via email to