thermal: core: Move threshold out of struct thermal_trip

The threshold field in struct thermal_trip is only used internally by
the thermal core and it is better to prevent drivers from misusing it.
It also takes some space unnecessarily in the trip tables passed by
drivers to the core during thermal zone registration.

For this reason, introduce struct thermal_trip_desc as a wrapper around
struct thermal_trip, move the threshold field directly into it and make
the thermal core store struct thermal_trip_desc objects in the internal
thermal zone trip tables.  Adjust all of the code using trip tables in
the thermal core accordingly.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>

diff --git a/drivers/thermal/gov_fair_share.c b/drivers/thermal/gov_fair_share.c
index 4da25a0009d73dfc8e7a623880a0e2d955353a09..6ef8cfde7749a9019ce63df561cf342463c96c66 100644 (file)
--- a/drivers/thermal/gov_fair_share.c
+++ b/drivers/thermal/gov_fair_share.c
@@ -17,10 +17,13 @@
 
 static int get_trip_level(struct thermal_zone_device *tz)
 {
-       const struct thermal_trip *trip, *level_trip = NULL;
+       const struct thermal_trip *level_trip = NULL;
+       const struct thermal_trip_desc *td;
        int trip_level = -1;
 
-       for_each_trip(tz, trip) {
+       for_each_trip_desc(tz, td) {
+               const struct thermal_trip *trip = &td->trip;
+
                if (trip->temperature >= tz->temperature)
                        continue;
 

diff --git a/drivers/thermal/gov_power_allocator.c b/drivers/thermal/gov_power_allocator.c
index e25e48d76aa79c843e6873fa2ee8bc1a830bc7f5..ac1d02193a1bf1329fdd3203063d7e044cf2f0ef 100644 (file)
--- a/drivers/thermal/gov_power_allocator.c
+++ b/drivers/thermal/gov_power_allocator.c
@@ -496,9 +496,11 @@ static void get_governor_trips(struct thermal_zone_device *tz,
        const struct thermal_trip *first_passive = NULL;
        const struct thermal_trip *last_passive = NULL;
        const struct thermal_trip *last_active = NULL;
-       const struct thermal_trip *trip;
+       const struct thermal_trip_desc *td;
+
+       for_each_trip_desc(tz, td) {
+               const struct thermal_trip *trip = &td->trip;
 
-       for_each_trip(tz, trip) {
                switch (trip->type) {
                case THERMAL_TRIP_PASSIVE:
                        if (!first_passive) {

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 34a31bc7202302eb0094ce4a93428ca9f0a719fc..fc6ff0a4faa1d1537a737ced1def1decd0fc7ae1 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -361,17 +361,19 @@ static void handle_critical_trips(struct thermal_zone_device *tz,
 }
 
 static void handle_thermal_trip(struct thermal_zone_device *tz,
-                               struct thermal_trip *trip)
+                               struct thermal_trip_desc *td)
 {
+       const struct thermal_trip *trip = &td->trip;
+
        if (trip->temperature == THERMAL_TEMP_INVALID)
                return;
 
        if (tz->last_temperature == THERMAL_TEMP_INVALID) {
                /* Initialization. */
-               trip->threshold = trip->temperature;
-               if (tz->temperature >= trip->threshold)
-                       trip->threshold -= trip->hysteresis;
-       } else if (tz->last_temperature < trip->threshold) {
+               td->threshold = trip->temperature;
+               if (tz->temperature >= td->threshold)
+                       td->threshold -= trip->hysteresis;
+       } else if (tz->last_temperature < td->threshold) {
                /*
                 * The trip threshold is equal to the trip temperature, unless
                 * the latter has changed in the meantime.  In either case,
@@ -382,9 +384,9 @@ static void handle_thermal_trip(struct thermal_zone_device *tz,
                if (tz->temperature >= trip->temperature) {
                        thermal_notify_tz_trip_up(tz, trip);
                        thermal_debug_tz_trip_up(tz, trip);
-                       trip->threshold = trip->temperature - trip->hysteresis;
+                       td->threshold = trip->temperature - trip->hysteresis;
                } else {
-                       trip->threshold = trip->temperature;
+                       td->threshold = trip->temperature;
                }
        } else {
                /*
@@ -400,9 +402,9 @@ static void handle_thermal_trip(struct thermal_zone_device *tz,
                if (tz->temperature < trip->temperature - trip->hysteresis) {
                        thermal_notify_tz_trip_down(tz, trip);
                        thermal_debug_tz_trip_down(tz, trip);
-                       trip->threshold = trip->temperature;
+                       td->threshold = trip->temperature;
                } else {
-                       trip->threshold = trip->temperature - trip->hysteresis;
+                       td->threshold = trip->temperature - trip->hysteresis;
                }
        }
 
@@ -458,7 +460,7 @@ static void thermal_zone_device_init(struct thermal_zone_device *tz)
 void __thermal_zone_device_update(struct thermal_zone_device *tz,
                                  enum thermal_notify_event event)
 {
-       struct thermal_trip *trip;
+       struct thermal_trip_desc *td;
 
        if (tz->suspended)
                return;
@@ -472,8 +474,8 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz,
 
        tz->notify_event = event;
 
-       for_each_trip(tz, trip)
-               handle_thermal_trip(tz, trip);
+       for_each_trip_desc(tz, td)
+               handle_thermal_trip(tz, td);
 
        monitor_thermal_zone(tz);
 }
@@ -766,7 +768,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
        if (trip_index < 0 || trip_index >= tz->num_trips)
                return -EINVAL;
 
-       return thermal_bind_cdev_to_trip(tz, &tz->trips[trip_index], cdev,
+       return thermal_bind_cdev_to_trip(tz, &tz->trips[trip_index].trip, cdev,
                                         upper, lower, weight);
 }
 EXPORT_SYMBOL_GPL(thermal_zone_bind_cooling_device);
@@ -825,7 +827,7 @@ int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz,
        if (trip_index < 0 || trip_index >= tz->num_trips)
                return -EINVAL;
 
-       return thermal_unbind_cdev_from_trip(tz, &tz->trips[trip_index], cdev);
+       return thermal_unbind_cdev_from_trip(tz, &tz->trips[trip_index].trip, cdev);
 }
 EXPORT_SYMBOL_GPL(thermal_zone_unbind_cooling_device);
 
@@ -1221,16 +1223,19 @@ static void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms
 
 int thermal_zone_get_crit_temp(struct thermal_zone_device *tz, int *temp)
 {
-       int i, ret = -EINVAL;
+       const struct thermal_trip_desc *td;
+       int ret = -EINVAL;
 
        if (tz->ops.get_crit_temp)
                return tz->ops.get_crit_temp(tz, temp);
 
        mutex_lock(&tz->lock);
 
-       for (i = 0; i < tz->num_trips; i++) {
-               if (tz->trips[i].type == THERMAL_TRIP_CRITICAL) {
-                       *temp = tz->trips[i].temperature;
+       for_each_trip_desc(tz, td) {
+               const struct thermal_trip *trip = &td->trip;
+
+               if (trip->type == THERMAL_TRIP_CRITICAL) {
+                       *temp = trip->temperature;
                        ret = 0;
                        break;
                }
@@ -1274,7 +1279,9 @@ thermal_zone_device_register_with_trips(const char *type,
                                        const struct thermal_zone_params *tzp,
                                        int passive_delay, int polling_delay)
 {
+       const struct thermal_trip *trip = trips;
        struct thermal_zone_device *tz;
+       struct thermal_trip_desc *td;
        int id;
        int result;
        struct thermal_governor *governor;
@@ -1339,7 +1346,8 @@ thermal_zone_device_register_with_trips(const char *type,
        tz->device.class = thermal_class;
        tz->devdata = devdata;
        tz->num_trips = num_trips;
-       memcpy(tz->trips, trips, num_trips * sizeof(*trips));
+       for_each_trip_desc(tz, td)
+               td->trip = *trip++;
 
        thermal_set_delay_jiffies(&tz->passive_delay_jiffies, passive_delay);
        thermal_set_delay_jiffies(&tz->polling_delay_jiffies, polling_delay);

diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
index 0d8a42bb7ce83389a4fa15a2f2ef862d23dc4223..4ad9c671bc13049d70de3b215fa00292bb238654 100644 (file)
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@ -120,8 +120,11 @@ void thermal_governor_update_tz(struct thermal_zone_device *tz,
                                enum thermal_notify_event reason);
 
 /* Helpers */
-#define for_each_trip(__tz, __trip)    \
-       for (__trip = __tz->trips; __trip - __tz->trips < __tz->num_trips; __trip++)
+#define for_each_trip_desc(__tz, __td) \
+       for (__td = __tz->trips; __td - __tz->trips < __tz->num_trips; __td++)
+
+#define trip_to_trip_desc(__trip)      \
+       container_of(__trip, struct thermal_trip_desc, trip)
 
 void __thermal_zone_set_trips(struct thermal_zone_device *tz);
 int thermal_zone_trip_id(const struct thermal_zone_device *tz,

diff --git a/drivers/thermal/thermal_debugfs.c b/drivers/thermal/thermal_debugfs.c
index c617e8b9f0ddfe18bcb34155e156af47e4006837..78c4cb30e91d7401637d22d95d9941772b574b58 100644 (file)
--- a/drivers/thermal/thermal_debugfs.c
+++ b/drivers/thermal/thermal_debugfs.c
@@ -744,7 +744,7 @@ static void tze_seq_stop(struct seq_file *s, void *v)
 static int tze_seq_show(struct seq_file *s, void *v)
 {
        struct thermal_zone_device *tz = s->private;
-       struct thermal_trip *trip;
+       struct thermal_trip_desc *td;
        struct tz_episode *tze;
        const char *type;
        int trip_id;
@@ -757,7 +757,9 @@ static int tze_seq_show(struct seq_file *s, void *v)
 
        seq_printf(s, "| trip |     type | temp(°mC) | hyst(°mC) |  duration  |  avg(°mC) |  min(°mC) |  max(°mC) |\n");
 
-       for_each_trip(tz, trip) {
+       for_each_trip_desc(tz, td) {
+               const struct thermal_trip *trip = &td->trip;
+
                /*
                 * There is no possible mitigation happening at the
                 * critical trip point, so the stats will be always

diff --git a/drivers/thermal/thermal_helpers.c b/drivers/thermal/thermal_helpers.c
index c5a057b59c42d32189c7a262a12184b76c7f82fc..d9f4e26ec1257c82f5d7a69ad6fb979c2cec145f 100644 (file)
--- a/drivers/thermal/thermal_helpers.c
+++ b/drivers/thermal/thermal_helpers.c
@@ -50,7 +50,7 @@ get_thermal_instance(struct thermal_zone_device *tz,
        mutex_lock(&tz->lock);
        mutex_lock(&cdev->lock);
 
-       trip = &tz->trips[trip_index];
+       trip = &tz->trips[trip_index].trip;
 
        list_for_each_entry(pos, &tz->thermal_instances, tz_node) {
                if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) {
@@ -82,7 +82,7 @@ EXPORT_SYMBOL(get_thermal_instance);
  */
 int __thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)
 {
-       const struct thermal_trip *trip;
+       const struct thermal_trip_desc *td;
        int crit_temp = INT_MAX;
        int ret = -EINVAL;
 
@@ -91,7 +91,9 @@ int __thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp)
        ret = tz->ops.get_temp(tz, temp);
 
        if (IS_ENABLED(CONFIG_THERMAL_EMULATION) && tz->emul_temperature) {
-               for_each_trip(tz, trip) {
+               for_each_trip_desc(tz, td) {
+                       const struct thermal_trip *trip = &td->trip;
+
                        if (trip->type == THERMAL_TRIP_CRITICAL) {
                                crit_temp = trip->temperature;
                                break;

diff --git a/drivers/thermal/thermal_netlink.c b/drivers/thermal/thermal_netlink.c
index 76a231a29654512fd7eba589b827182daa0d63a9..0ef6368da76604430f0716c83558fa74ec468ca1 100644 (file)
--- a/drivers/thermal/thermal_netlink.c
+++ b/drivers/thermal/thermal_netlink.c
@@ -445,7 +445,7 @@ out_cancel_nest:
 static int thermal_genl_cmd_tz_get_trip(struct param *p)
 {
        struct sk_buff *msg = p->msg;
-       const struct thermal_trip *trip;
+       const struct thermal_trip_desc *td;
        struct thermal_zone_device *tz;
        struct nlattr *start_trip;
        int id;
@@ -465,7 +465,9 @@ static int thermal_genl_cmd_tz_get_trip(struct param *p)
 
        mutex_lock(&tz->lock);
 
-       for_each_trip(tz, trip) {
+       for_each_trip_desc(tz, td) {
+               const struct thermal_trip *trip = &td->trip;
+
                if (nla_put_u32(msg, THERMAL_GENL_ATTR_TZ_TRIP_ID,
                                thermal_zone_trip_id(tz, trip)) ||
                    nla_put_u32(msg, THERMAL_GENL_ATTR_TZ_TRIP_TYPE, trip->type) ||

diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index 5b533fa40437c35f68ad80c7cc858131a96540f2..88211ccdfbd62d088c1b45a2cb70bc525c8641bf 100644 (file)
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -88,7 +88,7 @@ trip_point_type_show(struct device *dev, struct device_attribute *attr,
        if (sscanf(attr->attr.name, "trip_point_%d_type", &trip_id) != 1)
                return -EINVAL;
 
-       switch (tz->trips[trip_id].type) {
+       switch (tz->trips[trip_id].trip.type) {
        case THERMAL_TRIP_CRITICAL:
                return sprintf(buf, "critical\n");
        case THERMAL_TRIP_HOT:
@@ -120,7 +120,7 @@ trip_point_temp_store(struct device *dev, struct device_attribute *attr,
 
        mutex_lock(&tz->lock);
 
-       trip = &tz->trips[trip_id];
+       trip = &tz->trips[trip_id].trip;
 
        if (temp != trip->temperature) {
                if (tz->ops.set_trip_temp) {
@@ -150,7 +150,7 @@ trip_point_temp_show(struct device *dev, struct device_attribute *attr,
        if (sscanf(attr->attr.name, "trip_point_%d_temp", &trip_id) != 1)
                return -EINVAL;
 
-       return sprintf(buf, "%d\n", tz->trips[trip_id].temperature);
+       return sprintf(buf, "%d\n", tz->trips[trip_id].trip.temperature);
 }
 
 static ssize_t
@@ -171,7 +171,7 @@ trip_point_hyst_store(struct device *dev, struct device_attribute *attr,
 
        mutex_lock(&tz->lock);
 
-       trip = &tz->trips[trip_id];
+       trip = &tz->trips[trip_id].trip;
 
        if (hyst != trip->hysteresis) {
                trip->hysteresis = hyst;
@@ -194,7 +194,7 @@ trip_point_hyst_show(struct device *dev, struct device_attribute *attr,
        if (sscanf(attr->attr.name, "trip_point_%d_hyst", &trip_id) != 1)
                return -EINVAL;
 
-       return sprintf(buf, "%d\n", tz->trips[trip_id].hysteresis);
+       return sprintf(buf, "%d\n", tz->trips[trip_id].trip.hysteresis);
 }
 
 static ssize_t
@@ -393,7 +393,7 @@ static const struct attribute_group *thermal_zone_attribute_groups[] = {
  */
 static int create_trip_attrs(struct thermal_zone_device *tz)
 {
-       const struct thermal_trip *trip;
+       const struct thermal_trip_desc *td;
        struct attribute **attrs;
 
        /* This function works only for zones with at least one trip */
@@ -429,8 +429,8 @@ static int create_trip_attrs(struct thermal_zone_device *tz)
                return -ENOMEM;
        }
 
-       for_each_trip(tz, trip) {
-               int indx = thermal_zone_trip_id(tz, trip);
+       for_each_trip_desc(tz, td) {
+               int indx = thermal_zone_trip_id(tz, &td->trip);
 
                /* create trip type attribute */
                snprintf(tz->trip_type_attrs[indx].name, THERMAL_NAME_LENGTH,
@@ -452,7 +452,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz)
                                                tz->trip_temp_attrs[indx].name;
                tz->trip_temp_attrs[indx].attr.attr.mode = S_IRUGO;
                tz->trip_temp_attrs[indx].attr.show = trip_point_temp_show;
-               if (trip->flags & THERMAL_TRIP_FLAG_RW_TEMP) {
+               if (td->trip.flags & THERMAL_TRIP_FLAG_RW_TEMP) {
                        tz->trip_temp_attrs[indx].attr.attr.mode |= S_IWUSR;
                        tz->trip_temp_attrs[indx].attr.store =
                                                        trip_point_temp_store;
@@ -467,7 +467,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz)
                                        tz->trip_hyst_attrs[indx].name;
                tz->trip_hyst_attrs[indx].attr.attr.mode = S_IRUGO;
                tz->trip_hyst_attrs[indx].attr.show = trip_point_hyst_show;
-               if (trip->flags & THERMAL_TRIP_FLAG_RW_HYST) {
+               if (td->trip.flags & THERMAL_TRIP_FLAG_RW_HYST) {
                        tz->trip_hyst_attrs[indx].attr.attr.mode |= S_IWUSR;
                        tz->trip_hyst_attrs[indx].attr.store =
                                        trip_point_hyst_store;

diff --git a/drivers/thermal/thermal_trip.c b/drivers/thermal/thermal_trip.c
index 497abf0d47cac59bbb09db7d40f680cfcffbfe1e..7cf43b6972725c2682dba06eeb5306d73fda4ea5 100644 (file)
--- a/drivers/thermal/thermal_trip.c
+++ b/drivers/thermal/thermal_trip.c
@@ -13,11 +13,11 @@ int for_each_thermal_trip(struct thermal_zone_device *tz,
                          int (*cb)(struct thermal_trip *, void *),
                          void *data)
 {
-       struct thermal_trip *trip;
+       struct thermal_trip_desc *td;
        int ret;
 
-       for_each_trip(tz, trip) {
-               ret = cb(trip, data);
+       for_each_trip_desc(tz, td) {
+               ret = cb(&td->trip, data);
                if (ret)
                        return ret;
        }
@@ -63,7 +63,7 @@ EXPORT_SYMBOL_GPL(thermal_zone_get_num_trips);
  */
 void __thermal_zone_set_trips(struct thermal_zone_device *tz)
 {
-       const struct thermal_trip *trip;
+       const struct thermal_trip_desc *td;
        int low = -INT_MAX, high = INT_MAX;
        int ret;
 
@@ -72,7 +72,8 @@ void __thermal_zone_set_trips(struct thermal_zone_device *tz)
        if (!tz->ops.set_trips)
                return;
 
-       for_each_trip(tz, trip) {
+       for_each_trip_desc(tz, td) {
+               const struct thermal_trip *trip = &td->trip;
                int trip_low;
 
                trip_low = trip->temperature - trip->hysteresis;
@@ -110,7 +111,7 @@ int __thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,
        if (!tz || trip_id < 0 || trip_id >= tz->num_trips || !trip)
                return -EINVAL;
 
-       *trip = tz->trips[trip_id];
+       *trip = tz->trips[trip_id].trip;
        return 0;
 }
 EXPORT_SYMBOL_GPL(__thermal_zone_get_trip);
@@ -135,7 +136,7 @@ int thermal_zone_trip_id(const struct thermal_zone_device *tz,
         * Assume the trip to be located within the bounds of the thermal
         * zone's trips[] table.
         */
-       return trip - tz->trips;
+       return trip_to_trip_desc(trip) - tz->trips;
 }
 void thermal_zone_trip_updated(struct thermal_zone_device *tz,
                               const struct thermal_trip *trip)

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index c33f50177f5185e0f0ea9dcbb78fc4d6843217da..67bd13303349c3887204ee65a645b2a6267fb070 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -61,7 +61,6 @@ enum thermal_notify_event {
  * struct thermal_trip - representation of a point in temperature domain
  * @temperature: temperature value in miliCelsius
  * @hysteresis: relative hysteresis in miliCelsius
- * @threshold: trip crossing notification threshold miliCelsius
  * @type: trip point type
  * @priv: pointer to driver data associated with this trip
  * @flags: flags representing binary properties of the trip
@@ -69,12 +68,16 @@ enum thermal_notify_event {
 struct thermal_trip {
        int temperature;
        int hysteresis;
-       int threshold;
        enum thermal_trip_type type;
        u8 flags;
        void *priv;
 };
 
+struct thermal_trip_desc {
+       struct thermal_trip trip;
+       int threshold;
+};
+
 #define THERMAL_TRIP_FLAG_RW_TEMP      BIT(0)
 #define THERMAL_TRIP_FLAG_RW_HYST      BIT(1)
 
@@ -203,7 +206,7 @@ struct thermal_zone_device {
 #ifdef CONFIG_THERMAL_DEBUGFS
        struct thermal_debugfs *debugfs;
 #endif
-       struct thermal_trip trips[] __counted_by(num_trips);
+       struct thermal_trip_desc trips[] __counted_by(num_trips);
 };
 
 /**