thermal/core: Add thermal_trip in thermal_zone

The thermal trip points are properties of a thermal zone and the
different sub systems should be able to save them in the thermal zone
structure instead of having their own definition.

Give the opportunity to the drivers to create a thermal zone with
thermal trips which will be accessible directly from the thermal core
framework.

As we added the thermal trip points structure in the thermal zone,
let's extend the thermal zone register function to have the thermal
trip structures as a parameter and store it in the 'trips' field of
the thermal zone structure.

The thermal zone contains the trip point, we can store them directly
when registering the thermal zone. That will allow another step
forward to remove the duplicate thermal zone structure we find in the
thermal_of code.

Cc: Alexandre Bailon <abailon@baylibre.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linexp.org>
Link: https://lore.kernel.org/r/20220722200007.1839356-9-daniel.lezcano@linexp.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 19350a4925c4b62ac4235a45ced7bfd886fc7042..f50098d3315278d4de14069954eedf7e65087208 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1163,8 +1163,9 @@ static void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms
 }
 
 /**
- * thermal_zone_device_register() - register a new thermal zone device
+ * thermal_zone_device_register_with_trips() - register a new thermal zone device
  * @type:      the thermal zone device type
+ * @trips:     a pointer to an array of thermal trips
  * @num_trips: the number of trip points the thermal zone support
  * @mask:      a bit string indicating the writeablility of trip points
  * @devdata:   private device data
@@ -1187,10 +1188,10 @@ static void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms
  * IS_ERR*() helpers.
  */
 struct thermal_zone_device *
-thermal_zone_device_register(const char *type, int num_trips, int mask,
-                            void *devdata, struct thermal_zone_device_ops *ops,
-                            struct thermal_zone_params *tzp, int passive_delay,
-                            int polling_delay)
+thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *trips, int num_trips, int mask,
+                                       void *devdata, struct thermal_zone_device_ops *ops,
+                                       struct thermal_zone_params *tzp, int passive_delay,
+                                       int polling_delay)
 {
        struct thermal_zone_device *tz;
        enum thermal_trip_type trip_type;
@@ -1251,6 +1252,7 @@ thermal_zone_device_register(const char *type, int num_trips, int mask,
        tz->tzp = tzp;
        tz->device.class = &thermal_class;
        tz->devdata = devdata;
+       tz->trips = trips;
        tz->num_trips = num_trips;
 
        thermal_set_delay_jiffies(&tz->passive_delay_jiffies, passive_delay);
@@ -1327,6 +1329,16 @@ free_tz:
        kfree(tz);
        return ERR_PTR(result);
 }
+
+struct thermal_zone_device *thermal_zone_device_register(const char *type, int ntrips, int mask,
+                                                        void *devdata, struct thermal_zone_device_ops *ops,
+                                                        struct thermal_zone_params *tzp, int passive_delay,
+                                                        int polling_delay)
+{
+       return thermal_zone_device_register_with_trips(type, NULL, ntrips, mask,
+                                                      devdata, ops, tzp,
+                                                      passive_delay, polling_delay);
+}
 EXPORT_SYMBOL_GPL(thermal_zone_device_register);
 
 /**

diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
index 0d04474ed951cf15061cc4e2fb221d2f25ab2001..d7ff6d558a82ae679c0cc9c1d12114e2d0510373 100644 (file)
--- a/drivers/thermal/thermal_of.c
+++ b/drivers/thermal/thermal_of.c
@@ -1119,11 +1119,9 @@ int __init of_parse_thermal_zones(void)
                tzp->slope = tz->slope;
                tzp->offset = tz->offset;
 
-               zone = thermal_zone_device_register(child->name, tz->ntrips,
-                                                   mask, tz,
-                                                   ops, tzp,
-                                                   tz->passive_delay,
-                                                   tz->polling_delay);
+               zone = thermal_zone_device_register_with_trips(child->name, tz->trips, tz->ntrips,
+                                                              mask, tz, ops, tzp, tz->passive_delay,
+                                                              tz->polling_delay);
                if (IS_ERR(zone)) {
                        pr_err("Failed to build %pOFn zone %ld\n", child,
                               PTR_ERR(zone));

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index ae579a70cc1a33260795edb1ffba47183c4fc322..1386c713885d87ccb5a19d7ff7022042e26b5581 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -123,6 +123,7 @@ struct thermal_cooling_device {
  * @trip_hyst_attrs:   attributes for trip points for sysfs: trip hysteresis
  * @mode:              current mode of this thermal zone
  * @devdata:   private pointer for device private data
+ * @trips:     an array of struct thermal_trip
  * @num_trips: number of trip points the thermal zone supports
  * @trips_disabled;    bitmap for disabled trips
  * @passive_delay_jiffies: number of jiffies to wait between polls when
@@ -163,6 +164,7 @@ struct thermal_zone_device {
        struct thermal_attr *trip_hyst_attrs;
        enum thermal_device_mode mode;
        void *devdata;
+       struct thermal_trip *trips;
        int num_trips;
        unsigned long trips_disabled;   /* bitmap for disabled trips */
        unsigned long passive_delay_jiffies;
@@ -376,8 +378,14 @@ void devm_thermal_zone_of_sensor_unregister(struct device *dev,
 struct thermal_zone_device *thermal_zone_device_register(const char *, int, int,
                void *, struct thermal_zone_device_ops *,
                struct thermal_zone_params *, int, int);
+
 void thermal_zone_device_unregister(struct thermal_zone_device *);
 
+struct thermal_zone_device *
+thermal_zone_device_register_with_trips(const char *, struct thermal_trip *, int, int,
+                                       void *, struct thermal_zone_device_ops *,
+                                       struct thermal_zone_params *, int, int);
+
 int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
                                     struct thermal_cooling_device *,
                                     unsigned long, unsigned long,