thermal: trip: Send trip change notifications on all trip updates

The _store callbacks of the trip point temperature and hysteresis sysfs
attributes invoke thermal_notify_tz_trip_change() to send a notification
regarding the trip point change, but when trip points are updated by the
platform firmware, trip point change notifications are not sent.

To make the behavior after a trip point change more consistent,
modify all of the 3 places where trip point temperature is updated
to use a new function called thermal_zone_set_trip_temp() for this
purpose and make that function call thermal_notify_tz_trip_change().

Note that trip point hysteresis can only be updated via sysfs and
trip_point_hyst_store() calls thermal_notify_tz_trip_change() already,
so this code path need not be changed.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index f74d81abdbfc073aa68273e786a11cabfa826f2e..3e679e9feec5df48baeafc23de1163f7a31d366b 100644 (file)
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -297,6 +297,7 @@ static int acpi_thermal_adjust_trip(struct thermal_trip *trip, void *data)
        struct acpi_thermal_trip *acpi_trip = trip->priv;
        struct adjust_trip_data *atd = data;
        struct acpi_thermal *tz = atd->tz;
+       int temp;
 
        if (!acpi_trip || !acpi_thermal_trip_valid(acpi_trip))
                return 0;
@@ -307,9 +308,11 @@ static int acpi_thermal_adjust_trip(struct thermal_trip *trip, void *data)
                acpi_thermal_update_trip_devices(tz, trip);
 
        if (acpi_thermal_trip_valid(acpi_trip))
-               trip->temperature = acpi_thermal_temp(tz, acpi_trip->temp_dk);
+               temp = acpi_thermal_temp(tz, acpi_trip->temp_dk);
        else
-               trip->temperature = THERMAL_TEMP_INVALID;
+               temp = THERMAL_TEMP_INVALID;
+
+       thermal_zone_set_trip_temp(tz->thermal_zone, trip, temp);
 
        return 0;
 }

diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
index a03b67579dd9d68835dc32a7bdf6fd4d74ccc164..3e4bfe817fac278de8a8ebae9cf08316728c6278 100644 (file)
--- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
+++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
@@ -225,7 +225,8 @@ EXPORT_SYMBOL_GPL(int340x_thermal_zone_remove);
 
 static int int340x_update_one_trip(struct thermal_trip *trip, void *arg)
 {
-       struct acpi_device *zone_adev = arg;
+       struct int34x_thermal_zone *int34x_zone = arg;
+       struct acpi_device *zone_adev = int34x_zone->adev;
        int temp, err;
 
        switch (trip->type) {
@@ -249,14 +250,15 @@ static int int340x_update_one_trip(struct thermal_trip *trip, void *arg)
        if (err)
                temp = THERMAL_TEMP_INVALID;
 
-       trip->temperature = temp;
+       thermal_zone_set_trip_temp(int34x_zone->zone, trip, temp);
+
        return 0;
 }
 
 void int340x_thermal_update_trips(struct int34x_thermal_zone *int34x_zone)
 {
        thermal_zone_for_each_trip(int34x_zone->zone, int340x_update_one_trip,
-                                  int34x_zone->adev);
+                                  int34x_zone);
 }
 EXPORT_SYMBOL_GPL(int340x_thermal_update_trips);
 

diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index f52af8a3b4b523263ffc2add0ed0397bd85eb4aa..d8ff74a4338a4f01eb678ddc6a2188d808b64fdd 100644 (file)
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -129,9 +129,9 @@ trip_point_temp_store(struct device *dev, struct device_attribute *attr,
                                goto unlock;
                }
 
-               trip->temperature = temp;
+               thermal_zone_set_trip_temp(tz, trip, temp);
 
-               thermal_zone_trip_updated(tz, trip);
+               __thermal_zone_device_update(tz, THERMAL_TRIP_CHANGED);
        }
 
 unlock:

diff --git a/drivers/thermal/thermal_trip.c b/drivers/thermal/thermal_trip.c
index 581f1cd883e58e7149d139b3ac3013dd833c723b..a1ad345c07412d2c71a7e417164f3b26b0ad085f 100644 (file)
--- a/drivers/thermal/thermal_trip.c
+++ b/drivers/thermal/thermal_trip.c
@@ -152,7 +152,6 @@ int thermal_zone_trip_id(struct thermal_zone_device *tz,
         */
        return trip - tz->trips;
 }
-
 void thermal_zone_trip_updated(struct thermal_zone_device *tz,
                               const struct thermal_trip *trip)
 {
@@ -161,3 +160,16 @@ void thermal_zone_trip_updated(struct thermal_zone_device *tz,
                                      trip->hysteresis);
        __thermal_zone_device_update(tz, THERMAL_TRIP_CHANGED);
 }
+
+void thermal_zone_set_trip_temp(struct thermal_zone_device *tz,
+                               struct thermal_trip *trip, int temp)
+{
+       if (trip->temperature == temp)
+               return;
+
+       trip->temperature = temp;
+       thermal_notify_tz_trip_change(tz->id, thermal_zone_trip_id(tz, trip),
+                                     trip->type, trip->temperature,
+                                     trip->hysteresis);
+}
+EXPORT_SYMBOL_GPL(thermal_zone_set_trip_temp);

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index bedbaec9a42e1689784eaf98c8964016ac0ae929..09f6eb82c191c1e8bac75b0333beb90730728da1 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -291,6 +291,8 @@ int thermal_zone_for_each_trip(struct thermal_zone_device *tz,
                               int (*cb)(struct thermal_trip *, void *),
                               void *data);
 int thermal_zone_get_num_trips(struct thermal_zone_device *tz);
+void thermal_zone_set_trip_temp(struct thermal_zone_device *tz,
+                               struct thermal_trip *trip, int temp);
 
 int thermal_zone_get_crit_temp(struct thermal_zone_device *tz, int *temp);