cpufreq: Move the IS_ENABLED(CPU_THERMAL) macro in a stub
Subsystems (5)
PATCH v4 1/3 cpufreq: Move the IS_ENABLED(CPU_THERMAL) macro in a stub
The cpufreq_online and the cpufreq_offline [un]register the driver as a cooling device. This is done if the driver is flagged as a cooling device in addition with a IS_ENABLED macro to compile out the branching code.
Group this test in a stub function added in the cpufreq header instead of having the IS_ENABLED in the code path.
--- drivers/cpufreq/cpufreq.c | 6 ++---- include/linux/cpufreq.h | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-)
drivers/cpufreq/cpufreq.c +2 -4
@@ -1378,8 +1378,7 @@ static int cpufreq_online(unsigned int cpu)if (cpufreq_driver->ready) cpufreq_driver->ready (policy); -if (IS_ENABLED (CONFIG_CPU_THERMAL ) && - cpufreq_driver->flags &CPUFREQ_IS_COOLING_DEV ) +if (cpufreq_thermal_control_enabled (cpufreq_driver)) policy->cdev =of_cpufreq_cooling_register (policy);pr_debug ("initialization complete\n" );
@@ -1469,8 +1468,7 @@ static int cpufreq_offline(unsigned int cpu) goto unlock; } -if (IS_ENABLED (CONFIG_CPU_THERMAL ) && - cpufreq_driver->flags &CPUFREQ_IS_COOLING_DEV ) { +if (cpufreq_thermal_control_enabled (cpufreq_driver)) {cpufreq_cooling_unregister (policy->cdev); policy->cdev =NULL ; }
include/linux/cpufreq.h +6 -0
@@ -409,6 +409,12 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver_data);const char *cpufreq_get_current_driver (void );void *cpufreq_get_driver_data (void ); +static inline int cpufreq_thermal_control_enabled (struct cpufreq_driver *drv) +{ +return IS_ENABLED (CONFIG_CPU_THERMAL ) && + (drv->flags &CPUFREQ_IS_COOLING_DEV ); +} +static inline void cpufreq_verify_within_limits (struct cpufreq_policy *policy,unsigned int min,unsigned int max) {
Signature · 1 line
2.17.1
PATCH v4 2/3 thermal/drivers/cpu_cooling: Unregister with the policy
Currently the function cpufreq_cooling_register() returns a cooling device pointer which is used back as a pointer to call the function cpufreq_cooling_unregister(). Even if it is correct, it would make sense to not leak the structure inside a cpufreq driver and keep the code thermal code self-encapsulate. Moreover, that forces to add an extra variable in each driver using this function.
Instead of passing the cooling device to unregister, pass the policy.
Because the cpufreq_cooling_unregister() function uses the policy to unregister itself. The only purpose of the cooling device pointer is to unregister the cpu cooling device.
As there is no more need of this pointer, remove it.
--- drivers/cpufreq/arm_big_little.c | 9 ++-- drivers/cpufreq/cpufreq.c | 8 ++-- drivers/thermal/cpu_cooling.c | 42 +++++++++++-------- drivers/thermal/imx_thermal.c | 12 +++--- .../ti-soc-thermal/ti-thermal-common.c | 10 ++--- include/linux/cpu_cooling.h | 6 +-- include/linux/cpufreq.h | 3 -- 7 files changed, 45 insertions(+), 45 deletions(-)
drivers/cpufreq/arm_big_little.c +3 -6
@@ -56,7 +56,6 @@ static bool bL_switching_enabled;#define ACTUAL_FREQ (cluster, freq) ((cluster == A7_CLUSTER) ? freq << 1 : freq)#define VIRT_FREQ (cluster, freq) ((cluster == A7_CLUSTER) ? freq >> 1 : freq) -static struct thermal_cooling_device *cdev[MAX_CLUSTERS ];static const struct cpufreq_arm_bL_ops *arm_bL_ops;static struct clk *clk[MAX_CLUSTERS ];static struct cpufreq_frequency_table *freq_table[MAX_CLUSTERS +1 ];
@@ -501,10 +500,8 @@ static int bL_cpufreq_exit(struct cpufreq_policy *policy)struct device *cpu_dev;int cur_cluster =cpu_to_cluster (policy->cpu); -if (cur_cluster <MAX_CLUSTERS ) { -cpufreq_cooling_unregister (cdev[cur_cluster]); - cdev[cur_cluster] =NULL ; - } +if (cur_cluster <MAX_CLUSTERS ) +cpufreq_cooling_unregister (policy); cpu_dev =get_cpu_device (policy->cpu);if (!cpu_dev) {
@@ -527,7 +524,7 @@ static void bL_cpufreq_ready(struct cpufreq_policy *policy)if (cur_cluster >=MAX_CLUSTERS )return ; - cdev[cur_cluster] =of_cpufreq_cooling_register (policy); +of_cpufreq_cooling_register (policy); }static struct cpufreq_driver bL_cpufreq_driver = {
drivers/cpufreq/cpufreq.c +3 -5
@@ -1379,7 +1379,7 @@ static int cpufreq_online(unsigned int cpu) cpufreq_driver->ready (policy);if (cpufreq_thermal_control_enabled (cpufreq_driver)) - policy->cdev =of_cpufreq_cooling_register (policy); +of_cpufreq_cooling_register (policy);pr_debug ("initialization complete\n" );
@@ -1468,10 +1468,8 @@ static int cpufreq_offline(unsigned int cpu) goto unlock; } -if (cpufreq_thermal_control_enabled (cpufreq_driver)) { -cpufreq_cooling_unregister (policy->cdev); - policy->cdev =NULL ; - } +if (cpufreq_thermal_control_enabled (cpufreq_driver)) +cpufreq_cooling_unregister (policy);if (cpufreq_driver->stop_cpu) cpufreq_driver->stop_cpu (policy);
drivers/thermal/cpu_cooling.c +25 -17
72 lines not on this page · raw message
drivers/thermal/imx_thermal.c +6 -6
@@ -203,7 +203,6 @@ static struct thermal_soc_data thermal_imx7d_data = {struct imx_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *tz; -struct thermal_cooling_device *cdev;enum thermal_device_mode mode;struct regmap *tempmon;u32 c1, c2;/* See formula in imx_init_calib() */
@@ -656,6 +655,7 @@ MODULE_DEVICE_TABLE(of, of_imx_thermal_match);static int imx_thermal_register_legacy_cooling (struct imx_thermal_data *data) {struct device_node *np; +struct thermal_cooling_device *cdev;int ret; data->policy =cpufreq_cpu_get (0 );
@@ -667,9 +667,9 @@ static int imx_thermal_register_legacy_cooling(struct imx_thermal_data *data) np =of_get_cpu_node (data->policy->cpu,NULL );if (!np || !of_find_property (np,"#cooling-cells" ,NULL )) { - data->cdev =cpufreq_cooling_register (data->policy); -if (IS_ERR (data->cdev)) { - ret =PTR_ERR (data->cdev); + cdev =cpufreq_cooling_register (data->policy); +if (IS_ERR (cdev)) { + ret =PTR_ERR (cdev);cpufreq_cpu_put (data->policy);return ret; }
@@ -680,7 +680,7 @@ static int imx_thermal_register_legacy_cooling(struct imx_thermal_data *data)static void imx_thermal_unregister_legacy_cooling (struct imx_thermal_data *data) { -cpufreq_cooling_unregister (data->cdev); +cpufreq_cooling_unregister (data->policy);cpufreq_cpu_put (data->policy); }
@@ -872,7 +872,7 @@ static int imx_thermal_remove(struct platform_device *pdev)clk_disable_unprepare (data->thermal_clk);thermal_zone_device_unregister (data->tz); -cpufreq_cooling_unregister (data->cdev); +cpufreq_cooling_unregister (data->policy);cpufreq_cpu_put (data->policy);return 0 ;
drivers/thermal/ti-soc-thermal/ti-thermal-common.c +5 -5
@@ -41,7 +41,6 @@ struct ti_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *ti_thermal;struct thermal_zone_device *pcb_tz; -struct thermal_cooling_device *cool_dev;struct ti_bandgap *bgp;enum thermal_device_mode mode;struct work_struct thermal_wq;
@@ -233,6 +232,7 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id) {struct ti_thermal_data *data;struct device_node *np = bgp->dev->of_node; +struct thermal_cooling_device *cdev;/* * We are assuming here that if one deploys the zone
@@ -256,9 +256,9 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id) }/* Register cooling device */ - data->cool_dev =cpufreq_cooling_register (data->policy); -if (IS_ERR (data->cool_dev)) { -int ret =PTR_ERR (data->cool_dev); + cdev =cpufreq_cooling_register (data->policy); +if (IS_ERR (cdev)) { +int ret =PTR_ERR (cdev);dev_err (bgp->dev,"Failed to register cpu cooling device %d\n" , ret);cpufreq_cpu_put (data->policy);
@@ -277,7 +277,7 @@ int ti_thermal_unregister_cpu_cooling(struct ti_bandgap *bgp, int id) data =ti_bandgap_get_sensor_data (bgp, id);if (data) { -cpufreq_cooling_unregister (data->cool_dev); +cpufreq_cooling_unregister (data->policy);if (data->policy)cpufreq_cpu_put (data->policy); }
include/linux/cpu_cooling.h +3 -3
@@ -29,9 +29,9 @@ cpufreq_cooling_register(struct cpufreq_policy *policy);/** * cpufreq_cooling_unregister - function to remove cpufreq cooling device. -* @cdev: thermal cooling device pointer. +* @policy: cpufreq policy */ -void cpufreq_cooling_unregister (struct thermal_cooling_device *cdev); +void cpufreq_cooling_unregister (struct cpufreq_policy *policy);#else /* !CONFIG_CPU_THERMAL */ static inline struct thermal_cooling_device *
@@ -41,7 +41,7 @@ cpufreq_cooling_register(struct cpufreq_policy *policy) }static inline -void cpufreq_cooling_unregister (struct thermal_cooling_device *cdev) +void cpufreq_cooling_unregister (struct cpufreq_policy *policy) {return ; }
include/linux/cpufreq.h +0 -3
@@ -144,9 +144,6 @@ struct cpufreq_policy {/* For cpufreq driver's internal use */ void *driver_data; - -/* Pointer to the cooling device if used for thermal mitigation */ -struct thermal_cooling_device *cdev; };struct cpufreq_freqs {
Signature · 1 line
2.17.1
Rafael J. Wysocki
maintainerRe: [PATCH V4 2/3] thermal/drivers/cpu_cooling: Unregister with the policy
Quoted 10 lines · Daniel Lezcano
Currently the function
cpufreq_cooling_register()returns a cooling device pointer which is used back as a pointer to call the functioncpufreq_cooling_unregister(). Even if it is correct, it would make sense to not leak the structure inside a cpufreq driver and keep the code thermal code self-encapsulate. Moreover, that forces to add an extra variable in each driver using this function.Instead of passing the cooling device to unregister, pass the policy.
Quoted 8 lines
Because the
cpufreq_cooling_unregister()function uses the policy to unregister itself. The only purpose of the cooling device pointer is to unregister the cpu cooling device.As there is no more need of this pointer, remove it.
Signed-off-by Daniel Lezcano <[email protected]>Acked-by Viresh Kumar <[email protected]>
This doesn't apply for me.
Care to rebase it on top of the Linus' tree?
Also see below.
Quoted 107 lines
--- drivers/cpufreq/arm_big_little.c | 9 ++-- drivers/cpufreq/cpufreq.c | 8 ++-- drivers/thermal/cpu_cooling.c | 42 +++++++++++-------- drivers/thermal/imx_thermal.c | 12 +++--- .../ti-soc-thermal/ti-thermal-common.c | 10 ++--- include/linux/cpu_cooling.h | 6 +-- include/linux/cpufreq.h | 3 -- 7 files changed, 45 insertions(+), 45 deletions(-)drivers/cpufreq/arm_big_little.c +3
-6@@ -56,7 +56,6 @@ static bool bL_switching_enabled;#define ACTUAL_FREQ (cluster, freq) ((cluster == A7_CLUSTER) ? freq << 1 : freq)#define VIRT_FREQ (cluster, freq) ((cluster == A7_CLUSTER) ? freq >> 1 : freq) -static struct thermal_cooling_device *cdev[MAX_CLUSTERS ];static const struct cpufreq_arm_bL_ops *arm_bL_ops;static struct clk *clk[MAX_CLUSTERS ];static struct cpufreq_frequency_table *freq_table[MAX_CLUSTERS +1 ];@@ -501,10 +500,8 @@ static int bL_cpufreq_exit(struct cpufreq_policy *policy)struct device *cpu_dev;int cur_cluster =cpu_to_cluster (policy->cpu); -if (cur_cluster <MAX_CLUSTERS ) { -cpufreq_cooling_unregister (cdev[cur_cluster]); - cdev[cur_cluster] =NULL ; - } +if (cur_cluster <MAX_CLUSTERS ) +cpufreq_cooling_unregister (policy); cpu_dev =get_cpu_device (policy->cpu);if (!cpu_dev) {@@ -527,7 +524,7 @@ static void bL_cpufreq_ready(struct cpufreq_policy *policy)if (cur_cluster >=MAX_CLUSTERS )return ; - cdev[cur_cluster] =of_cpufreq_cooling_register (policy); +of_cpufreq_cooling_register (policy); }static struct cpufreq_driver bL_cpufreq_driver = {drivers/cpufreq/cpufreq.c +3
-5@@ -1379,7 +1379,7 @@ static int cpufreq_online(unsigned int cpu) cpufreq_driver->ready (policy);if (cpufreq_thermal_control_enabled (cpufreq_driver)) - policy->cdev =of_cpufreq_cooling_register (policy); +of_cpufreq_cooling_register (policy);pr_debug ("initialization complete\n" );@@ -1468,10 +1468,8 @@ static int cpufreq_offline(unsigned int cpu) goto unlock; } -if (cpufreq_thermal_control_enabled (cpufreq_driver)) { -cpufreq_cooling_unregister (policy->cdev); - policy->cdev =NULL ; - } +if (cpufreq_thermal_control_enabled (cpufreq_driver)) +cpufreq_cooling_unregister (policy);if (cpufreq_driver->stop_cpu) cpufreq_driver->stop_cpu (policy);drivers/thermal/cpu_cooling.c +15
-0@@ -78,6 +78,7 @@ struct cpufreq_cooling_device {struct cpufreq_policy *policy;struct list_head node;struct time_in_idle *idle_time; +struct thermal_cooling_device *cdev; };static DEFINE_IDA (cpufreq_ida);@@ -606,6 +607,7 @@ __cpufreq_cooling_register(struct device_node *np, goto remove_ida; cpufreq_cdev->clipped_freq =get_state_freq (cpufreq_cdev,0 ); + cpufreq_cdev->cdev = cdev;mutex_lock (&cooling_list_lock);/* Register the notifier for first cpufreq cooling device */ @@ -693,35 +695,41 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) }EXPORT_SYMBOL_GPL (of_cpufreq_cooling_register); +void __cpufreq_cooling_unregister (struct cpufreq_cooling_device *cpufreq_cdev,int last) +{ +/* Unregister the notifier for the last cpufreq cooling device */ +if (last) +cpufreq_unregister_notifier (&thermal_cpufreq_notifier_block, +CPUFREQ_POLICY_NOTIFIER ); + +thermal_cooling_device_unregister (cpufreq_cdev->cdev); +ida_simple_remove (&cpufreq_ida, cpufreq_cdev->id); +kfree (cpufreq_cdev->idle_time); +kfree (cpufreq_cdev); +} +
drivers/thermal/cpu_cooling.c of_cpufreq_cooling_register(struct cpufreq_policy *policy) · line 719
Quoted 10 lines
drivers/thermal/cpu_cooling.c +1
-1/** * cpufreq_cooling_unregister - function to remove cpufreq cooling device. * @cdev: thermal cooling device pointer. * * This interface function unregisters the "thermal-cpufreq-%x" cooling device. */ -void cpufreq_cooling_unregister (struct thermal_cooling_device *cdev) +void cpufreq_cooling_unregister (struct cpufreq_policy *policy) {struct cpufreq_cooling_device *cpufreq_cdev;
I would do
struct cpufreq_cooling_device *ccd, *cpufreq_cdev = NULL;
and then ->
drivers/thermal/cpu_cooling.c of_cpufreq_cooling_register(struct cpufreq_policy *policy) · line 723
Quoted 12 lines
drivers/thermal/cpu_cooling.c +1
-8bool last; -if (!cdev) -return ; - - cpufreq_cdev = cdev->devdata; -mutex_lock (&cooling_list_lock); -list_del (&cpufreq_cdev->node); -/* Unregister the notifier for the last cpufreq cooling device */ - last =list_empty (&cpufreq_cdev_list); +list_for_each_entry (cpufreq_cdev, &cpufreq_cdev_list, node) {
-> list_for_each_entry(ccd, &cpufreq_cdev_list, node) {
if (ccd->policy == policy) {drivers/thermal/cpu_cooling.c of_cpufreq_cooling_register(struct cpufreq_policy *policy) · line 724
Quoted 1 line
drivers/thermal/cpu_cooling.c +1
-0+if (cpufreq_cdev->policy == policy) {
cpufreq_cdev = ccd;
drivers/thermal/cpu_cooling.c of_cpufreq_cooling_register(struct cpufreq_policy *policy) · line 730
Quoted 6 lines
drivers/thermal/cpu_cooling.c +5
-0+list_del (&cpufreq_cdev->node); + last =list_empty (&cpufreq_cdev_list); +break ; + } + }mutex_unlock (&cooling_list_lock);
And here
if (!cpufreq_cdev)
return;
And that's it. No new functions needed.
drivers/thermal/cpu_cooling.c of_cpufreq_cooling_register(struct cpufreq_policy *policy) · line 721
Quoted 4 lines
drivers/thermal/cpu_cooling.c +0
-4-if (last) -cpufreq_unregister_notifier (&thermal_cpufreq_notifier_block, -CPUFREQ_POLICY_NOTIFIER ); -
And I don't that the above needs to be changed at all in any case.
Quoted 143 lines
drivers/thermal/cpu_cooling.c +2
-4-thermal_cooling_device_unregister (cdev); -ida_simple_remove (&cpufreq_ida, cpufreq_cdev->id); -kfree (cpufreq_cdev->idle_time); -kfree (cpufreq_cdev); +if (cpufreq_cdev->policy == policy) +__cpufreq_cooling_unregister (cpufreq_cdev, last); }EXPORT_SYMBOL_GPL (cpufreq_cooling_unregister);drivers/thermal/imx_thermal.c +6
-6@@ -203,7 +203,6 @@ static struct thermal_soc_data thermal_imx7d_data = {struct imx_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *tz; -struct thermal_cooling_device *cdev;enum thermal_device_mode mode;struct regmap *tempmon;u32 c1, c2;/* See formula in imx_init_calib() */ @@ -656,6 +655,7 @@ MODULE_DEVICE_TABLE(of, of_imx_thermal_match);static int imx_thermal_register_legacy_cooling (struct imx_thermal_data *data) {struct device_node *np; +struct thermal_cooling_device *cdev;int ret; data->policy =cpufreq_cpu_get (0 );@@ -667,9 +667,9 @@ static int imx_thermal_register_legacy_cooling(struct imx_thermal_data *data) np =of_get_cpu_node (data->policy->cpu,NULL );if (!np || !of_find_property (np,"#cooling-cells" ,NULL )) { - data->cdev =cpufreq_cooling_register (data->policy); -if (IS_ERR (data->cdev)) { - ret =PTR_ERR (data->cdev); + cdev =cpufreq_cooling_register (data->policy); +if (IS_ERR (cdev)) { + ret =PTR_ERR (cdev);cpufreq_cpu_put (data->policy);return ret; }@@ -680,7 +680,7 @@ static int imx_thermal_register_legacy_cooling(struct imx_thermal_data *data)static void imx_thermal_unregister_legacy_cooling (struct imx_thermal_data *data) { -cpufreq_cooling_unregister (data->cdev); +cpufreq_cooling_unregister (data->policy);cpufreq_cpu_put (data->policy); }@@ -872,7 +872,7 @@ static int imx_thermal_remove(struct platform_device *pdev)clk_disable_unprepare (data->thermal_clk);thermal_zone_device_unregister (data->tz); -cpufreq_cooling_unregister (data->cdev); +cpufreq_cooling_unregister (data->policy);cpufreq_cpu_put (data->policy);return 0 ;drivers/thermal/ti-soc-thermal/ti-thermal-common.c +5
-5@@ -41,7 +41,6 @@ struct ti_thermal_data {struct cpufreq_policy *policy;struct thermal_zone_device *ti_thermal;struct thermal_zone_device *pcb_tz; -struct thermal_cooling_device *cool_dev;struct ti_bandgap *bgp;enum thermal_device_mode mode;struct work_struct thermal_wq;@@ -233,6 +232,7 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id) {struct ti_thermal_data *data;struct device_node *np = bgp->dev->of_node; +struct thermal_cooling_device *cdev;/* * We are assuming here that if one deploys the zone @@ -256,9 +256,9 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id) }/* Register cooling device */ - data->cool_dev =cpufreq_cooling_register (data->policy); -if (IS_ERR (data->cool_dev)) { -int ret =PTR_ERR (data->cool_dev); + cdev =cpufreq_cooling_register (data->policy); +if (IS_ERR (cdev)) { +int ret =PTR_ERR (cdev);dev_err (bgp->dev,"Failed to register cpu cooling device %d\n" , ret);cpufreq_cpu_put (data->policy);@@ -277,7 +277,7 @@ int ti_thermal_unregister_cpu_cooling(struct ti_bandgap *bgp, int id) data =ti_bandgap_get_sensor_data (bgp, id);if (data) { -cpufreq_cooling_unregister (data->cool_dev); +cpufreq_cooling_unregister (data->policy);if (data->policy)cpufreq_cpu_put (data->policy); }include/linux/cpu_cooling.h +3
-3@@ -29,9 +29,9 @@ cpufreq_cooling_register(struct cpufreq_policy *policy);/** * cpufreq_cooling_unregister - function to remove cpufreq cooling device. -* @cdev: thermal cooling device pointer. +* @policy: cpufreq policy */ -void cpufreq_cooling_unregister (struct thermal_cooling_device *cdev); +void cpufreq_cooling_unregister (struct cpufreq_policy *policy);#else /* !CONFIG_CPU_THERMAL */ static inline struct thermal_cooling_device *@@ -41,7 +41,7 @@ cpufreq_cooling_register(struct cpufreq_policy *policy) }static inline -void cpufreq_cooling_unregister (struct thermal_cooling_device *cdev) +void cpufreq_cooling_unregister (struct cpufreq_policy *policy) {return ; }include/linux/cpufreq.h +0
-4@@ -144,9 +144,6 @@ struct cpufreq_policy {/* For cpufreq driver's internal use */ void *driver_data; - -/* Pointer to the cooling device if used for thermal mitigation */ -struct thermal_cooling_device *cdev; };struct cpufreq_freqs { --2.17.1
Re: [PATCH V4 2/3] thermal/drivers/cpu_cooling: Unregister with the policy
Quoted 16 lines · Rafael J. Wysocki
Quoted 14 lines · Daniel Lezcano
Currently the function
cpufreq_cooling_register()returns a cooling device pointer which is used back as a pointer to call the functioncpufreq_cooling_unregister(). Even if it is correct, it would make sense to not leak the structure inside a cpufreq driver and keep the code thermal code self-encapsulate. Moreover, that forces to add an extra variable in each driver using this function.Instead of passing the cooling device to unregister, pass the policy.
Because the
cpufreq_cooling_unregister()function uses the policy to unregister itself. The only purpose of the cooling device pointer is to unregister the cpu cooling device.
Quoted 8 lines
Quoted 4 lines
As there is no more need of this pointer, remove it.
Signed-off-by Daniel Lezcano <[email protected]>Acked-by Viresh Kumar <[email protected]>This doesn't apply for me.
Care to rebase it on top of the Linus' tree?
Sure but the patch depends on 1/3 which is in bleeding edge. Shall I rebase the 3 patches on v5.2-rc6 and resend ?
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
maintainerRe: [PATCH V4 2/3] thermal/drivers/cpu_cooling: Unregister with the policy
Quoted 24 lines · Daniel Lezcano
Quoted 21 lines · Rafael J. Wysocki
Quoted 18 lines · Daniel Lezcano
Currently the function
cpufreq_cooling_register()returns a cooling device pointer which is used back as a pointer to call the functioncpufreq_cooling_unregister(). Even if it is correct, it would make sense to not leak the structure inside a cpufreq driver and keep the code thermal code self-encapsulate. Moreover, that forces to add an extra variable in each driver using this function.Instead of passing the cooling device to unregister, pass the policy.
Because the
cpufreq_cooling_unregister()function uses the policy to unregister itself. The only purpose of the cooling device pointer is to unregister the cpu cooling device.As there is no more need of this pointer, remove it.
Signed-off-by Daniel Lezcano <[email protected]>Acked-by Viresh Kumar <[email protected]>
Quoted 6 lines
Quoted 3 lines
This doesn't apply for me.
Care to rebase it on top of the Linus' tree?
Sure but the patch depends on 1/3 which is in bleeding edge. Shall I rebase the 3 patches on v5.2-rc6 and resend ?
You can do that.
Alternatively, you can rebase on top of my linux-next branch.
Re: [PATCH V4 2/3] thermal/drivers/cpu_cooling: Unregister with the policy
Quoted 28 lines · Rafael J. Wysocki
Quoted 26 lines · Daniel Lezcano
Quoted 23 lines · Rafael J. Wysocki
Quoted 10 lines · Daniel Lezcano
Currently the function
cpufreq_cooling_register()returns a cooling device pointer which is used back as a pointer to call the functioncpufreq_cooling_unregister(). Even if it is correct, it would make sense to not leak the structure inside a cpufreq driver and keep the code thermal code self-encapsulate. Moreover, that forces to add an extra variable in each driver using this function.Instead of passing the cooling device to unregister, pass the policy.
Quoted 8 lines
Because the
cpufreq_cooling_unregister()function uses the policy to unregister itself. The only purpose of the cooling device pointer is to unregister the cpu cooling device.As there is no more need of this pointer, remove it.
Signed-off-by Daniel Lezcano <[email protected]>Acked-by Viresh Kumar <[email protected]>This doesn't apply for me.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Care to rebase it on top of the Linus' tree?
Sure but the patch depends on 1/3 which is in bleeding edge. Shall I rebase the 3 patches on v5.2-rc6 and resend ?
You can do that.
Alternatively, you can rebase on top of my linux-next branch.
Ok, it is rebased on top of linux-next, however the conflict is coming from the energy model patchset sent by Quentin [1][2] I used to based my series which is not yet applied in the thermal tree.
I'm wondering if it wouldn't make sense to take Quentin's series also, it is a long time around in the mailing list, reviewed and acked. So I can send the two remaining patches on top of it without conflict, otherwise we will have a conflict in the merge window.
[1] https://lkml.org/lkml/2019/5/30/794
[2] https://lkml.org/lkml/2019/6/19/190
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
maintainerRe: [PATCH V4 2/3] thermal/drivers/cpu_cooling: Unregister with the policy
In reply to Rafael J. WysockiQuoted 21 lines · Rafael J. Wysocki
Quoted 18 lines · Daniel Lezcano
Currently the function
cpufreq_cooling_register()returns a cooling device pointer which is used back as a pointer to call the functioncpufreq_cooling_unregister(). Even if it is correct, it would make sense to not leak the structure inside a cpufreq driver and keep the code thermal code self-encapsulate. Moreover, that forces to add an extra variable in each driver using this function.Instead of passing the cooling device to unregister, pass the policy.
Because the
cpufreq_cooling_unregister()function uses the policy to unregister itself. The only purpose of the cooling device pointer is to unregister the cpu cooling device.As there is no more need of this pointer, remove it.
Signed-off-by Daniel Lezcano <[email protected]>Acked-by Viresh Kumar <[email protected]>
[cut]
Quoted 10 lines
drivers/thermal/cpu_cooling.c of_cpufreq_cooling_register(struct cpufreq_policy *policy) · line 719
Quoted 4 lines
drivers/thermal/cpu_cooling.c +1
-1-void cpufreq_cooling_unregister (struct thermal_cooling_device *cdev) +void cpufreq_cooling_unregister (struct cpufreq_policy *policy) {struct cpufreq_cooling_device *cpufreq_cdev;I would do
struct cpufreq_cooling_device *ccd, *cpufreq_cdev = NULL;and then ->
Not even that. ->
Quoted 28 lines
drivers/thermal/cpu_cooling.c of_cpufreq_cooling_register(struct cpufreq_policy *policy) · line 723
Quoted 13 lines
bool last;drivers/thermal/cpu_cooling.c +1
-8-if (!cdev) -return ; - - cpufreq_cdev = cdev->devdata; -mutex_lock (&cooling_list_lock); -list_del (&cpufreq_cdev->node); -/* Unregister the notifier for the last cpufreq cooling device */ - last =list_empty (&cpufreq_cdev_list); +list_for_each_entry (cpufreq_cdev, &cpufreq_cdev_list, node) {-> list_for_each_entry(ccd, &cpufreq_cdev_list, node) { if (ccd->policy == policy) {Quoted 1 line
+ if (
cpufreq_cdev->policy== policy) {cpufreq_cdev = ccd;drivers/thermal/cpu_cooling.c of_cpufreq_cooling_register(struct cpufreq_policy *policy) · line 730
Quoted 6 lines
drivers/thermal/cpu_cooling.c +5
-0+list_del (&cpufreq_cdev->node); + last =list_empty (&cpufreq_cdev_list); +break ; + } + }mutex_unlock (&cooling_list_lock);
Quoted 4 lines
And here
if (!cpufreq_cdev)
return;
-> It would be sufficient to simply do:
if (cpufreq_cdev->policy != policy)
return;
here AFAICS.
Quoted 18 lines
And that's it. No new functions needed.
drivers/thermal/cpu_cooling.c of_cpufreq_cooling_register(struct cpufreq_policy *policy) · line 721
Quoted 4 lines
drivers/thermal/cpu_cooling.c +0
-4-if (last) -cpufreq_unregister_notifier (&thermal_cpufreq_notifier_block, -CPUFREQ_POLICY_NOTIFIER ); -And I don't that the above needs to be changed at all in any case.
Quoted 7 lines
drivers/thermal/cpu_cooling.c +2
-4-thermal_cooling_device_unregister (cdev); -ida_simple_remove (&cpufreq_ida, cpufreq_cdev->id); -kfree (cpufreq_cdev->idle_time); -kfree (cpufreq_cdev); +if (cpufreq_cdev->policy == policy) +__cpufreq_cooling_unregister (cpufreq_cdev, last); }
PATCH v4 3/3 thermal/drivers/cpu_cooling: cpufreq_cooling_register returns an int
In reply to Daniel LezcanoIt looks like after the changes in the patch the only reason for returning (struct thermal_cooling_device *) from cpufreq_cooling_register() is error checking, but it would be much more straightforward to return int for this purpose.
Moreover, that would prevent the callers of it from doing incorrect things with the returned pointers (like using it to unregister the cooling device).
Replace the returned value an integer instead of a pointer to a thermal cooling device structure.
--- drivers/thermal/cpu_cooling.c | 63 +++++++++---------- drivers/thermal/imx_thermal.c | 6 +- .../ti-soc-thermal/ti-thermal-common.c | 7 +-- include/linux/cpu_cooling.h | 16 ++--- 4 files changed, 40 insertions(+), 52 deletions(-)
drivers/thermal/cpu_cooling.c +29 -34
@@ -530,13 +530,12 @@ static struct notifier_block thermal_cpufreq_notifier_block = {* cooling devices. It also gives the opportunity to link the cooling device * with a device tree node, in order to bind it via the thermal DT code. * -* Return: a valid struct thermal_cooling_device pointer on success, -* on failure, it returns a corresponding ERR_PTR(). +* Return: zero on success, less than zero corresponding to the +* negative error code. */ -static struct thermal_cooling_device * -__cpufreq_cooling_register (struct device_node *np, -struct cpufreq_policy *policy, -struct em_perf_domain *em) +static int __cpufreq_cooling_register (struct device_node *np, +struct cpufreq_policy *policy, +struct em_perf_domain *em) {struct thermal_cooling_device *cdev;struct cpufreq_cooling_device *cpufreq_cdev;
@@ -548,19 +547,19 @@ __cpufreq_cooling_register(struct device_node *np,if (IS_ERR_OR_NULL (policy)) {pr_err ("%s: cpufreq policy isn't valid: %p\n" , __func__, policy); -return ERR_PTR (-EINVAL ); +return -EINVAL ; } i =cpufreq_table_count_valid_entries (policy);if (!i) {pr_debug ("%s: CPUFreq table not found or has no valid entries\n" , __func__); -return ERR_PTR (-ENODEV ); +return -ENODEV ; } cpufreq_cdev =kzalloc (sizeof (*cpufreq_cdev),GFP_KERNEL );if (!cpufreq_cdev) -return ERR_PTR (-ENOMEM ); +return -ENOMEM ; cpufreq_cdev->policy = policy; num_cpus =cpumask_weight (policy->related_cpus);
@@ -568,7 +567,7 @@ __cpufreq_cooling_register(struct device_node *np,sizeof (*cpufreq_cdev->idle_time), GFP_KERNEL);if (!cpufreq_cdev->idle_time) { - cdev =ERR_PTR (-ENOMEM ); + ret = -ENOMEM ; goto free_cdev; }
@@ -576,10 +575,8 @@ __cpufreq_cooling_register(struct device_node *np, cpufreq_cdev->max_level = i -1 ; ret =ida_simple_get (&cpufreq_ida,0 ,0 ,GFP_KERNEL ); -if (ret <0 ) { - cdev =ERR_PTR (ret); +if (ret <0 ) goto free_idle_time; - } cpufreq_cdev->id = ret; snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",
@@ -597,14 +594,16 @@ __cpufreq_cooling_register(struct device_node *np,if (policy->freq_table_sorted ==CPUFREQ_TABLE_UNSORTED ) {pr_err ("%s: unsorted frequency tables are not supported\n" , __func__); - cdev =ERR_PTR (-EINVAL ); + ret = -EINVAL ; goto remove_ida; } cdev =thermal_of_cooling_device_register (np, dev_name, cpufreq_cdev, cooling_ops); -if (IS_ERR (cdev)) +if (IS_ERR (cdev)) { + ret =PTR_ERR (cdev); goto remove_ida; + } cpufreq_cdev->clipped_freq =get_state_freq (cpufreq_cdev,0 ); cpufreq_cdev->cdev = cdev;
@@ -619,7 +618,7 @@ __cpufreq_cooling_register(struct device_node *np,cpufreq_register_notifier (&thermal_cpufreq_notifier_block,CPUFREQ_POLICY_NOTIFIER ); -return cdev; +return 0 ; remove_ida:ida_simple_remove (&cpufreq_ida, cpufreq_cdev->id);
@@ -627,7 +626,7 @@ __cpufreq_cooling_register(struct device_node *np,kfree (cpufreq_cdev->idle_time); free_cdev:kfree (cpufreq_cdev); -return cdev; +return ret; }/**
@@ -638,11 +637,10 @@ __cpufreq_cooling_register(struct device_node *np,* "thermal-cpufreq-%x". This api can support multiple instances of cpufreq * cooling devices. * -* Return: a valid struct thermal_cooling_device pointer on success, -* on failure, it returns a corresponding ERR_PTR(). +* Return: zero on success, less than zero corresponding to the +* negative error code. */ -struct thermal_cooling_device * -cpufreq_cooling_register (struct cpufreq_policy *policy) +int cpufreq_cooling_register (struct cpufreq_policy *policy) {return __cpufreq_cooling_register (NULL , policy,NULL ); }
@@ -664,34 +662,31 @@ EXPORT_SYMBOL_GPL(cpufreq_cooling_register);* It also takes into account, if property present in policy CPU node, the * static power consumed by the cpu. * -* Return: a valid struct thermal_cooling_device pointer on success, -* and NULL on failure. +* Return: zero on success, less than zero corresponding to the +* negative error code. */ -struct thermal_cooling_device * -of_cpufreq_cooling_register (struct cpufreq_policy *policy) +int of_cpufreq_cooling_register (struct cpufreq_policy *policy) {struct device_node *np =of_get_cpu_node (policy->cpu,NULL ); -struct thermal_cooling_device *cdev =NULL ; +int ret = -EINVAL ;if (!np) {pr_err ("cpu_cooling: OF node not available for cpu%d\n" , policy->cpu); -return NULL ; +return -EINVAL ; }if (of_find_property (np,"#cooling-cells" ,NULL )) {struct em_perf_domain *em =em_cpu_get (policy->cpu); - cdev =__cpufreq_cooling_register (np, policy, em); -if (IS_ERR (cdev)) { -pr_err ("cpu_cooling: cpu%d failed to register as cooling device: %ld\n" , - policy->cpu,PTR_ERR (cdev)); - cdev =NULL ; - } + ret =__cpufreq_cooling_register (np, policy, em); +if (ret) +pr_err ("cpu_cooling: cpu%d failed to register as cooling device: %d\n" , + policy->cpu, ret); }of_node_put (np); -return cdev; +return ret; }EXPORT_SYMBOL_GPL (of_cpufreq_cooling_register);
drivers/thermal/imx_thermal.c +2 -4
@@ -655,7 +655,6 @@ MODULE_DEVICE_TABLE(of, of_imx_thermal_match);static int imx_thermal_register_legacy_cooling (struct imx_thermal_data *data) {struct device_node *np; -struct thermal_cooling_device *cdev;int ret; data->policy =cpufreq_cpu_get (0 );
@@ -667,9 +666,8 @@ static int imx_thermal_register_legacy_cooling(struct imx_thermal_data *data) np =of_get_cpu_node (data->policy->cpu,NULL );if (!np || !of_find_property (np,"#cooling-cells" ,NULL )) { - cdev =cpufreq_cooling_register (data->policy); -if (IS_ERR (cdev)) { - ret =PTR_ERR (cdev); + ret =cpufreq_cooling_register (data->policy); +if (ret) {cpufreq_cpu_put (data->policy);return ret; }
drivers/thermal/ti-soc-thermal/ti-thermal-common.c +3 -4
@@ -232,7 +232,7 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id) {struct ti_thermal_data *data;struct device_node *np = bgp->dev->of_node; -struct thermal_cooling_device *cdev; +int ret;/* * We are assuming here that if one deploys the zone
@@ -256,9 +256,8 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id) }/* Register cooling device */ - cdev =cpufreq_cooling_register (data->policy); -if (IS_ERR (cdev)) { -int ret =PTR_ERR (cdev); + ret =cpufreq_cooling_register (data->policy); +if (ret) {dev_err (bgp->dev,"Failed to register cpu cooling device %d\n" , ret);cpufreq_cpu_put (data->policy);
include/linux/cpu_cooling.h +6 -10
@@ -24,8 +24,7 @@ struct cpufreq_policy;* cpufreq_cooling_register - function to create cpufreq cooling device. * @policy: cpufreq policy. */ -struct thermal_cooling_device * -cpufreq_cooling_register (struct cpufreq_policy *policy); +int cpufreq_cooling_register (struct cpufreq_policy *policy);/** * cpufreq_cooling_unregister - function to remove cpufreq cooling device.
@@ -34,10 +33,9 @@ cpufreq_cooling_register(struct cpufreq_policy *policy);void cpufreq_cooling_unregister (struct cpufreq_policy *policy);#else /* !CONFIG_CPU_THERMAL */ -static inline struct thermal_cooling_device * -cpufreq_cooling_register (struct cpufreq_policy *policy) +static inline int cpufreq_cooling_register (struct cpufreq_policy *policy) { -return ERR_PTR (-ENOSYS ); +return -ENOSYS ; } static inline
@@ -52,13 +50,11 @@ void cpufreq_cooling_unregister(struct cpufreq_policy *policy)* of_cpufreq_cooling_register - create cpufreq cooling device based on DT. * @policy: cpufreq policy. */ -struct thermal_cooling_device * -of_cpufreq_cooling_register (struct cpufreq_policy *policy); +int of_cpufreq_cooling_register (struct cpufreq_policy *policy);#else -static inline struct thermal_cooling_device * -of_cpufreq_cooling_register (struct cpufreq_policy *policy) +static inline int of_cpufreq_cooling_register (struct cpufreq_policy *policy) { -return NULL ; +return -ENOSYS ; }#endif /* defined(CONFIG_THERMAL_OF) && defined(CONFIG_CPU_THERMAL) */
Signature · 1 line
2.17.1
Re: [PATCH V4 3/3] thermal/drivers/cpu_cooling: cpufreq_cooling_register returns an int
Quoted 12 lines · Daniel Lezcano
It looks like after the changes in the patch the only reason for returning (struct
thermal_cooling_device*) fromcpufreq_cooling_register()is error checking, but it would be much more straightforward to return int for this purpose.Moreover, that would prevent the callers of it from doing incorrect things with the returned pointers (like using it to unregister the cooling device).
Replace the returned value an integer instead of a pointer to a thermal cooling device structure.
Quoted 8 lines
Suggested-by Rafael J. Wysocki <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>--- drivers/thermal/cpu_cooling.c | 63 +++++++++---------- drivers/thermal/imx_thermal.c | 6 +- .../ti-soc-thermal/ti-thermal-common.c | 7 +-- include/linux/cpu_cooling.h | 16 ++--- 4 files changed, 40 insertions(+), 52 deletions(-)
Signature · 1 line
viresh
Rafael J. Wysocki
maintainerQuoted 6 lines · Daniel Lezcano
The
cpufreq_onlineand thecpufreq_offline[un]register the driver as a cooling device. This is done if the driver is flagged as a cooling device in addition with aIS_ENABLEDmacro to compile out the branching code.
Quoted 6 lines
Group this test in a stub function added in the cpufreq header instead of having the
IS_ENABLEDin the code path.Suggested-by Rafael J. Wysocki <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>Acked-by Viresh Kumar <[email protected]>
This one has been queued up for 5.3 already, no need to resend.
Thanks!
Quoted 49 lines
--- drivers/cpufreq/cpufreq.c | 6 ++---- include/linux/cpufreq.h | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-)drivers/cpufreq/cpufreq.c +2
-4@@ -1378,8 +1378,7 @@ static int cpufreq_online(unsigned int cpu)if (cpufreq_driver->ready) cpufreq_driver->ready (policy); -if (IS_ENABLED (CONFIG_CPU_THERMAL ) && - cpufreq_driver->flags &CPUFREQ_IS_COOLING_DEV ) +if (cpufreq_thermal_control_enabled (cpufreq_driver)) policy->cdev =of_cpufreq_cooling_register (policy);pr_debug ("initialization complete\n" );@@ -1469,8 +1468,7 @@ static int cpufreq_offline(unsigned int cpu) goto unlock; } -if (IS_ENABLED (CONFIG_CPU_THERMAL ) && - cpufreq_driver->flags &CPUFREQ_IS_COOLING_DEV ) { +if (cpufreq_thermal_control_enabled (cpufreq_driver)) {cpufreq_cooling_unregister (policy->cdev); policy->cdev =NULL ; }include/linux/cpufreq.h +6
-1@@ -409,6 +409,12 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver_data);const char *cpufreq_get_current_driver (void );void *cpufreq_get_driver_data (void ); +static inline int cpufreq_thermal_control_enabled (struct cpufreq_driver *drv) +{ +return IS_ENABLED (CONFIG_CPU_THERMAL ) && + (drv->flags &CPUFREQ_IS_COOLING_DEV ); +} +static inline void cpufreq_verify_within_limits (struct cpufreq_policy *policy,unsigned int min,unsigned int max) { --2.17.1