This patch adds a new trip type THERMAL_TRIP_STATE_INSTANCE. This
trip behaves same as THERMAL_TRIP_ACTIVE but also passes the cooling
device instance number. This helps the cooling device registered as
different instances to perform appropriate cooling action decision in
the set_cur_state call back function.

Also since the trip temperature's are in ascending order so some logic
is put in place to skip the un-necessary checks.

Signed-off-by: Amit Daniel Kachhap <amit.kach...@linaro.org>
---
 Documentation/thermal/sysfs-api.txt |    4 +-
 drivers/thermal/thermal_sys.c       |   45 ++++++++++++++++++++++++++++++++--
 include/linux/thermal.h             |    1 +
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/Documentation/thermal/sysfs-api.txt 
b/Documentation/thermal/sysfs-api.txt
index 1733ab9..9a7c69c 100644
--- a/Documentation/thermal/sysfs-api.txt
+++ b/Documentation/thermal/sysfs-api.txt
@@ -184,8 +184,8 @@ trip_point_[0-*]_temp
 
 trip_point_[0-*]_type
        Strings which indicate the type of the trip point.
-       E.g. it can be one of critical, hot, passive, active[0-*] for ACPI
-       thermal zone.
+       E.g. it can be one of critical, hot, passive, active[0-1],
+       state-instance[0-*] for ACPI thermal zone.
        RO, Optional
 
 cdev[0-*]
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 220ce7e..9fc2150 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -192,6 +192,8 @@ trip_point_type_show(struct device *dev, struct 
device_attribute *attr,
                return sprintf(buf, "passive\n");
        case THERMAL_TRIP_ACTIVE:
                return sprintf(buf, "active\n");
+       case THERMAL_TRIP_STATE_INSTANCE:
+               return sprintf(buf, "state-instance\n");
        default:
                return sprintf(buf, "unknown\n");
        }
@@ -1034,10 +1036,10 @@ EXPORT_SYMBOL(thermal_cooling_device_unregister);
 
 void thermal_zone_device_update(struct thermal_zone_device *tz)
 {
-       int count, ret = 0;
-       long temp, trip_temp;
+       int count, ret = 0, inst_id;
+       long temp, trip_temp, max_state, last_trip_change = 0;
        enum thermal_trip_type trip_type;
-       struct thermal_cooling_device_instance *instance;
+       struct thermal_cooling_device_instance *instance, *state_instance;
        struct thermal_cooling_device *cdev;
 
        mutex_lock(&tz->lock);
@@ -1086,6 +1088,43 @@ void thermal_zone_device_update(struct 
thermal_zone_device *tz)
                                        cdev->ops->set_cur_state(cdev, 0);
                        }
                        break;
+               case THERMAL_TRIP_STATE_INSTANCE:
+                       list_for_each_entry(instance, &tz->cooling_devices,
+                                           node) {
+                               if (instance->trip != count)
+                                       continue;
+
+                               if (temp <= last_trip_change)
+                                       continue;
+
+                               inst_id = 0;
+                               /*
+                               *For this instance how many instance of same
+                               *cooling device occured before
+                               */
+
+                               list_for_each_entry(state_instance,
+                                               &tz->cooling_devices, node) {
+                                       if (instance->cdev ==
+                                                       state_instance->cdev)
+                                               inst_id++;
+                                       if (state_instance->trip == count)
+                                               break;
+                               }
+
+                               cdev = instance->cdev;
+                               cdev->ops->get_max_state(cdev, &max_state);
+
+                               if ((temp >= trip_temp) &&
+                                               (inst_id <= max_state))
+                                       cdev->ops->set_cur_state(cdev, inst_id);
+                               else if ((temp < trip_temp) &&
+                                               (--inst_id <= max_state))
+                                       cdev->ops->set_cur_state(cdev, inst_id);
+
+                               last_trip_change = trip_temp;
+                       }
+                       break;
                case THERMAL_TRIP_PASSIVE:
                        if (temp >= trip_temp || tz->passive)
                                thermal_zone_device_passive(tz, temp,
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 796f1ff..583fbda 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -42,6 +42,7 @@ enum thermal_trip_type {
        THERMAL_TRIP_PASSIVE,
        THERMAL_TRIP_HOT,
        THERMAL_TRIP_CRITICAL,
+       THERMAL_TRIP_STATE_INSTANCE,
 };
 
 struct thermal_zone_device_ops {
-- 
1.7.1

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

Reply via email to