by Eduardo Valentin

[permalink] [raw]

Subject: Re: [PATCH 03/17] thermal: cpu_cooling: Replace cpufreq_device with cpufreq_dev

On Thu, Mar 16, 2017 at 10:59:38AM +0530, Viresh Kumar wrote:
> Objects of "struct cpufreq_cooling_device" are named a bit
> inconsistently. Lets use cpufreq_dev everywhere.
>

Naming is always a matter of taste.. but I frankly cannot see how this
patch improves anything here. cpufreq_dev is still misleading.

Here other options:
cpufreq_cooling_dev: not misleading but, may a bit too long..
cpufreq_cdev: better, but still, not a char dev

> Signed-off-by: Viresh Kumar <[email protected]>

Attachments:

(No filename) (502.00 B)
signature.asc (819.00 B)
Digital signature Download all attachments

2017-04-11 17:35:23

by Eduardo Valentin

[permalink] [raw]

Subject: Re: [PATCH 04/17] thermal: cpu_cooling: replace cool_dev with cdev

On Thu, Mar 16, 2017 at 10:59:39AM +0530, Viresh Kumar wrote:
> Objects of "struct thermal_cooling_device" are named a bit
> inconsistently. Lets use cdev everywhere.

In this case, cpufreq_cdev is best option on patch 3. Too bad we lost
the "cool" dev here :-)

