thermal OF rework
Subsystems (3)
v6 cover thermal OF rework
The thermal framework initialization with the device tree appears to be complicated and hard to make it to evolve.
It contains duplication of almost the same thermal generic structures and has an assymetric initialization making hard any kind of serious changes for more complex features. One of them is the multiple sensors support per thermal zone.
In order to set the scene for the aforementioned feature with generic code, we need to cleanup and rework the device tree initialization.
However this rework is not obvious because of the multiple components entering in the composition of a thermal zone and being initialized at different moments. For instance, a cooling device can be initialized before a sensor, so the thermal zones must exist before the cooling device as well as the sensor. This asynchronous initialization forces the thermal zone to be created with fake ops because they are mandotory and build a list of cooling devices which is used to lookup afterwards when the cooling device driver is registering itself.
As there could be a large number of changes, this first series provide some steps forward for a simpler device tree initialization.
More series for cleanup and code duplication removal will follow.
Changelog:
- v6:
- Folded patches 8, 9, 10
- Removed thermal_zone_get_trips() and thermal_zone_get_num_trips()
- Moved tz->ntrips => tz->num_trips changes into patch 11 to fix the git bisecting
- v5:
- Remove extra of_node_put() reported by lkp
- V4:
- Added of_node_put(trips)
- Changed naming 'ntrips' -> 'num_trips'
- Updated documentation for added and renamed fields in the thermal zone structure
- Fixed bad parameter type 'thermal_zone' -> 'thermal_zone_device'
- Clarified there is more cleanups coming in the changelog
- Put 'trips' and 'num_trips' fields all together
- Made git-bisect safe the series
- V3:
- Removed patch 1 and 2 from the V2 which consist in renaming the thermal_zone_device_ops to thermal_sensor_ops and separating the structure. I'll do a separate proposal for that after the incoming cleanups
- V2:
- Drop patch 1/15 which contains too many changes for a simple structure renaming. This could be addressed in a separate series as it is not necessary for the OF rework
- Fixed of_node_put with gchild not initialized as reported by kbuild and Dan Carpenter
- V1:
- Initial post
Daniel Lezcano (10):
thermal/core: Remove duplicate information when an error occurs thermal/of: Replace device node match with device node search thermal/of: Remove the device node pointer for thermal_trip thermal/of: Move thermal_trip structure to thermal.h thermal/core: Remove unneeded EXPORT_SYMBOLS thermal/core: Move thermal_set_delay_jiffies to static thermal/core: Rename 'trips' to 'num_trips' thermal/core: Add thermal_trip in thermal_zone thermal/of: Use thermal trips stored in the thermal zone thermal/of: Initialize trip points separately
drivers/thermal/gov_fair_share.c | 6 +- drivers/thermal/gov_power_allocator.c | 4 +- drivers/thermal/tegra/tegra30-tsensor.c | 2 +- drivers/thermal/thermal_core.c | 53 +++++-- drivers/thermal/thermal_core.h | 15 -- drivers/thermal/thermal_helpers.c | 13 +- drivers/thermal/thermal_netlink.c | 2 +- drivers/thermal/thermal_of.c | 201 +++++++++++++----------- drivers/thermal/thermal_sysfs.c | 22 +-- include/linux/thermal.h | 24 ++- 10 files changed, 189 insertions(+), 153 deletions(-)
Signature · 1 line
2.25.1
PATCH v6 1/10 thermal/core: Remove duplicate information when an error occurs
The pr_err already tells it is an error, it is pointless to add the 'Error:' string in the messages. Remove them.
--- drivers/thermal/thermal_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/thermal/thermal_core.c +4 -4
@@ -1198,23 +1198,23 @@ thermal_zone_device_register(const char *type, int trips, int mask,struct thermal_governor *governor;if (!type ||strlen (type) ==0 ) { -pr_err ("Error: No thermal zone type defined\n" ); +pr_err ("No thermal zone type defined\n" );return ERR_PTR (-EINVAL ); }if (type &&strlen (type) >=THERMAL_NAME_LENGTH ) { -pr_err ("Error: Thermal zone name (%s) too long, should be under %d chars\n" , +pr_err ("Thermal zone name (%s) too long, should be under %d chars\n" , type,THERMAL_NAME_LENGTH );return ERR_PTR (-EINVAL ); }if (trips >THERMAL_MAX_TRIPS || trips <0 || mask >> trips) { -pr_err ("Error: Incorrect number of thermal trips\n" ); +pr_err ("Incorrect number of thermal trips\n" );return ERR_PTR (-EINVAL ); }if (!ops) { -pr_err ("Error: Thermal zone device ops not defined\n" ); +pr_err ("Thermal zone device ops not defined\n" );return ERR_PTR (-EINVAL ); }
Signature · 1 line
2.25.1
[thermal: thermal/next] thermal/core: Remove duplicate information when an error occurs
The following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: 3f95ac324535eafafd436d35bf58f0319dd4a70b Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//3f95ac324535eafafd436d35bf58f0319dd4a70b Author: Daniel Lezcano <[email protected]> AuthorDate: Fri, 22 Jul 2022 21:59:58 +02:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 28 Jul 2022 17:29:53 +02:00
thermal/core: Remove duplicate information when an error occurs
The pr_err already tells it is an error, it is pointless to add the 'Error:' string in the messages. Remove them.
--- drivers/thermal/thermal_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/thermal/thermal_core.c +4 -4
@@ -1194,23 +1194,23 @@ thermal_zone_device_register(const char *type, int trips, int mask,struct thermal_governor *governor;if (!type ||strlen (type) ==0 ) { -pr_err ("Error: No thermal zone type defined\n" ); +pr_err ("No thermal zone type defined\n" );return ERR_PTR (-EINVAL ); }if (type &&strlen (type) >=THERMAL_NAME_LENGTH ) { -pr_err ("Error: Thermal zone name (%s) too long, should be under %d chars\n" , +pr_err ("Thermal zone name (%s) too long, should be under %d chars\n" , type,THERMAL_NAME_LENGTH );return ERR_PTR (-EINVAL ); }if (trips >THERMAL_MAX_TRIPS || trips <0 || mask >> trips) { -pr_err ("Error: Incorrect number of thermal trips\n" ); +pr_err ("Incorrect number of thermal trips\n" );return ERR_PTR (-EINVAL ); }if (!ops) { -pr_err ("Error: Thermal zone device ops not defined\n" ); +pr_err ("Thermal zone device ops not defined\n" );return ERR_PTR (-EINVAL ); }
PATCH v6 2/10 thermal/of: Replace device node match with device node search
In reply to Daniel LezcanoThe thermal_of code builds a trip array associated with the node pointer in order to compare the trip point phandle with the list.
The thermal trip is a thermal zone property and should be moved there. If some sensors have hardcoded trip points, they should use the exported structure instead of redefining again and again their own structure and data to describe exactly the same things.
In order to move this to the thermal.h header and allow more cleanup, we need to remove the node pointer from the structure.
Instead of building storing the device node, we search directly in the device tree the corresponding node. That results in a simplification of the code and allows to move the structure to thermal.h
--- drivers/thermal/thermal_of.c | 64 +++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 20 deletions(-)
drivers/thermal/thermal_of.c +44 -20
@@ -671,6 +671,35 @@ EXPORT_SYMBOL_GPL(devm_thermal_zone_of_sensor_unregister);/*** functions parsing device tree nodes ***/ +static int of_find_trip_id (struct device_node *np,struct device_node *trip) +{ +struct device_node *trips; +struct device_node *t; +int i =0 ; + + trips =of_get_child_by_name (np,"trips" ); +if (!trips) { +pr_err ("Failed to find 'trips' node\n" ); +return -EINVAL ; + } + +/* +* Find the trip id point associated with the cooling device map +*/ +for_each_child_of_node (trips, t) { + +if (t == trip) + goto out; + i++; + } + + i = -ENXIO ; +out: +of_node_put (trips); + +return i; +} +/** * thermal_of_populate_bind_params - parse and fill cooling map data * @np: DT node containing a cooling-map node
@@ -686,14 +715,13 @@ EXPORT_SYMBOL_GPL(devm_thermal_zone_of_sensor_unregister);* Return: 0 on success, proper error code otherwise */ static int thermal_of_populate_bind_params (struct device_node *np, -struct __thermal_bind_params *__tbp, -struct thermal_trip *trips, -int ntrips) +struct __thermal_bind_params *__tbp) {struct of_phandle_args cooling_spec;struct __thermal_cooling_bind_param *__tcbp;struct device_node *trip;int ret, i, count; +int trip_id;u32 prop;/* Default weight. Usage is optional */
@@ -708,18 +736,14 @@ static int thermal_of_populate_bind_params(struct device_node *np,return -ENODEV ; } -/* match using device_node */ -for (i =0 ; i < ntrips; i++) -if (trip == trips[i].np) { - __tbp->trip_id = i; -break ; - } - -if (i == ntrips) { - ret = -ENODEV ; + trip_id =of_find_trip_id (np, trip); +if (trip_id <0 ) { + ret = trip_id; goto end; } + __tbp->trip_id = trip_id; + count =of_count_phandle_with_args (np,"cooling-device" ,"#cooling-cells" );if (count <=0 ) {
@@ -868,6 +892,7 @@ static struct __thermal_zone __init *thermal_of_build_thermal_zone(struct device_node *np) {struct device_node *child =NULL , *gchild; +struct device_node *trips;struct __thermal_zone *tz;int ret, i;u32 prop, coef[2 ];
@@ -910,13 +935,13 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) }/* trips */ - child =of_get_child_by_name (np,"trips" ); + trips =of_get_child_by_name (np,"trips" );/* No trips provided */ -if (!child) +if (!trips) goto finish; - tz->ntrips =of_get_child_count (child); + tz->ntrips =of_get_child_count (trips);if (tz->ntrips ==0 )/* must have at least one child */ goto finish;
@@ -927,14 +952,12 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) } i =0 ; -for_each_child_of_node (child, gchild) { +for_each_child_of_node (trips, gchild) { ret =thermal_of_populate_trip (gchild, &tz->trips[i++]);if (ret) goto free_trips; } -of_node_put (child); -/* cooling-maps */ child =of_get_child_by_name (np,"cooling-maps" );
@@ -954,13 +977,13 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) i =0 ;for_each_child_of_node (child, gchild) { - ret =thermal_of_populate_bind_params (gchild, &tz->tbps[i++], - tz->trips, tz->ntrips); + ret =thermal_of_populate_bind_params (gchild, &tz->tbps[i++]);if (ret) goto free_tbps; } finish: +of_node_put (trips);of_node_put (child);return tz;
@@ -981,6 +1004,7 @@ __init *thermal_of_build_thermal_zone(struct device_node *np)for (i =0 ; i < tz->ntrips; i++)of_node_put (tz->trips[i].np);kfree (tz->trips); +of_node_put (trips);of_node_put (gchild); free_tz:kfree (tz);
Signature · 1 line
2.25.1
[thermal: thermal/next] thermal/of: Replace device node match with device node search
The following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: a3193edcbdf9a8ae73b6e1f2da96e920582c1849 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//a3193edcbdf9a8ae73b6e1f2da96e920582c1849 Author: Daniel Lezcano <[email protected]> AuthorDate: Fri, 22 Jul 2022 21:59:59 +02:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 28 Jul 2022 17:29:53 +02:00
thermal/of: Replace device node match with device node search
The thermal_of code builds a trip array associated with the node pointer in order to compare the trip point phandle with the list.
The thermal trip is a thermal zone property and should be moved there. If some sensors have hardcoded trip points, they should use the exported structure instead of redefining again and again their own structure and data to describe exactly the same things.
In order to move this to the thermal.h header and allow more cleanup, we need to remove the node pointer from the structure.
Instead of building storing the device node, we search directly in the device tree the corresponding node. That results in a simplification of the code and allows to move the structure to thermal.h
--- drivers/thermal/thermal_of.c | 64 ++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 20 deletions(-)
drivers/thermal/thermal_of.c +44 -20
@@ -671,6 +671,35 @@ EXPORT_SYMBOL_GPL(devm_thermal_zone_of_sensor_unregister);/*** functions parsing device tree nodes ***/ +static int of_find_trip_id (struct device_node *np,struct device_node *trip) +{ +struct device_node *trips; +struct device_node *t; +int i =0 ; + + trips =of_get_child_by_name (np,"trips" ); +if (!trips) { +pr_err ("Failed to find 'trips' node\n" ); +return -EINVAL ; + } + +/* +* Find the trip id point associated with the cooling device map +*/ +for_each_child_of_node (trips, t) { + +if (t == trip) + goto out; + i++; + } + + i = -ENXIO ; +out: +of_node_put (trips); + +return i; +} +/** * thermal_of_populate_bind_params - parse and fill cooling map data * @np: DT node containing a cooling-map node
@@ -686,14 +715,13 @@ EXPORT_SYMBOL_GPL(devm_thermal_zone_of_sensor_unregister);* Return: 0 on success, proper error code otherwise */ static int thermal_of_populate_bind_params (struct device_node *np, -struct __thermal_bind_params *__tbp, -struct thermal_trip *trips, -int ntrips) +struct __thermal_bind_params *__tbp) {struct of_phandle_args cooling_spec;struct __thermal_cooling_bind_param *__tcbp;struct device_node *trip;int ret, i, count; +int trip_id;u32 prop;/* Default weight. Usage is optional */
@@ -708,18 +736,14 @@ static int thermal_of_populate_bind_params(struct device_node *np,return -ENODEV ; } -/* match using device_node */ -for (i =0 ; i < ntrips; i++) -if (trip == trips[i].np) { - __tbp->trip_id = i; -break ; - } - -if (i == ntrips) { - ret = -ENODEV ; + trip_id =of_find_trip_id (np, trip); +if (trip_id <0 ) { + ret = trip_id; goto end; } + __tbp->trip_id = trip_id; + count =of_count_phandle_with_args (np,"cooling-device" ,"#cooling-cells" );if (count <=0 ) {
@@ -868,6 +892,7 @@ static struct __thermal_zone __init *thermal_of_build_thermal_zone(struct device_node *np) {struct device_node *child =NULL , *gchild; +struct device_node *trips;struct __thermal_zone *tz;int ret, i;u32 prop, coef[2 ];
@@ -910,13 +935,13 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) }/* trips */ - child =of_get_child_by_name (np,"trips" ); + trips =of_get_child_by_name (np,"trips" );/* No trips provided */ -if (!child) +if (!trips) goto finish; - tz->ntrips =of_get_child_count (child); + tz->ntrips =of_get_child_count (trips);if (tz->ntrips ==0 )/* must have at least one child */ goto finish;
@@ -927,14 +952,12 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) } i =0 ; -for_each_child_of_node (child, gchild) { +for_each_child_of_node (trips, gchild) { ret =thermal_of_populate_trip (gchild, &tz->trips[i++]);if (ret) goto free_trips; } -of_node_put (child); -/* cooling-maps */ child =of_get_child_by_name (np,"cooling-maps" );
@@ -954,13 +977,13 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) i =0 ;for_each_child_of_node (child, gchild) { - ret =thermal_of_populate_bind_params (gchild, &tz->tbps[i++], - tz->trips, tz->ntrips); + ret =thermal_of_populate_bind_params (gchild, &tz->tbps[i++]);if (ret) goto free_tbps; } finish: +of_node_put (trips);of_node_put (child);return tz;
@@ -981,6 +1004,7 @@ free_trips:for (i =0 ; i < tz->ntrips; i++)of_node_put (tz->trips[i].np);kfree (tz->trips); +of_node_put (trips);of_node_put (gchild); free_tz:kfree (tz);
PATCH v6 3/10 thermal/of: Remove the device node pointer for thermal_trip
In reply to Daniel LezcanoThe device node pointer is no longer needed in the thermal trip structure, remove it.
--- drivers/thermal/thermal_core.h | 2 -- drivers/thermal/thermal_of.c | 8 -------- 2 files changed, 10 deletions(-)
drivers/thermal/thermal_core.h +0 -2
@@ -70,13 +70,11 @@ void __thermal_cdev_update(struct thermal_cooling_device *cdev);/** * struct thermal_trip - representation of a point in temperature domain -* @np: pointer to struct device_node that this trip point was created from * @temperature: temperature value in miliCelsius * @hysteresis: relative hysteresis in miliCelsius * @type: trip point type */ struct thermal_trip { -struct device_node *np;int temperature;int hysteresis;enum thermal_trip_type type;
drivers/thermal/thermal_of.c +0 -8
@@ -867,10 +867,6 @@ static int thermal_of_populate_trip(struct device_node *np,return ret; } -/* Required for cooling map matching */ - trip->np = np; -of_node_get (np); -return 0 ; }
@@ -1001,8 +997,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np)kfree (tz->tbps); free_trips: -for (i =0 ; i < tz->ntrips; i++) -of_node_put (tz->trips[i].np);kfree (tz->trips);of_node_put (trips);of_node_put (gchild);
@@ -1028,8 +1022,6 @@ static __init void of_thermal_free_zone(struct __thermal_zone *tz) }kfree (tz->tbps); -for (i =0 ; i < tz->ntrips; i++) -of_node_put (tz->trips[i].np);kfree (tz->trips);kfree (tz); }
Signature · 1 line
2.25.1
[thermal: thermal/next] thermal/of: Remove the device node pointer for thermal_trip
The following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: af9f251b8e396eca8355904ad8a4361a95af4e61 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//af9f251b8e396eca8355904ad8a4361a95af4e61 Author: Daniel Lezcano <[email protected]> AuthorDate: Fri, 22 Jul 2022 22:00:00 +02:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 28 Jul 2022 17:29:54 +02:00
thermal/of: Remove the device node pointer for thermal_trip
The device node pointer is no longer needed in the thermal trip structure, remove it.
--- drivers/thermal/thermal_core.h | 2 -- drivers/thermal/thermal_of.c | 8 -------- 2 files changed, 10 deletions(-)
drivers/thermal/thermal_core.h +0 -2
@@ -70,13 +70,11 @@ void __thermal_cdev_update(struct thermal_cooling_device *cdev);/** * struct thermal_trip - representation of a point in temperature domain -* @np: pointer to struct device_node that this trip point was created from * @temperature: temperature value in miliCelsius * @hysteresis: relative hysteresis in miliCelsius * @type: trip point type */ struct thermal_trip { -struct device_node *np;int temperature;int hysteresis;enum thermal_trip_type type;
drivers/thermal/thermal_of.c +0 -8
@@ -867,10 +867,6 @@ static int thermal_of_populate_trip(struct device_node *np,return ret; } -/* Required for cooling map matching */ - trip->np = np; -of_node_get (np); -return 0 ; }
@@ -1001,8 +997,6 @@ free_tbps:kfree (tz->tbps); free_trips: -for (i =0 ; i < tz->ntrips; i++) -of_node_put (tz->trips[i].np);kfree (tz->trips);of_node_put (trips);of_node_put (gchild);
@@ -1028,8 +1022,6 @@ static __init void of_thermal_free_zone(struct __thermal_zone *tz) }kfree (tz->tbps); -for (i =0 ; i < tz->ntrips; i++) -of_node_put (tz->trips[i].np);kfree (tz->trips);kfree (tz); }
PATCH v6 4/10 thermal/of: Move thermal_trip structure to thermal.h
In reply to Daniel LezcanoThe structure thermal_trip is now generic and will be usable by the different sensor drivers in place of their own structure.
Move its definition to thermal.h to make it accessible.
--- drivers/thermal/thermal_core.h | 12 ------------ include/linux/thermal.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-)
drivers/thermal/thermal_core.h +0 -12
@@ -68,18 +68,6 @@ static inline bool cdev_is_power_actor(struct thermal_cooling_device *cdev)void thermal_cdev_update (struct thermal_cooling_device *);void __thermal_cdev_update (struct thermal_cooling_device *cdev); -/** -* struct thermal_trip - representation of a point in temperature domain -* @temperature: temperature value in miliCelsius -* @hysteresis: relative hysteresis in miliCelsius -* @type: trip point type -*/ -struct thermal_trip { -int temperature; -int hysteresis; -enum thermal_trip_type type; -}; -int get_tz_trend (struct thermal_zone_device *tz,int trip); struct thermal_instance *
include/linux/thermal.h +12 -0
@@ -80,6 +80,18 @@ struct thermal_zone_device_ops {void (*critical)(struct thermal_zone_device *); }; +/** +* struct thermal_trip - representation of a point in temperature domain +* @temperature: temperature value in miliCelsius +* @hysteresis: relative hysteresis in miliCelsius +* @type: trip point type +*/ +struct thermal_trip { +int temperature; +int hysteresis; +enum thermal_trip_type type; +}; +struct thermal_cooling_device_ops {int (*get_max_state) (struct thermal_cooling_device *,unsigned long *);int (*get_cur_state) (struct thermal_cooling_device *,unsigned long *);
Signature · 1 line
2.25.1
[thermal: thermal/next] thermal/of: Move thermal_trip structure to thermal.h
The following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: 646274ddaf756dc549fc98cc581fc1ce4fef517a Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//646274ddaf756dc549fc98cc581fc1ce4fef517a Author: Daniel Lezcano <[email protected]> AuthorDate: Fri, 22 Jul 2022 22:00:01 +02:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 28 Jul 2022 17:29:54 +02:00
thermal/of: Move thermal_trip structure to thermal.h
The structure thermal_trip is now generic and will be usable by the different sensor drivers in place of their own structure.
Move its definition to thermal.h to make it accessible.
--- drivers/thermal/thermal_core.h | 12 ------------ include/linux/thermal.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-)
drivers/thermal/thermal_core.h +0 -12
@@ -68,18 +68,6 @@ static inline bool cdev_is_power_actor(struct thermal_cooling_device *cdev)void thermal_cdev_update (struct thermal_cooling_device *);void __thermal_cdev_update (struct thermal_cooling_device *cdev); -/** -* struct thermal_trip - representation of a point in temperature domain -* @temperature: temperature value in miliCelsius -* @hysteresis: relative hysteresis in miliCelsius -* @type: trip point type -*/ -struct thermal_trip { -int temperature; -int hysteresis; -enum thermal_trip_type type; -}; -int get_tz_trend (struct thermal_zone_device *tz,int trip); struct thermal_instance *
include/linux/thermal.h +12 -0
@@ -78,6 +78,18 @@ struct thermal_zone_device_ops {void (*critical)(struct thermal_zone_device *); }; +/** +* struct thermal_trip - representation of a point in temperature domain +* @temperature: temperature value in miliCelsius +* @hysteresis: relative hysteresis in miliCelsius +* @type: trip point type +*/ +struct thermal_trip { +int temperature; +int hysteresis; +enum thermal_trip_type type; +}; +struct thermal_cooling_device_ops {int (*get_max_state) (struct thermal_cooling_device *,unsigned long *);int (*get_cur_state) (struct thermal_cooling_device *,unsigned long *);
PATCH v6 5/10 thermal/core: Remove unneeded EXPORT_SYMBOLS
In reply to Daniel LezcanoDifferent functions are exporting the symbols but are actually only used by the thermal framework internals. Remove these EXPORT_SYMBOLS.
--- drivers/thermal/thermal_helpers.c | 2 -- 1 file changed, 2 deletions(-)
drivers/thermal/thermal_helpers.c +0 -2
@@ -39,7 +39,6 @@ int get_tz_trend(struct thermal_zone_device *tz, int trip)return trend; } -EXPORT_SYMBOL (get_tz_trend);struct thermal_instance * get_thermal_instance(struct thermal_zone_device *tz,
@@ -228,7 +227,6 @@ void thermal_cdev_update(struct thermal_cooling_device *cdev) }mutex_unlock (&cdev->lock); } -EXPORT_SYMBOL (thermal_cdev_update);/** * thermal_zone_get_slope - return the slope attribute of the thermal zone
Signature · 1 line
2.25.1
[thermal: thermal/next] thermal/core: Remove unneeded EXPORT_SYMBOLS
The following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: 6390383b67fab6bfa652a39e87e904bfc3066235 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//6390383b67fab6bfa652a39e87e904bfc3066235 Author: Daniel Lezcano <[email protected]> AuthorDate: Fri, 22 Jul 2022 22:00:02 +02:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 28 Jul 2022 17:29:55 +02:00
thermal/core: Remove unneeded EXPORT_SYMBOLS
Different functions are exporting the symbols but are actually only used by the thermal framework internals. Remove these EXPORT_SYMBOLS.
--- drivers/thermal/thermal_helpers.c | 2 -- 1 file changed, 2 deletions(-)
drivers/thermal/thermal_helpers.c +0 -2
@@ -39,7 +39,6 @@ int get_tz_trend(struct thermal_zone_device *tz, int trip)return trend; } -EXPORT_SYMBOL (get_tz_trend);struct thermal_instance * get_thermal_instance(struct thermal_zone_device *tz,
@@ -228,7 +227,6 @@ void thermal_cdev_update(struct thermal_cooling_device *cdev) }mutex_unlock (&cdev->lock); } -EXPORT_SYMBOL (thermal_cdev_update);/** * thermal_zone_get_slope - return the slope attribute of the thermal zone
PATCH v6 6/10 thermal/core: Move thermal_set_delay_jiffies to static
In reply to Daniel LezcanoThe function 'thermal_set_delay_jiffies' is only used in thermal_core.c but it is defined and implemented in a separate file. Move the function to thermal_core.c and make it static.
--- drivers/thermal/thermal_core.c | 7 +++++++ drivers/thermal/thermal_core.h | 1 - drivers/thermal/thermal_helpers.c | 7 ------- 3 files changed, 7 insertions(+), 8 deletions(-)
drivers/thermal/thermal_core.c +7 -0
@@ -1159,6 +1159,13 @@ static void bind_tz(struct thermal_zone_device *tz)mutex_unlock (&thermal_list_lock); } +static void thermal_set_delay_jiffies (unsigned long *delay_jiffies,int delay_ms) +{ + *delay_jiffies =msecs_to_jiffies (delay_ms); +if (delay_ms >1000 ) + *delay_jiffies =round_jiffies (*delay_jiffies); +} +/** * thermal_zone_device_register() - register a new thermal zone device * @type: the thermal zone device type
drivers/thermal/thermal_core.h +0 -1
@@ -112,7 +112,6 @@ int thermal_build_list_of_policies(char *buf);/* Helpers */ void thermal_zone_set_trips (struct thermal_zone_device *tz); -void thermal_set_delay_jiffies (unsigned long *delay_jiffies,int delay_ms);/* sysfs I/F */ int thermal_zone_create_device_groups (struct thermal_zone_device *,int );
drivers/thermal/thermal_helpers.c +0 -7
@@ -174,13 +174,6 @@ void thermal_zone_set_trips(struct thermal_zone_device *tz)mutex_unlock (&tz->lock); } -void thermal_set_delay_jiffies (unsigned long *delay_jiffies,int delay_ms) -{ - *delay_jiffies =msecs_to_jiffies (delay_ms); -if (delay_ms >1000 ) - *delay_jiffies =round_jiffies (*delay_jiffies); -} -static void thermal_cdev_set_cur_state (struct thermal_cooling_device *cdev,int target) {
Signature · 1 line
2.25.1
[thermal: thermal/next] thermal/core: Move thermal_set_delay_jiffies to static
The following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: e5f2cda61d068e14af95ed8ee74c80e565af3f29 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//e5f2cda61d068e14af95ed8ee74c80e565af3f29 Author: Daniel Lezcano <[email protected]> AuthorDate: Fri, 22 Jul 2022 22:00:03 +02:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 28 Jul 2022 17:29:55 +02:00
thermal/core: Move thermal_set_delay_jiffies to static
The function 'thermal_set_delay_jiffies' is only used in thermal_core.c but it is defined and implemented in a separate file. Move the function to thermal_core.c and make it static.
--- drivers/thermal/thermal_core.c | 7 +++++++ drivers/thermal/thermal_core.h | 1 - drivers/thermal/thermal_helpers.c | 7 ------- 3 files changed, 7 insertions(+), 8 deletions(-)
drivers/thermal/thermal_core.c +7 -0
@@ -1155,6 +1155,13 @@ exit:mutex_unlock (&thermal_list_lock); } +static void thermal_set_delay_jiffies (unsigned long *delay_jiffies,int delay_ms) +{ + *delay_jiffies =msecs_to_jiffies (delay_ms); +if (delay_ms >1000 ) + *delay_jiffies =round_jiffies (*delay_jiffies); +} +/** * thermal_zone_device_register() - register a new thermal zone device * @type: the thermal zone device type
drivers/thermal/thermal_core.h +0 -1
@@ -112,7 +112,6 @@ int thermal_build_list_of_policies(char *buf);/* Helpers */ void thermal_zone_set_trips (struct thermal_zone_device *tz); -void thermal_set_delay_jiffies (unsigned long *delay_jiffies,int delay_ms);/* sysfs I/F */ int thermal_zone_create_device_groups (struct thermal_zone_device *,int );
drivers/thermal/thermal_helpers.c +0 -7
@@ -174,13 +174,6 @@ exit:mutex_unlock (&tz->lock); } -void thermal_set_delay_jiffies (unsigned long *delay_jiffies,int delay_ms) -{ - *delay_jiffies =msecs_to_jiffies (delay_ms); -if (delay_ms >1000 ) - *delay_jiffies =round_jiffies (*delay_jiffies); -} -static void thermal_cdev_set_cur_state (struct thermal_cooling_device *cdev,int target) {
PATCH v6 7/10 thermal/core: Rename 'trips' to 'num_trips'
In reply to Daniel LezcanoIn order to use thermal trips defined in the thermal structure, rename the 'trips' field to 'num_trips' to have the 'trips' field containing the thermal trip points.
--- drivers/thermal/gov_fair_share.c | 6 +++--- drivers/thermal/gov_power_allocator.c | 4 ++-- drivers/thermal/tegra/tegra30-tsensor.c | 2 +- drivers/thermal/thermal_core.c | 20 ++++++++++---------- drivers/thermal/thermal_helpers.c | 4 ++-- drivers/thermal/thermal_netlink.c | 2 +- drivers/thermal/thermal_sysfs.c | 22 +++++++++++----------- include/linux/thermal.h | 4 ++-- 8 files changed, 32 insertions(+), 32 deletions(-)
drivers/thermal/gov_fair_share.c +3 -3
@@ -25,10 +25,10 @@ static int get_trip_level(struct thermal_zone_device *tz)int trip_temp;enum thermal_trip_type trip_type; -if (tz->trips ==0 || !tz->ops->get_trip_temp) +if (tz->num_trips ==0 || !tz->ops->get_trip_temp)return 0 ; -for (count =0 ; count < tz->trips; count++) { +for (count =0 ; count < tz->num_trips; count++) { tz->ops->get_trip_temp (tz, count, &trip_temp);if (tz->temperature < trip_temp)break ;
@@ -53,7 +53,7 @@ static long get_target_state(struct thermal_zone_device *tz, cdev->ops->get_max_state (cdev, &max_state); -return (long )(percentage * level * max_state) / (100 * tz->trips); +return (long )(percentage * level * max_state) / (100 * tz->num_trips); }/**
drivers/thermal/gov_power_allocator.c +2 -2
@@ -527,7 +527,7 @@ static void get_governor_trips(struct thermal_zone_device *tz, last_active =INVALID_TRIP ; last_passive =INVALID_TRIP ; -for (i =0 ; i < tz->trips; i++) { +for (i =0 ; i < tz->num_trips; i++) {enum thermal_trip_type type;int ret;
@@ -668,7 +668,7 @@ static int power_allocator_bind(struct thermal_zone_device *tz)get_governor_trips (tz, params); -if (tz->trips >0 ) { +if (tz->num_trips >0 ) { ret = tz->ops->get_trip_temp (tz, params->trip_max_desired_temperature, &control_temp);
drivers/thermal/tegra/tegra30-tsensor.c +1 -1
@@ -316,7 +316,7 @@ static void tegra_tsensor_get_hw_channel_trips(struct thermal_zone_device *tzd, *hot_trip =85000 ; *crit_trip =90000 ; -for (i =0 ; i < tzd->trips; i++) { +for (i =0 ; i < tzd->num_trips; i++) {enum thermal_trip_type type;int trip_temp;
drivers/thermal/thermal_core.c +10 -10
@@ -505,7 +505,7 @@ void thermal_zone_device_update(struct thermal_zone_device *tz, tz->notify_event = event; -for (count =0 ; count < tz->trips; count++) +for (count =0 ; count < tz->num_trips; count++)handle_thermal_trip (tz, count); }EXPORT_SYMBOL_GPL (thermal_zone_device_update);
@@ -630,7 +630,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,unsigned long max_state;int result, ret; -if (trip >= tz->trips || trip <0 ) +if (trip >= tz->num_trips || trip <0 )return -EINVAL ;list_for_each_entry (pos1, &thermal_tz_list, node) {
@@ -811,7 +811,7 @@ static void __bind(struct thermal_zone_device *tz, int mask, {int i, ret; -for (i =0 ; i < tz->trips; i++) { +for (i =0 ; i < tz->num_trips; i++) {if (mask & (1 << i)) {unsigned long upper, lower;
@@ -1057,7 +1057,7 @@ static void __unbind(struct thermal_zone_device *tz, int mask, {int i; -for (i =0 ; i < tz->trips; i++) +for (i =0 ; i < tz->num_trips; i++)if (mask & (1 << i))thermal_zone_unbind_cooling_device (tz, i, cdev); }
@@ -1169,7 +1169,7 @@ static void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms/** * thermal_zone_device_register() - register a new thermal zone device * @type: the thermal zone device type -* @trips: the number of trip points the thermal zone support +* @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 * @ops: standard thermal zone device callbacks
@@ -1191,7 +1191,7 @@ 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 trips,int mask, +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)
@@ -1215,7 +1215,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,return ERR_PTR (-EINVAL ); } -if (trips >THERMAL_MAX_TRIPS || trips <0 || mask >> trips) { +if (num_trips >THERMAL_MAX_TRIPS || num_trips <0 || mask >> num_trips) {pr_err ("Incorrect number of thermal trips\n" );return ERR_PTR (-EINVAL ); }
@@ -1225,7 +1225,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,return ERR_PTR (-EINVAL ); } -if (trips >0 && (!ops->get_trip_type || !ops->get_trip_temp)) +if (num_trips >0 && (!ops->get_trip_type || !ops->get_trip_temp))return ERR_PTR (-EINVAL ); tz =kzalloc (sizeof (*tz),GFP_KERNEL );
@@ -1255,7 +1255,7 @@ thermal_zone_device_register(const char *type, int 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);thermal_set_delay_jiffies (&tz->polling_delay_jiffies, polling_delay);
@@ -1273,7 +1273,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,if (result) goto release_device; -for (count =0 ; count < trips; count++) { +for (count =0 ; count < num_trips; count++) {if (tz->ops->get_trip_type (tz, count, &trip_type) || tz->ops->get_trip_temp (tz, count, &trip_temp) || !trip_temp)
drivers/thermal/thermal_helpers.c +2 -2
@@ -89,7 +89,7 @@ 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 (count =0 ; count < tz->trips; count++) { +for (count =0 ; count < tz->num_trips; count++) { ret = tz->ops->get_trip_type (tz, count, &type);if (!ret && type ==THERMAL_TRIP_CRITICAL ) { ret = tz->ops->get_trip_temp(tz, count,
@@ -137,7 +137,7 @@ void thermal_zone_set_trips(struct thermal_zone_device *tz)if (!tz->ops->set_trips || !tz->ops->get_trip_hyst) goto exit; -for (i =0 ; i < tz->trips; i++) { +for (i =0 ; i < tz->num_trips; i++) {int trip_low; tz->ops->get_trip_temp (tz, i, &trip_temp);
drivers/thermal/thermal_netlink.c +1 -1
@@ -469,7 +469,7 @@ static int thermal_genl_cmd_tz_get_trip(struct param *p)mutex_lock (&tz->lock); -for (i =0 ; i < tz->trips; i++) { +for (i =0 ; i < tz->num_trips; i++) {enum thermal_trip_type type;int temp, hyst =0 ;
drivers/thermal/thermal_sysfs.c +11 -11
@@ -416,15 +416,15 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask)int indx;/* This function works only for zones with at least one trip */ -if (tz->trips <=0 ) +if (tz->num_trips <=0 )return -EINVAL ; - tz->trip_type_attrs =kcalloc (tz->trips,sizeof (*tz->trip_type_attrs), + tz->trip_type_attrs =kcalloc (tz->num_trips,sizeof (*tz->trip_type_attrs),GFP_KERNEL );if (!tz->trip_type_attrs)return -ENOMEM ; - tz->trip_temp_attrs =kcalloc (tz->trips,sizeof (*tz->trip_temp_attrs), + tz->trip_temp_attrs =kcalloc (tz->num_trips,sizeof (*tz->trip_temp_attrs),GFP_KERNEL );if (!tz->trip_temp_attrs) {kfree (tz->trip_type_attrs);
@@ -432,7 +432,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask) }if (tz->ops->get_trip_hyst) { - tz->trip_hyst_attrs =kcalloc (tz->trips, + tz->trip_hyst_attrs =kcalloc (tz->num_trips,sizeof (*tz->trip_hyst_attrs),GFP_KERNEL );if (!tz->trip_hyst_attrs) {
@@ -442,7 +442,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask) } } - attrs =kcalloc (tz->trips *3 +1 ,sizeof (*attrs),GFP_KERNEL ); + attrs =kcalloc (tz->num_trips *3 +1 ,sizeof (*attrs),GFP_KERNEL );if (!attrs) {kfree (tz->trip_type_attrs);kfree (tz->trip_temp_attrs);
@@ -451,7 +451,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask)return -ENOMEM ; } -for (indx =0 ; indx < tz->trips; indx++) { +for (indx =0 ; indx < tz->num_trips; indx++) {/* create trip type attribute */ snprintf (tz->trip_type_attrs[indx].name,THERMAL_NAME_LENGTH ,"trip_point_%d_type" , indx);
@@ -478,7 +478,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask) tz->trip_temp_attrs[indx].attr.store = trip_point_temp_store; } - attrs[indx + tz->trips] = &tz->trip_temp_attrs[indx].attr.attr; + attrs[indx + tz->num_trips] = &tz->trip_temp_attrs[indx].attr.attr;/* create Optional trip hyst attribute */ if (!tz->ops->get_trip_hyst)
@@ -496,10 +496,10 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask) tz->trip_hyst_attrs[indx].attr.store = trip_point_hyst_store; } - attrs[indx + tz->trips *2 ] = + attrs[indx + tz->num_trips *2 ] = &tz->trip_hyst_attrs[indx].attr.attr; } - attrs[tz->trips *3 ] =NULL ; + attrs[tz->num_trips *3 ] =NULL ; tz->trips_attribute_group.attrs = attrs;
@@ -540,7 +540,7 @@ int thermal_zone_create_device_groups(struct thermal_zone_device *tz,for (i =0 ; i < size -2 ; i++) groups[i] = thermal_zone_attribute_groups[i]; -if (tz->trips) { +if (tz->num_trips) { result =create_trip_attrs (tz, mask);if (result) {kfree (groups);
@@ -561,7 +561,7 @@ void thermal_zone_destroy_device_groups(struct thermal_zone_device *tz)if (!tz)return ; -if (tz->trips) +if (tz->num_trips)destroy_trip_attrs (tz);kfree (tz->device.groups);
include/linux/thermal.h +2 -2
@@ -125,7 +125,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: number of trip points the thermal zone supports +* @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 * performing passive cooling.
@@ -165,7 +165,7 @@ struct thermal_zone_device {struct thermal_attr *trip_hyst_attrs;enum thermal_device_mode mode;void *devdata; -int trips; +int num_trips;unsigned long trips_disabled;/* bitmap for disabled trips */ unsigned long passive_delay_jiffies;unsigned long polling_delay_jiffies;
Signature · 1 line
2.25.1
[thermal: thermal/next] thermal/core: Rename 'trips' to 'num_trips'
The following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: e5bfcd30f88fdb0ce830229e7ccdeddcb7a59b04 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//e5bfcd30f88fdb0ce830229e7ccdeddcb7a59b04 Author: Daniel Lezcano <[email protected]> AuthorDate: Fri, 22 Jul 2022 22:00:04 +02:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 28 Jul 2022 17:29:56 +02:00
thermal/core: Rename 'trips' to 'num_trips'
In order to use thermal trips defined in the thermal structure, rename the 'trips' field to 'num_trips' to have the 'trips' field containing the thermal trip points.
--- drivers/thermal/gov_fair_share.c | 6 +++--- drivers/thermal/gov_power_allocator.c | 4 ++-- drivers/thermal/tegra/tegra30-tsensor.c | 2 +- drivers/thermal/thermal_core.c | 20 ++++++++++---------- drivers/thermal/thermal_helpers.c | 4 ++-- drivers/thermal/thermal_netlink.c | 2 +- drivers/thermal/thermal_sysfs.c | 22 +++++++++++----------- include/linux/thermal.h | 4 ++-- 8 files changed, 32 insertions(+), 32 deletions(-)
drivers/thermal/gov_fair_share.c +3 -3
@@ -25,10 +25,10 @@ static int get_trip_level(struct thermal_zone_device *tz)int trip_temp;enum thermal_trip_type trip_type; -if (tz->trips ==0 || !tz->ops->get_trip_temp) +if (tz->num_trips ==0 || !tz->ops->get_trip_temp)return 0 ; -for (count =0 ; count < tz->trips; count++) { +for (count =0 ; count < tz->num_trips; count++) { tz->ops->get_trip_temp (tz, count, &trip_temp);if (tz->temperature < trip_temp)break ;
@@ -53,7 +53,7 @@ static long get_target_state(struct thermal_zone_device *tz, cdev->ops->get_max_state (cdev, &max_state); -return (long )(percentage * level * max_state) / (100 * tz->trips); +return (long )(percentage * level * max_state) / (100 * tz->num_trips); }/**
drivers/thermal/gov_power_allocator.c +2 -2
@@ -527,7 +527,7 @@ static void get_governor_trips(struct thermal_zone_device *tz, last_active =INVALID_TRIP ; last_passive =INVALID_TRIP ; -for (i =0 ; i < tz->trips; i++) { +for (i =0 ; i < tz->num_trips; i++) {enum thermal_trip_type type;int ret;
@@ -668,7 +668,7 @@ static int power_allocator_bind(struct thermal_zone_device *tz)get_governor_trips (tz, params); -if (tz->trips >0 ) { +if (tz->num_trips >0 ) { ret = tz->ops->get_trip_temp (tz, params->trip_max_desired_temperature, &control_temp);
drivers/thermal/tegra/tegra30-tsensor.c +1 -1
@@ -316,7 +316,7 @@ static void tegra_tsensor_get_hw_channel_trips(struct thermal_zone_device *tzd, *hot_trip =85000 ; *crit_trip =90000 ; -for (i =0 ; i < tzd->trips; i++) { +for (i =0 ; i < tzd->num_trips; i++) {enum thermal_trip_type type;int trip_temp;
drivers/thermal/thermal_core.c +10 -10
@@ -501,7 +501,7 @@ void thermal_zone_device_update(struct thermal_zone_device *tz, tz->notify_event = event; -for (count =0 ; count < tz->trips; count++) +for (count =0 ; count < tz->num_trips; count++)handle_thermal_trip (tz, count); }EXPORT_SYMBOL_GPL (thermal_zone_device_update);
@@ -626,7 +626,7 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,unsigned long max_state;int result, ret; -if (trip >= tz->trips || trip <0 ) +if (trip >= tz->num_trips || trip <0 )return -EINVAL ;list_for_each_entry (pos1, &thermal_tz_list, node) {
@@ -807,7 +807,7 @@ static void __bind(struct thermal_zone_device *tz, int mask, {int i, ret; -for (i =0 ; i < tz->trips; i++) { +for (i =0 ; i < tz->num_trips; i++) {if (mask & (1 << i)) {unsigned long upper, lower;
@@ -1053,7 +1053,7 @@ static void __unbind(struct thermal_zone_device *tz, int mask, {int i; -for (i =0 ; i < tz->trips; i++) +for (i =0 ; i < tz->num_trips; i++)if (mask & (1 << i))thermal_zone_unbind_cooling_device (tz, i, cdev); }
@@ -1165,7 +1165,7 @@ static void thermal_set_delay_jiffies(unsigned long *delay_jiffies, int delay_ms/** * thermal_zone_device_register() - register a new thermal zone device * @type: the thermal zone device type -* @trips: the number of trip points the thermal zone support +* @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 * @ops: standard thermal zone device callbacks
@@ -1187,7 +1187,7 @@ 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 trips,int mask, +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)
@@ -1211,7 +1211,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,return ERR_PTR (-EINVAL ); } -if (trips >THERMAL_MAX_TRIPS || trips <0 || mask >> trips) { +if (num_trips >THERMAL_MAX_TRIPS || num_trips <0 || mask >> num_trips) {pr_err ("Incorrect number of thermal trips\n" );return ERR_PTR (-EINVAL ); }
@@ -1221,7 +1221,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,return ERR_PTR (-EINVAL ); } -if (trips >0 && (!ops->get_trip_type || !ops->get_trip_temp)) +if (num_trips >0 && (!ops->get_trip_type || !ops->get_trip_temp))return ERR_PTR (-EINVAL ); tz =kzalloc (sizeof (*tz),GFP_KERNEL );
@@ -1251,7 +1251,7 @@ thermal_zone_device_register(const char *type, int 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);thermal_set_delay_jiffies (&tz->polling_delay_jiffies, polling_delay);
@@ -1269,7 +1269,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,if (result) goto release_device; -for (count =0 ; count < trips; count++) { +for (count =0 ; count < num_trips; count++) {if (tz->ops->get_trip_type (tz, count, &trip_type) || tz->ops->get_trip_temp (tz, count, &trip_temp) || !trip_temp)
drivers/thermal/thermal_helpers.c +2 -2
@@ -89,7 +89,7 @@ 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 (count =0 ; count < tz->trips; count++) { +for (count =0 ; count < tz->num_trips; count++) { ret = tz->ops->get_trip_type (tz, count, &type);if (!ret && type ==THERMAL_TRIP_CRITICAL ) { ret = tz->ops->get_trip_temp(tz, count,
@@ -137,7 +137,7 @@ void thermal_zone_set_trips(struct thermal_zone_device *tz)if (!tz->ops->set_trips || !tz->ops->get_trip_hyst) goto exit; -for (i =0 ; i < tz->trips; i++) { +for (i =0 ; i < tz->num_trips; i++) {int trip_low; tz->ops->get_trip_temp (tz, i, &trip_temp);
drivers/thermal/thermal_netlink.c +1 -1
@@ -469,7 +469,7 @@ static int thermal_genl_cmd_tz_get_trip(struct param *p)mutex_lock (&tz->lock); -for (i =0 ; i < tz->trips; i++) { +for (i =0 ; i < tz->num_trips; i++) {enum thermal_trip_type type;int temp, hyst =0 ;
drivers/thermal/thermal_sysfs.c +11 -11
@@ -416,15 +416,15 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask)int indx;/* This function works only for zones with at least one trip */ -if (tz->trips <=0 ) +if (tz->num_trips <=0 )return -EINVAL ; - tz->trip_type_attrs =kcalloc (tz->trips,sizeof (*tz->trip_type_attrs), + tz->trip_type_attrs =kcalloc (tz->num_trips,sizeof (*tz->trip_type_attrs),GFP_KERNEL );if (!tz->trip_type_attrs)return -ENOMEM ; - tz->trip_temp_attrs =kcalloc (tz->trips,sizeof (*tz->trip_temp_attrs), + tz->trip_temp_attrs =kcalloc (tz->num_trips,sizeof (*tz->trip_temp_attrs),GFP_KERNEL );if (!tz->trip_temp_attrs) {kfree (tz->trip_type_attrs);
@@ -432,7 +432,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask) }if (tz->ops->get_trip_hyst) { - tz->trip_hyst_attrs =kcalloc (tz->trips, + tz->trip_hyst_attrs =kcalloc (tz->num_trips,sizeof (*tz->trip_hyst_attrs),GFP_KERNEL );if (!tz->trip_hyst_attrs) {
@@ -442,7 +442,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask) } } - attrs =kcalloc (tz->trips *3 +1 ,sizeof (*attrs),GFP_KERNEL ); + attrs =kcalloc (tz->num_trips *3 +1 ,sizeof (*attrs),GFP_KERNEL );if (!attrs) {kfree (tz->trip_type_attrs);kfree (tz->trip_temp_attrs);
@@ -451,7 +451,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask)return -ENOMEM ; } -for (indx =0 ; indx < tz->trips; indx++) { +for (indx =0 ; indx < tz->num_trips; indx++) {/* create trip type attribute */ snprintf (tz->trip_type_attrs[indx].name,THERMAL_NAME_LENGTH ,"trip_point_%d_type" , indx);
@@ -478,7 +478,7 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask) tz->trip_temp_attrs[indx].attr.store = trip_point_temp_store; } - attrs[indx + tz->trips] = &tz->trip_temp_attrs[indx].attr.attr; + attrs[indx + tz->num_trips] = &tz->trip_temp_attrs[indx].attr.attr;/* create Optional trip hyst attribute */ if (!tz->ops->get_trip_hyst)
@@ -496,10 +496,10 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask) tz->trip_hyst_attrs[indx].attr.store = trip_point_hyst_store; } - attrs[indx + tz->trips *2 ] = + attrs[indx + tz->num_trips *2 ] = &tz->trip_hyst_attrs[indx].attr.attr; } - attrs[tz->trips *3 ] =NULL ; + attrs[tz->num_trips *3 ] =NULL ; tz->trips_attribute_group.attrs = attrs;
@@ -540,7 +540,7 @@ int thermal_zone_create_device_groups(struct thermal_zone_device *tz,for (i =0 ; i < size -2 ; i++) groups[i] = thermal_zone_attribute_groups[i]; -if (tz->trips) { +if (tz->num_trips) { result =create_trip_attrs (tz, mask);if (result) {kfree (groups);
@@ -561,7 +561,7 @@ void thermal_zone_destroy_device_groups(struct thermal_zone_device *tz)if (!tz)return ; -if (tz->trips) +if (tz->num_trips)destroy_trip_attrs (tz);kfree (tz->device.groups);
include/linux/thermal.h +2 -2
@@ -123,7 +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: number of trip points the thermal zone supports +* @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 * performing passive cooling.
@@ -163,7 +163,7 @@ struct thermal_zone_device {struct thermal_attr *trip_hyst_attrs;enum thermal_device_mode mode;void *devdata; -int trips; +int num_trips;unsigned long trips_disabled;/* bitmap for disabled trips */ unsigned long passive_delay_jiffies;unsigned long polling_delay_jiffies;
PATCH v6 8/10 thermal/core: Add thermal_trip in thermal_zone
In reply to Daniel LezcanoThe 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.
--- drivers/thermal/thermal_core.c | 22 +++++++++++++++++----- drivers/thermal/thermal_of.c | 8 +++----- include/linux/thermal.h | 8 ++++++++ 3 files changed, 28 insertions(+), 10 deletions(-)
drivers/thermal/thermal_core.c +17 -5
@@ -1167,8 +1167,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
@@ -1191,10 +1192,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;
@@ -1255,6 +1256,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);
@@ -1331,6 +1333,16 @@ thermal_zone_device_register(const char *type, int num_trips, int mask,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);/**
drivers/thermal/thermal_of.c +3 -5
@@ -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));
include/linux/thermal.h +8 -0
@@ -125,6 +125,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
@@ -165,6 +166,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;
@@ -378,8 +380,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,
Signature · 1 line
2.25.1
[thermal: thermal/next] thermal/core: Add thermal_trip in thermal_zone
The following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: fae11de507f0e420ba3733729317559e7cea6274 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//fae11de507f0e420ba3733729317559e7cea6274 Author: Daniel Lezcano <[email protected]> AuthorDate: Fri, 22 Jul 2022 22:00:05 +02:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 28 Jul 2022 17:29:56 +02:00
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.
--- drivers/thermal/thermal_core.c | 22 +++++++++++++++++----- drivers/thermal/thermal_of.c | 8 +++----- include/linux/thermal.h | 8 ++++++++ 3 files changed, 28 insertions(+), 10 deletions(-)
drivers/thermal/thermal_core.c +17 -5
@@ -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);/**
drivers/thermal/thermal_of.c +3 -5
@@ -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));
include/linux/thermal.h +8 -0
@@ -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,
PATCH v6 9/10 thermal/of: Use thermal trips stored in the thermal zone
In reply to Daniel LezcanoNow that we have the thermal trip stored in the thermal zone in a generic way, we can rely on them and remove one indirection we found in the thermal_of code and do one more step forward the removal of the duplicated structures.
--- drivers/thermal/thermal_of.c | 53 +++++++++++------------------------- 1 file changed, 16 insertions(+), 37 deletions(-)
drivers/thermal/thermal_of.c +16 -37
@@ -118,12 +118,7 @@ static int of_thermal_set_trips(struct thermal_zone_device *tz,*/ int of_thermal_get_ntrips (struct thermal_zone_device *tz) { -struct __thermal_zone *data = tz->devdata; - -if (!data ||IS_ERR (data)) -return -ENODEV ; - -return data->ntrips; +return tz->num_trips; }EXPORT_SYMBOL_GPL (of_thermal_get_ntrips);
@@ -139,9 +134,7 @@ EXPORT_SYMBOL_GPL(of_thermal_get_ntrips);*/ bool of_thermal_is_trip_valid (struct thermal_zone_device *tz,int trip) { -struct __thermal_zone *data = tz->devdata; - -if (!data || trip >= data->ntrips || trip <0 ) +if (trip >= tz->num_trips || trip <0 )return false;return true;
@@ -161,12 +154,7 @@ EXPORT_SYMBOL_GPL(of_thermal_is_trip_valid);const struct thermal_trip *of_thermal_get_trip_points (struct thermal_zone_device *tz) { -struct __thermal_zone *data = tz->devdata; - -if (!data) -return NULL ; - -return data->trips; +return tz->trips; }EXPORT_SYMBOL_GPL (of_thermal_get_trip_points);
@@ -281,12 +269,10 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,static int of_thermal_get_trip_type (struct thermal_zone_device *tz,int trip,enum thermal_trip_type *type) { -struct __thermal_zone *data = tz->devdata; - -if (trip >= data->ntrips || trip <0 ) +if (trip >= tz->num_trips || trip <0 )return -EDOM ; - *type = data->trips[trip].type; + *type = tz->trips[trip].type;return 0 ; }
@@ -294,12 +280,10 @@ static int of_thermal_get_trip_type(struct thermal_zone_device *tz, int trip,static int of_thermal_get_trip_temp (struct thermal_zone_device *tz,int trip,int *temp) { -struct __thermal_zone *data = tz->devdata; - -if (trip >= data->ntrips || trip <0 ) +if (trip >= tz->num_trips || trip <0 )return -EDOM ; - *temp = data->trips[trip].temperature; + *temp = tz->trips[trip].temperature;return 0 ; }
@@ -309,7 +293,7 @@ static int of_thermal_set_trip_temp(struct thermal_zone_device *tz, int trip, {struct __thermal_zone *data = tz->devdata; -if (trip >= data->ntrips || trip <0 ) +if (trip >= tz->num_trips || trip <0 )return -EDOM ;if (data->ops && data->ops->set_trip_temp) {
@@ -321,7 +305,7 @@ static int of_thermal_set_trip_temp(struct thermal_zone_device *tz, int trip, }/* thermal framework should take care of data->mask & (1 << trip) */ - data->trips[trip].temperature = temp; + tz->trips[trip].temperature = temp;return 0 ; }
@@ -329,12 +313,10 @@ static int of_thermal_set_trip_temp(struct thermal_zone_device *tz, int trip,static int of_thermal_get_trip_hyst (struct thermal_zone_device *tz,int trip,int *hyst) { -struct __thermal_zone *data = tz->devdata; - -if (trip >= data->ntrips || trip <0 ) +if (trip >= tz->num_trips || trip <0 )return -EDOM ; - *hyst = data->trips[trip].hysteresis; + *hyst = tz->trips[trip].hysteresis;return 0 ; }
@@ -342,13 +324,11 @@ static int of_thermal_get_trip_hyst(struct thermal_zone_device *tz, int trip,static int of_thermal_set_trip_hyst (struct thermal_zone_device *tz,int trip,int hyst) { -struct __thermal_zone *data = tz->devdata; - -if (trip >= data->ntrips || trip <0 ) +if (trip >= tz->num_trips || trip <0 )return -EDOM ;/* thermal framework should take care of data->mask & (1 << trip) */ - data->trips[trip].hysteresis = hyst; + tz->trips[trip].hysteresis = hyst;return 0 ; }
@@ -356,12 +336,11 @@ static int of_thermal_set_trip_hyst(struct thermal_zone_device *tz, int trip,static int of_thermal_get_crit_temp (struct thermal_zone_device *tz,int *temp) { -struct __thermal_zone *data = tz->devdata;int i; -for (i =0 ; i < data->ntrips; i++) -if (data->trips[i].type ==THERMAL_TRIP_CRITICAL ) { - *temp = data->trips[i].temperature; +for (i =0 ; i < tz->num_trips; i++) +if (tz->trips[i].type ==THERMAL_TRIP_CRITICAL ) { + *temp = tz->trips[i].temperature;return 0 ; }
Signature · 1 line
2.25.1
[thermal: thermal/next] thermal/of: Use thermal trips stored in the thermal zone
The following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: 14ccb5edd76e40259d8c1bd8f984cfc9016e1633 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//14ccb5edd76e40259d8c1bd8f984cfc9016e1633 Author: Daniel Lezcano <[email protected]> AuthorDate: Fri, 22 Jul 2022 22:00:06 +02:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 28 Jul 2022 17:29:56 +02:00
thermal/of: Use thermal trips stored in the thermal zone
Now that we have the thermal trip stored in the thermal zone in a generic way, we can rely on them and remove one indirection we found in the thermal_of code and do one more step forward the removal of the duplicated structures.
--- drivers/thermal/thermal_of.c | 53 ++++++++++------------------------- 1 file changed, 16 insertions(+), 37 deletions(-)
drivers/thermal/thermal_of.c +16 -37
@@ -118,12 +118,7 @@ static int of_thermal_set_trips(struct thermal_zone_device *tz,*/ int of_thermal_get_ntrips (struct thermal_zone_device *tz) { -struct __thermal_zone *data = tz->devdata; - -if (!data ||IS_ERR (data)) -return -ENODEV ; - -return data->ntrips; +return tz->num_trips; }EXPORT_SYMBOL_GPL (of_thermal_get_ntrips);
@@ -139,9 +134,7 @@ EXPORT_SYMBOL_GPL(of_thermal_get_ntrips);*/ bool of_thermal_is_trip_valid (struct thermal_zone_device *tz,int trip) { -struct __thermal_zone *data = tz->devdata; - -if (!data || trip >= data->ntrips || trip <0 ) +if (trip >= tz->num_trips || trip <0 )return false;return true;
@@ -161,12 +154,7 @@ EXPORT_SYMBOL_GPL(of_thermal_is_trip_valid);const struct thermal_trip *of_thermal_get_trip_points (struct thermal_zone_device *tz) { -struct __thermal_zone *data = tz->devdata; - -if (!data) -return NULL ; - -return data->trips; +return tz->trips; }EXPORT_SYMBOL_GPL (of_thermal_get_trip_points);
@@ -281,12 +269,10 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal,static int of_thermal_get_trip_type (struct thermal_zone_device *tz,int trip,enum thermal_trip_type *type) { -struct __thermal_zone *data = tz->devdata; - -if (trip >= data->ntrips || trip <0 ) +if (trip >= tz->num_trips || trip <0 )return -EDOM ; - *type = data->trips[trip].type; + *type = tz->trips[trip].type;return 0 ; }
@@ -294,12 +280,10 @@ static int of_thermal_get_trip_type(struct thermal_zone_device *tz, int trip,static int of_thermal_get_trip_temp (struct thermal_zone_device *tz,int trip,int *temp) { -struct __thermal_zone *data = tz->devdata; - -if (trip >= data->ntrips || trip <0 ) +if (trip >= tz->num_trips || trip <0 )return -EDOM ; - *temp = data->trips[trip].temperature; + *temp = tz->trips[trip].temperature;return 0 ; }
@@ -309,7 +293,7 @@ static int of_thermal_set_trip_temp(struct thermal_zone_device *tz, int trip, {struct __thermal_zone *data = tz->devdata; -if (trip >= data->ntrips || trip <0 ) +if (trip >= tz->num_trips || trip <0 )return -EDOM ;if (data->ops && data->ops->set_trip_temp) {
@@ -321,7 +305,7 @@ static int of_thermal_set_trip_temp(struct thermal_zone_device *tz, int trip, }/* thermal framework should take care of data->mask & (1 << trip) */ - data->trips[trip].temperature = temp; + tz->trips[trip].temperature = temp;return 0 ; }
@@ -329,12 +313,10 @@ static int of_thermal_set_trip_temp(struct thermal_zone_device *tz, int trip,static int of_thermal_get_trip_hyst (struct thermal_zone_device *tz,int trip,int *hyst) { -struct __thermal_zone *data = tz->devdata; - -if (trip >= data->ntrips || trip <0 ) +if (trip >= tz->num_trips || trip <0 )return -EDOM ; - *hyst = data->trips[trip].hysteresis; + *hyst = tz->trips[trip].hysteresis;return 0 ; }
@@ -342,13 +324,11 @@ static int of_thermal_get_trip_hyst(struct thermal_zone_device *tz, int trip,static int of_thermal_set_trip_hyst (struct thermal_zone_device *tz,int trip,int hyst) { -struct __thermal_zone *data = tz->devdata; - -if (trip >= data->ntrips || trip <0 ) +if (trip >= tz->num_trips || trip <0 )return -EDOM ;/* thermal framework should take care of data->mask & (1 << trip) */ - data->trips[trip].hysteresis = hyst; + tz->trips[trip].hysteresis = hyst;return 0 ; }
@@ -356,12 +336,11 @@ static int of_thermal_set_trip_hyst(struct thermal_zone_device *tz, int trip,static int of_thermal_get_crit_temp (struct thermal_zone_device *tz,int *temp) { -struct __thermal_zone *data = tz->devdata;int i; -for (i =0 ; i < data->ntrips; i++) -if (data->trips[i].type ==THERMAL_TRIP_CRITICAL ) { - *temp = data->trips[i].temperature; +for (i =0 ; i < tz->num_trips; i++) +if (tz->trips[i].type ==THERMAL_TRIP_CRITICAL ) { + *temp = tz->trips[i].temperature;return 0 ; }
PATCH v6 10/10 thermal/of: Initialize trip points separately
In reply to Daniel LezcanoSelf contain the trip initialization from the device tree in a single function for the sake of making the code flow more clear.
--- drivers/thermal/thermal_of.c | 86 ++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 29 deletions(-)
drivers/thermal/thermal_of.c +57 -29
@@ -693,7 +693,8 @@ static int of_find_trip_id(struct device_node *np, struct device_node *trip)* * Return: 0 on success, proper error code otherwise */ -static int thermal_of_populate_bind_params (struct device_node *np, +static int thermal_of_populate_bind_params (struct device_node *tz_np, +struct device_node *np,struct __thermal_bind_params *__tbp) {struct of_phandle_args cooling_spec;
@@ -715,7 +716,7 @@ static int thermal_of_populate_bind_params(struct device_node *np,return -ENODEV ; } - trip_id =of_find_trip_id (np, trip); + trip_id =of_find_trip_id (tz_np, trip);if (trip_id <0 ) { ret = trip_id; goto end;
@@ -849,6 +850,53 @@ static int thermal_of_populate_trip(struct device_node *np,return 0 ; } +static struct thermal_trip *thermal_of_trips_init (struct device_node *np,int *ntrips) +{ +struct thermal_trip *tt; +struct device_node *trips, *trip; +int ret, count; + + trips =of_get_child_by_name (np,"trips" ); +if (!trips) { +pr_err ("Failed to find 'trips' node\n" ); +return ERR_PTR (-EINVAL ); + } + + count =of_get_child_count (trips); +if (!count) { +pr_err ("No trip point defined\n" ); + ret = -EINVAL ; + goto out_of_node_put; + } + + tt =kzalloc (sizeof (*tt) * count,GFP_KERNEL ); +if (!tt) { + ret = -ENOMEM ; + goto out_of_node_put; + } + + *ntrips = count; + + count =0 ; +for_each_child_of_node (trips, trip) { + ret =thermal_of_populate_trip (trip, &tt[count++]); +if (ret) + goto out_kfree; + } + +of_node_put (trips); + +return tt; + +out_kfree: +kfree (tt); + *ntrips =0 ; +out_of_node_put: +of_node_put (trips); + +return ERR_PTR (ret); +} +/** * thermal_of_build_thermal_zone - parse and fill one thermal zone data * @np: DT node containing a thermal zone node
@@ -867,7 +915,6 @@ static struct __thermal_zone __init *thermal_of_build_thermal_zone(struct device_node *np) {struct device_node *child =NULL , *gchild; -struct device_node *trips;struct __thermal_zone *tz;int ret, i;u32 prop, coef[2 ];
@@ -909,28 +956,10 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) tz->offset =0 ; } -/* trips */ - trips =of_get_child_by_name (np,"trips" ); - -/* No trips provided */ -if (!trips) + tz->trips =thermal_of_trips_init (np, &tz->ntrips); +if (IS_ERR (tz->trips)) { + ret =PTR_ERR (tz->trips); goto finish; - - tz->ntrips =of_get_child_count (trips); -if (tz->ntrips ==0 )/* must have at least one child */ - goto finish; - - tz->trips =kcalloc (tz->ntrips,sizeof (*tz->trips),GFP_KERNEL ); -if (!tz->trips) { - ret = -ENOMEM ; - goto free_tz; - } - - i =0 ; -for_each_child_of_node (trips, gchild) { - ret =thermal_of_populate_trip (gchild, &tz->trips[i++]); -if (ret) - goto free_trips; }/* cooling-maps */
@@ -952,13 +981,14 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) i =0 ;for_each_child_of_node (child, gchild) { - ret =thermal_of_populate_bind_params (gchild, &tz->tbps[i++]); -if (ret) + ret =thermal_of_populate_bind_params (np, gchild, &tz->tbps[i++]); +if (ret) { +of_node_put (gchild); goto free_tbps; + } } finish: -of_node_put (trips);of_node_put (child);return tz;
@@ -977,8 +1007,6 @@ __init *thermal_of_build_thermal_zone(struct device_node *np)kfree (tz->tbps); free_trips:kfree (tz->trips); -of_node_put (trips); -of_node_put (gchild); free_tz:kfree (tz);of_node_put (child);
Signature · 1 line
2.25.1
[thermal: thermal/next] thermal/of: Initialize trip points separately
The following commit has been merged into the thermal/next branch of thermal:
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: d0c75fa2c17f082b32a5f26ff40bf378b12952de Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//d0c75fa2c17f082b32a5f26ff40bf378b12952de Author: Daniel Lezcano <[email protected]> AuthorDate: Fri, 22 Jul 2022 22:00:07 +02:00 Committer: Daniel Lezcano <[email protected]> CommitterDate: Thu, 28 Jul 2022 17:29:57 +02:00
thermal/of: Initialize trip points separately
Self contain the trip initialization from the device tree in a single function for the sake of making the code flow more clear.
--- drivers/thermal/thermal_of.c | 86 +++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 29 deletions(-)
drivers/thermal/thermal_of.c +57 -29
@@ -693,7 +693,8 @@ out:* * Return: 0 on success, proper error code otherwise */ -static int thermal_of_populate_bind_params (struct device_node *np, +static int thermal_of_populate_bind_params (struct device_node *tz_np, +struct device_node *np,struct __thermal_bind_params *__tbp) {struct of_phandle_args cooling_spec;
@@ -715,7 +716,7 @@ static int thermal_of_populate_bind_params(struct device_node *np,return -ENODEV ; } - trip_id =of_find_trip_id (np, trip); + trip_id =of_find_trip_id (tz_np, trip);if (trip_id <0 ) { ret = trip_id; goto end;
@@ -849,6 +850,53 @@ static int thermal_of_populate_trip(struct device_node *np,return 0 ; } +static struct thermal_trip *thermal_of_trips_init (struct device_node *np,int *ntrips) +{ +struct thermal_trip *tt; +struct device_node *trips, *trip; +int ret, count; + + trips =of_get_child_by_name (np,"trips" ); +if (!trips) { +pr_err ("Failed to find 'trips' node\n" ); +return ERR_PTR (-EINVAL ); + } + + count =of_get_child_count (trips); +if (!count) { +pr_err ("No trip point defined\n" ); + ret = -EINVAL ; + goto out_of_node_put; + } + + tt =kzalloc (sizeof (*tt) * count,GFP_KERNEL ); +if (!tt) { + ret = -ENOMEM ; + goto out_of_node_put; + } + + *ntrips = count; + + count =0 ; +for_each_child_of_node (trips, trip) { + ret =thermal_of_populate_trip (trip, &tt[count++]); +if (ret) + goto out_kfree; + } + +of_node_put (trips); + +return tt; + +out_kfree: +kfree (tt); + *ntrips =0 ; +out_of_node_put: +of_node_put (trips); + +return ERR_PTR (ret); +} +/** * thermal_of_build_thermal_zone - parse and fill one thermal zone data * @np: DT node containing a thermal zone node
@@ -867,7 +915,6 @@ static struct __thermal_zone __init *thermal_of_build_thermal_zone(struct device_node *np) {struct device_node *child =NULL , *gchild; -struct device_node *trips;struct __thermal_zone *tz;int ret, i;u32 prop, coef[2 ];
@@ -909,28 +956,10 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) tz->offset =0 ; } -/* trips */ - trips =of_get_child_by_name (np,"trips" ); - -/* No trips provided */ -if (!trips) + tz->trips =thermal_of_trips_init (np, &tz->ntrips); +if (IS_ERR (tz->trips)) { + ret =PTR_ERR (tz->trips); goto finish; - - tz->ntrips =of_get_child_count (trips); -if (tz->ntrips ==0 )/* must have at least one child */ - goto finish; - - tz->trips =kcalloc (tz->ntrips,sizeof (*tz->trips),GFP_KERNEL ); -if (!tz->trips) { - ret = -ENOMEM ; - goto free_tz; - } - - i =0 ; -for_each_child_of_node (trips, gchild) { - ret =thermal_of_populate_trip (gchild, &tz->trips[i++]); -if (ret) - goto free_trips; }/* cooling-maps */
@@ -952,13 +981,14 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) i =0 ;for_each_child_of_node (child, gchild) { - ret =thermal_of_populate_bind_params (gchild, &tz->tbps[i++]); -if (ret) + ret =thermal_of_populate_bind_params (np, gchild, &tz->tbps[i++]); +if (ret) { +of_node_put (gchild); goto free_tbps; + } } finish: -of_node_put (trips);of_node_put (child);return tz;
@@ -977,8 +1007,6 @@ free_tbps:kfree (tz->tbps); free_trips:kfree (tz->trips); -of_node_put (trips); -of_node_put (gchild); free_tz:kfree (tz);of_node_put (child);
Hi Rafael,
Quoted 25 lines · Daniel Lezcano
The thermal framework initialization with the device tree appears to be complicated and hard to make it to evolve.
It contains duplication of almost the same thermal generic structures and has an assymetric initialization making hard any kind of serious changes for more complex features. One of them is the multiple sensors support per thermal zone.
In order to set the scene for the aforementioned feature with generic code, we need to cleanup and rework the device tree initialization.
However this rework is not obvious because of the multiple components entering in the composition of a thermal zone and being initialized at different moments. For instance, a cooling device can be initialized before a sensor, so the thermal zones must exist before the cooling device as well as the sensor. This asynchronous initialization forces the thermal zone to be created with fake ops because they are mandotory and build a list of cooling devices which is used to lookup afterwards when the cooling device driver is registering itself.
As there could be a large number of changes, this first series provide some steps forward for a simpler device tree initialization.
More series for cleanup and code duplication removal will follow.
Quoted 8 lines
Changelog:
- v6:
- Folded patches 8, 9, 10
- Removedthermal_zone_get_trips()andthermal_zone_get_num_trips()
- Movedtz->ntrips=>tz->num_tripschanges into patch 11 to fix the git bisecting
I believe all the comments were addressed, is it fine if I merge this series ?
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Rafael J. Wysocki
maintainerHi Daniel,
Quoted 39 lines · Daniel Lezcano
Hi Rafael,
Quoted 25 lines · Daniel Lezcano
The thermal framework initialization with the device tree appears to be complicated and hard to make it to evolve.
It contains duplication of almost the same thermal generic structures and has an assymetric initialization making hard any kind of serious changes for more complex features. One of them is the multiple sensors support per thermal zone.
In order to set the scene for the aforementioned feature with generic code, we need to cleanup and rework the device tree initialization.
However this rework is not obvious because of the multiple components entering in the composition of a thermal zone and being initialized at different moments. For instance, a cooling device can be initialized before a sensor, so the thermal zones must exist before the cooling device as well as the sensor. This asynchronous initialization forces the thermal zone to be created with fake ops because they are mandotory and build a list of cooling devices which is used to lookup afterwards when the cooling device driver is registering itself.
As there could be a large number of changes, this first series provide some steps forward for a simpler device tree initialization.
More series for cleanup and code duplication removal will follow.
Quoted 8 lines
Changelog:
- v6:
- Folded patches 8, 9, 10
- Removedthermal_zone_get_trips()andthermal_zone_get_num_trips()
- Movedtz->ntrips=>tz->num_tripschanges into patch 11 to fix the git bisecting
Quoted 2 lines
I believe all the comments were addressed, is it fine if I merge this series ?
Yes, please!
Lukasz Luba
maintainerHi Daniel,
Quoted 31 lines · Daniel Lezcano
Hi Rafael,
Quoted 27 lines · Daniel Lezcano
The thermal framework initialization with the device tree appears to be complicated and hard to make it to evolve.
It contains duplication of almost the same thermal generic structures and has an assymetric initialization making hard any kind of serious changes for more complex features. One of them is the multiple sensors support per thermal zone.
In order to set the scene for the aforementioned feature with generic code, we need to cleanup and rework the device tree initialization.
However this rework is not obvious because of the multiple components entering in the composition of a thermal zone and being initialized at different moments. For instance, a cooling device can be initialized before a sensor, so the thermal zones must exist before the cooling device as well as the sensor. This asynchronous initialization forces the thermal zone to be created with fake ops because they are mandotory and build a list of cooling devices which is used to lookup afterwards when the cooling device driver is registering itself.
As there could be a large number of changes, this first series provide some steps forward for a simpler device tree initialization.
More series for cleanup and code duplication removal will follow.
Changelog:
Quoted 10 lines
Quoted 6 lines
- v6:
- Folded patches 8, 9, 10
- Removedthermal_zone_get_trips()andthermal_zone_get_num_trips()
- Movedtz->ntrips=>tz->num_tripschanges into patch 11 to fix the git bisectingI believe all the comments were addressed, is it fine if I merge this series ?
My apologies for being quiet, I was on holiday last week. Please don't wait for me, I'm still catching up with internal stuff. Based on your changelog I can see you've addressed my comments.
Regards,
Lukasz