thermal: core: Add notifications call in the framework

The generic netlink protocol is implemented but the different
notification functions are not yet connected to the core code.

These changes add the notification calls in the different
corresponding places.

Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Link: https://lore.kernel.org/r/20200706105538.2159-4-daniel.lezcano@linaro.org

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index fc1270c8ce11fdf8e1fe6cfbcd05abcbc038fe17..750a89f0c20a50e5cad7154abc96ba141ef1c63f 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -215,6 +215,8 @@ exit:
        mutex_unlock(&tz->lock);
        mutex_unlock(&thermal_governor_lock);
 
+       thermal_notify_tz_gov_change(tz->id, policy);
+
        return ret;
 }
 
@@ -415,12 +417,25 @@ 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;
+       int trip_temp, hyst = 0;
 
        /* Ignore disabled trip points */
        if (test_bit(trip, &tz->trips_disabled))
                return;
 
+       tz->ops->get_trip_temp(tz, trip, &trip_temp);
        tz->ops->get_trip_type(tz, trip, &type);
+       if (tz->ops->get_trip_hyst)
+               tz->ops->get_trip_hyst(tz, trip, &hyst);
+
+       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 (type == THERMAL_TRIP_CRITICAL || type == THERMAL_TRIP_HOT)
                handle_critical_trips(tz, trip, type);
@@ -452,6 +467,8 @@ static void update_temperature(struct thermal_zone_device *tz)
        mutex_unlock(&tz->lock);
 
        trace_thermal_temperature(tz);
+
+       thermal_genl_sampling_temp(tz->id, temp);
 }
 
 static void thermal_zone_device_init(struct thermal_zone_device *tz)
@@ -1469,6 +1486,8 @@ thermal_zone_device_register(const char *type, int trips, int mask,
        if (atomic_cmpxchg(&tz->need_update, 1, 0))
                thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
 
+       thermal_notify_tz_create(tz->id, tz->type);
+
        return tz;
 
 unregister:
@@ -1540,6 +1559,8 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
        ida_destroy(&tz->ida);
        mutex_destroy(&tz->lock);
        device_unregister(&tz->device);
+
+       thermal_notify_tz_delete(tz->id);
 }
 EXPORT_SYMBOL_GPL(thermal_zone_device_unregister);
 

diff --git a/drivers/thermal/thermal_helpers.c b/drivers/thermal/thermal_helpers.c
index 87b1256fa2f206a03b6eb19f07d9203ae0677cfa..c94bc824e5d36ab34594cc35e0bcf2444efc85d9 100644 (file)
--- a/drivers/thermal/thermal_helpers.c
+++ b/drivers/thermal/thermal_helpers.c
@@ -175,6 +175,16 @@ exit:
        mutex_unlock(&tz->lock);
 }
 
+static void thermal_cdev_set_cur_state(struct thermal_cooling_device *cdev,
+                                      int target)
+{
+       if (cdev->ops->set_cur_state(cdev, target))
+               return;
+
+       thermal_notify_cdev_state_update(cdev->id, target);
+       thermal_cooling_device_stats_update(cdev, target);
+}
+
 void thermal_cdev_update(struct thermal_cooling_device *cdev)
 {
        struct thermal_instance *instance;
@@ -197,8 +207,7 @@ void thermal_cdev_update(struct thermal_cooling_device *cdev)
                        target = instance->target;
        }
 
-       if (!cdev->ops->set_cur_state(cdev, target))
-               thermal_cooling_device_stats_update(cdev, target);
+       thermal_cdev_set_cur_state(cdev, target);
 
        cdev->updated = true;
        mutex_unlock(&cdev->lock);

diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index c23d67c4dc4e1f1772f5ebc034c73faea3ff2d20..8c231219e15dd088699ce6fb2c1a113db1351f9a 100644 (file)
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -112,7 +112,8 @@ trip_point_temp_store(struct device *dev, struct device_attribute *attr,
 {
        struct thermal_zone_device *tz = to_thermal_zone(dev);
        int trip, ret;
-       int temperature;
+       int temperature, hyst = 0;
+       enum thermal_trip_type type;
 
        if (!tz->ops->set_trip_temp)
                return -EPERM;
@@ -127,6 +128,18 @@ trip_point_temp_store(struct device *dev, struct device_attribute *attr,
        if (ret)
                return ret;
 
+       if (tz->ops->get_trip_hyst) {
+               ret = tz->ops->get_trip_hyst(tz, trip, &hyst);
+               if (ret)
+                       return ret;
+       }
+
+       ret = tz->ops->get_trip_type(tz, trip, &type);
+       if (ret)
+               return ret;
+
+       thermal_notify_tz_trip_change(tz->id, trip, type, temperature, hyst);
+
        thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
 
        return count;