>
> Signed-off-by: Viresh Kumar <[email protected]>
> ---
> drivers/thermal/cpu_cooling.c | 36 ++++++++++++++++++------------------
> 1 file changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
> index 7a19033d7f79..e2931c20c309 100644
> --- a/drivers/thermal/cpu_cooling.c
> +++ b/drivers/thermal/cpu_cooling.c
> @@ -65,7 +65,7 @@ struct power_table {
> * struct cpufreq_cooling_device - data for cooling device with cpufreq
> * @id: unique integer value corresponding to each cpufreq_cooling_device
> * registered.
> - * @cool_dev: thermal_cooling_device pointer to keep track of the
> + * @cdev: thermal_cooling_device pointer to keep track of the
> * registered cooling device.
> * @cpufreq_state: integer value representing the current state of cpufreq
> * cooling devices.
> @@ -90,7 +90,7 @@ struct power_table {
> */
> struct cpufreq_cooling_device {
> int id;
> - struct thermal_cooling_device *cool_dev;
> + struct thermal_cooling_device *cdev;
> unsigned int cpufreq_state;
> unsigned int clipped_freq;
> unsigned int max_level;
> @@ -243,7 +243,7 @@ static int build_dyn_power_table(struct cpufreq_cooling_device *cpufreq_dev,
> for_each_cpu(cpu, &cpufreq_dev->allowed_cpus) {
> dev = get_cpu_device(cpu);
> if (!dev) {
> - dev_warn(&cpufreq_dev->cool_dev->device,
> + dev_warn(&cpufreq_dev->cdev->device,
> "No cpu device for cpu %d\n", cpu);
> continue;
> }
> @@ -770,7 +770,7 @@ __cpufreq_cooling_register(struct device_node *np,
> get_static_t plat_static_func)
> {
> struct cpufreq_policy *policy;
> - struct thermal_cooling_device *cool_dev;
> + struct thermal_cooling_device *cdev;
> struct cpufreq_cooling_device *cpufreq_dev;
> char dev_name[THERMAL_NAME_LENGTH];
> struct cpufreq_frequency_table *pos, *table;
> @@ -786,20 +786,20 @@ __cpufreq_cooling_register(struct device_node *np,
> policy = cpufreq_cpu_get(cpumask_first(temp_mask));
> if (!policy) {
> pr_debug("%s: CPUFreq policy not found\n", __func__);
> - cool_dev = ERR_PTR(-EPROBE_DEFER);
> + cdev = ERR_PTR(-EPROBE_DEFER);
> goto free_cpumask;
> }
>
> table = policy->freq_table;
> if (!table) {
> pr_debug("%s: CPUFreq table not found\n", __func__);
> - cool_dev = ERR_PTR(-ENODEV);
> + cdev = ERR_PTR(-ENODEV);
> goto put_policy;
> }
>
> cpufreq_dev = kzalloc(sizeof(*cpufreq_dev), GFP_KERNEL);
> if (!cpufreq_dev) {
> - cool_dev = ERR_PTR(-ENOMEM);
> + cdev = ERR_PTR(-ENOMEM);
> goto put_policy;
> }
>
> @@ -808,7 +808,7 @@ __cpufreq_cooling_register(struct device_node *np,
> sizeof(*cpufreq_dev->time_in_idle),
> GFP_KERNEL);
> if (!cpufreq_dev->time_in_idle) {
> - cool_dev = ERR_PTR(-ENOMEM);
> + cdev = ERR_PTR(-ENOMEM);
> goto free_cdev;
> }
>
> @@ -816,7 +816,7 @@ __cpufreq_cooling_register(struct device_node *np,
> kcalloc(num_cpus, sizeof(*cpufreq_dev->time_in_idle_timestamp),
> GFP_KERNEL);
> if (!cpufreq_dev->time_in_idle_timestamp) {
> - cool_dev = ERR_PTR(-ENOMEM);
> + cdev = ERR_PTR(-ENOMEM);
> goto free_time_in_idle;
> }
>
> @@ -827,7 +827,7 @@ __cpufreq_cooling_register(struct device_node *np,
> cpufreq_dev->freq_table = kmalloc(sizeof(*cpufreq_dev->freq_table) *
> cpufreq_dev->max_level, GFP_KERNEL);
> if (!cpufreq_dev->freq_table) {
> - cool_dev = ERR_PTR(-ENOMEM);
> + cdev = ERR_PTR(-ENOMEM);
> goto free_time_in_idle_timestamp;
> }
>
> @@ -841,7 +841,7 @@ __cpufreq_cooling_register(struct device_node *np,
>
> ret = build_dyn_power_table(cpufreq_dev, capacitance);
> if (ret) {
> - cool_dev = ERR_PTR(ret);
> + cdev = ERR_PTR(ret);
> goto free_table;
> }
>
> @@ -852,7 +852,7 @@ __cpufreq_cooling_register(struct device_node *np,
>
> ret = ida_simple_get(&cpufreq_ida, 0, 0, GFP_KERNEL);
> if (ret < 0) {
> - cool_dev = ERR_PTR(ret);
> + cdev = ERR_PTR(ret);
> goto free_power_table;
> }
> cpufreq_dev->id = ret;
> @@ -872,13 +872,13 @@ __cpufreq_cooling_register(struct device_node *np,
> snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",
> cpufreq_dev->id);
>
> - cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,
> - cooling_ops);
> - if (IS_ERR(cool_dev))
> + cdev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,
> + cooling_ops);
> + if (IS_ERR(cdev))
> goto remove_ida;
>
> cpufreq_dev->clipped_freq = cpufreq_dev->freq_table[0];
> - cpufreq_dev->cool_dev = cool_dev;
> + cpufreq_dev->cdev = cdev;
>
> mutex_lock(&cooling_list_lock);
> list_add(&cpufreq_dev->node, &cpufreq_dev_list);
> @@ -907,7 +907,7 @@ __cpufreq_cooling_register(struct device_node *np,
> cpufreq_cpu_put(policy);
> free_cpumask:
> free_cpumask_var(temp_mask);
> - return cool_dev;
> + return cdev;
> }
>
> /**
> @@ -1043,7 +1043,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)
> list_del(&cpufreq_dev->node);
> mutex_unlock(&cooling_list_lock);
>
> - thermal_cooling_device_unregister(cpufreq_dev->cool_dev);
> + thermal_cooling_device_unregister(cpufreq_dev->cdev);
> ida_simple_remove(&cpufreq_ida, cpufreq_dev->id);
> kfree(cpufreq_dev->dyn_power_table);
> kfree(cpufreq_dev->time_in_idle_timestamp);
> --
> 2.7.1.410.g6faf27b
>

Attachments:

(No filename) (5.49 kB)
signature.asc (819.00 B)
Digital signature Download all attachments

2017-04-11 17:43:52

On 11-04-17, 10:43, Eduardo Valentin wrote:
> On Thu, Mar 16, 2017 at 10:59:40AM +0530, Viresh Kumar wrote:
> > There is only one user of cpufreq_cooling_get_level() and that already
> > has pointer to the cpufreq_dev structure. It can directly call
> > get_level() instead and we can get rid of cpufreq_cooling_get_level().
> >
> > Signed-off-by: Viresh Kumar <[email protected]>
> > ---
> > drivers/thermal/cpu_cooling.c | 33 +--------------------------------
> > include/linux/cpu_cooling.h | 6 ------
> > 2 files changed, 1 insertion(+), 38 deletions(-)
> >
> > diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
> > index e2931c20c309..99dc6833de75 100644
> > --- a/drivers/thermal/cpu_cooling.c
> > +++ b/drivers/thermal/cpu_cooling.c
> > @@ -137,37 +137,6 @@ static unsigned long get_level(struct cpufreq_cooling_device *cpufreq_dev,
> > }
> >
> > /**
> > - * cpufreq_cooling_get_level - for a given cpu, return the cooling level.
> > - * @cpu: cpu for which the level is required
> > - * @freq: the frequency of interest
> > - *
> > - * This function will match the cooling level corresponding to the
> > - * requested @freq and return it.
> > - *
> > - * Return: The matched cooling level on success or THERMAL_CSTATE_INVALID
> > - * otherwise.
> > - */
> > -unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq)
> > -{
> > - struct cpufreq_cooling_device *cpufreq_dev;
> > -
> > - mutex_lock(&cooling_list_lock);
> > - list_for_each_entry(cpufreq_dev, &cpufreq_dev_list, node) {
> > - if (cpumask_test_cpu(cpu, &cpufreq_dev->allowed_cpus)) {
> > - unsigned long level = get_level(cpufreq_dev, freq);
> > -
> > - mutex_unlock(&cooling_list_lock);
> > - return level;
> > - }
> > - }
> > - mutex_unlock(&cooling_list_lock);
> > -
> > - pr_err("%s: cpu:%d not part of any cooling device\n", __func__, cpu);
> > - return THERMAL_CSTATE_INVALID;
> > -}
> > -EXPORT_SYMBOL_GPL(cpufreq_cooling_get_level);
> > -
> > -/**
> > * cpufreq_thermal_notifier - notifier callback for cpufreq policy change.
> > * @nb: struct notifier_block * with callback info.
> > * @event: value showing cpufreq event for which this function invoked.
> > @@ -698,7 +667,7 @@ static int cpufreq_power2state(struct thermal_cooling_device *cdev,
> > normalised_power = (dyn_power * 100) / last_load;
> > target_freq = cpu_power_to_freq(cpufreq_dev, normalised_power);
> >
> > - *state = cpufreq_cooling_get_level(cpu, target_freq);
> > + *state = get_level(cpufreq_dev, target_freq);
>
> Did I miss something or we are loosing semantics here?

I just got rid of an unnecessary wrapper routine. That's it. There shouldn't be
any functional change after this patch.

> I guess the idea at this point is to get the level corresponding to the
> frequency on a specific cpu. Let's have a look on get_level()..
>
> I guess now we can rely on the freq table held in the
> cpufreq_cooling_device..

I am not sure I understood your concerns here :(

--
viresh