lkml.org 
[lkml]   [2019]   [May]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v4 2/3] PM / EM: Expose perf domain struct
On Wednesday 15 May 2019 at 11:40:44 (+0100), Quentin Perret wrote:
> On Wednesday 15 May 2019 at 15:52:00 (+0530), Viresh Kumar wrote:
> > On 15-05-19, 12:16, Daniel Lezcano wrote:
> > > Viresh what do you think ?
> >
> > I agree with your last suggestions. They do make sense.
>
> Good :-)
>
> So, FWIW, the below compiles w/ or w/o THERMAL_GOV_POWER_ALLOCATOR. I'll
> test it and clean it up some more and put it as patch 1 in the series if
> that's OK.
>
> Thanks,
> Quentin
>
>
> diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
> index f7c1f49ec87f..ee431848ef71 100644
> --- a/drivers/thermal/cpu_cooling.c
> +++ b/drivers/thermal/cpu_cooling.c
> @@ -58,7 +58,9 @@
> */
> struct freq_table {
> u32 frequency;
> +#ifdef CONFIG_THERMAL_GOV_POWER_ALLOCATOR
> u32 power;
> +#endif
> };
>
> /**
> @@ -109,28 +111,6 @@ static DEFINE_IDA(cpufreq_ida);
> static DEFINE_MUTEX(cooling_list_lock);
> static LIST_HEAD(cpufreq_cdev_list);
>
> -/* Below code defines functions to be used for cpufreq as cooling device */
> -
> -/**
> - * get_level: Find the level for a particular frequency
> - * @cpufreq_cdev: cpufreq_cdev for which the property is required
> - * @freq: Frequency
> - *
> - * Return: level corresponding to the frequency.
> - */
> -static unsigned long get_level(struct cpufreq_cooling_device *cpufreq_cdev,
> - unsigned int freq)
> -{
> - struct freq_table *freq_table = cpufreq_cdev->freq_table;
> - unsigned long level;
> -
> - for (level = 1; level <= cpufreq_cdev->max_level; level++)
> - if (freq > freq_table[level].frequency)
> - break;
> -
> - return level - 1;
> -}
> -
> /**
> * cpufreq_thermal_notifier - notifier callback for cpufreq policy change.
> * @nb: struct notifier_block * with callback info.
> @@ -184,6 +164,27 @@ static int cpufreq_thermal_notifier(struct notifier_block *nb,
> return NOTIFY_OK;
> }
>
> +#ifdef CONFIG_THERMAL_GOV_POWER_ALLOCATOR
> +/**
> + * get_level: Find the level for a particular frequency
> + * @cpufreq_cdev: cpufreq_cdev for which the property is required
> + * @freq: Frequency
> + *
> + * Return: level corresponding to the frequency.
> + */
> +static unsigned long get_level(struct cpufreq_cooling_device *cpufreq_cdev,
> + unsigned int freq)
> +{
> + struct freq_table *freq_table = cpufreq_cdev->freq_table;
> + unsigned long level;
> +
> + for (level = 1; level <= cpufreq_cdev->max_level; level++)
> + if (freq > freq_table[level].frequency)
> + break;
> +
> + return level - 1;
> +}
> +
> /**
> * update_freq_table() - Update the freq table with power numbers
> * @cpufreq_cdev: the cpufreq cooling device in which to update the table
> @@ -333,80 +334,6 @@ static u32 get_dynamic_power(struct cpufreq_cooling_device *cpufreq_cdev,
> return (raw_cpu_power * cpufreq_cdev->last_load) / 100;
> }
>
> -/* cpufreq cooling device callback functions are defined below */
> -
> -/**
> - * cpufreq_get_max_state - callback function to get the max cooling state.
> - * @cdev: thermal cooling device pointer.
> - * @state: fill this variable with the max cooling state.
> - *
> - * Callback for the thermal cooling device to return the cpufreq
> - * max cooling state.
> - *
> - * Return: 0 on success, an error code otherwise.
> - */
> -static int cpufreq_get_max_state(struct thermal_cooling_device *cdev,
> - unsigned long *state)
> -{
> - struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;
> -
> - *state = cpufreq_cdev->max_level;
> - return 0;
> -}
> -
> -/**
> - * cpufreq_get_cur_state - callback function to get the current cooling state.
> - * @cdev: thermal cooling device pointer.
> - * @state: fill this variable with the current cooling state.
> - *
> - * Callback for the thermal cooling device to return the cpufreq
> - * current cooling state.
> - *
> - * Return: 0 on success, an error code otherwise.
> - */
> -static int cpufreq_get_cur_state(struct thermal_cooling_device *cdev,
> - unsigned long *state)
> -{
> - struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;
> -
> - *state = cpufreq_cdev->cpufreq_state;
> -
> - return 0;
> -}
> -
> -/**
> - * cpufreq_set_cur_state - callback function to set the current cooling state.
> - * @cdev: thermal cooling device pointer.
> - * @state: set this variable to the current cooling state.
> - *
> - * Callback for the thermal cooling device to change the cpufreq
> - * current cooling state.
> - *
> - * Return: 0 on success, an error code otherwise.
> - */
> -static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev,
> - unsigned long state)
> -{
> - struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;
> - unsigned int clip_freq;
> -
> - /* Request state should be less than max_level */
> - if (WARN_ON(state > cpufreq_cdev->max_level))
> - return -EINVAL;
> -
> - /* Check if the old cooling action is same as new cooling action */
> - if (cpufreq_cdev->cpufreq_state == state)
> - return 0;
> -
> - clip_freq = cpufreq_cdev->freq_table[state].frequency;
> - cpufreq_cdev->cpufreq_state = state;
> - cpufreq_cdev->clipped_freq = clip_freq;
> -
> - cpufreq_update_policy(cpufreq_cdev->policy->cpu);
> -
> - return 0;
> -}
> -
> /**
> * cpufreq_get_requested_power() - get the current power
> * @cdev: &thermal_cooling_device pointer
> @@ -551,22 +478,93 @@ static int cpufreq_power2state(struct thermal_cooling_device *cdev,
> power);
> return 0;
> }
> +#endif /* CONFIG_THERMAL_GOV_POWER_ALLOCATOR */
> +
> +/* cpufreq cooling device callback functions are defined below */
> +
> +/**
> + * cpufreq_get_max_state - callback function to get the max cooling state.
> + * @cdev: thermal cooling device pointer.
> + * @state: fill this variable with the max cooling state.
> + *
> + * Callback for the thermal cooling device to return the cpufreq
> + * max cooling state.
> + *
> + * Return: 0 on success, an error code otherwise.
> + */
> +static int cpufreq_get_max_state(struct thermal_cooling_device *cdev,
> + unsigned long *state)
> +{
> + struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;
> +
> + *state = cpufreq_cdev->max_level;
> + return 0;
> +}
> +
> +/**
> + * cpufreq_get_cur_state - callback function to get the current cooling state.
> + * @cdev: thermal cooling device pointer.
> + * @state: fill this variable with the current cooling state.
> + *
> + * Callback for the thermal cooling device to return the cpufreq
> + * current cooling state.
> + *
> + * Return: 0 on success, an error code otherwise.
> + */
> +static int cpufreq_get_cur_state(struct thermal_cooling_device *cdev,
> + unsigned long *state)
> +{
> + struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;
> +
> + *state = cpufreq_cdev->cpufreq_state;
> +
> + return 0;
> +}
> +
> +/**
> + * cpufreq_set_cur_state - callback function to set the current cooling state.
> + * @cdev: thermal cooling device pointer.
> + * @state: set this variable to the current cooling state.
> + *
> + * Callback for the thermal cooling device to change the cpufreq
> + * current cooling state.
> + *
> + * Return: 0 on success, an error code otherwise.
> + */
> +static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev,
> + unsigned long state)
> +{
> + struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;
> + unsigned int clip_freq;
> +
> + /* Request state should be less than max_level */
> + if (WARN_ON(state > cpufreq_cdev->max_level))
> + return -EINVAL;
> +
> + /* Check if the old cooling action is same as new cooling action */
> + if (cpufreq_cdev->cpufreq_state == state)
> + return 0;
> +
> + clip_freq = cpufreq_cdev->freq_table[state].frequency;
> + cpufreq_cdev->cpufreq_state = state;
> + cpufreq_cdev->clipped_freq = clip_freq;
> +
> + cpufreq_update_policy(cpufreq_cdev->policy->cpu);
> +
> + return 0;
> +}
>
> /* Bind cpufreq callbacks to thermal cooling device ops */
>
> static struct thermal_cooling_device_ops cpufreq_cooling_ops = {
> - .get_max_state = cpufreq_get_max_state,
> - .get_cur_state = cpufreq_get_cur_state,
> - .set_cur_state = cpufreq_set_cur_state,
> -};
> -
> -static struct thermal_cooling_device_ops cpufreq_power_cooling_ops = {
> .get_max_state = cpufreq_get_max_state,
> .get_cur_state = cpufreq_get_cur_state,
> .set_cur_state = cpufreq_set_cur_state,
> +#ifdef CONFIG_THERMAL_GOV_POWER_ALLOCATOR
> .get_requested_power = cpufreq_get_requested_power,
> .state2power = cpufreq_state2power,
> .power2state = cpufreq_power2state,
> +#endif
> };
>
> /* Notifier for cpufreq policy change */
> @@ -674,17 +672,16 @@ __cpufreq_cooling_register(struct device_node *np,
> pr_debug("%s: freq:%u KHz\n", __func__, freq);
> }
>
> +#ifdef CONFIG_THERMAL_GOV_POWER_ALLOCATOR
> if (capacitance) {
> ret = update_freq_table(cpufreq_cdev, capacitance);
> if (ret) {
> cdev = ERR_PTR(ret);
> goto remove_ida;
> }
> -
> - cooling_ops = &cpufreq_power_cooling_ops;
> - } else {
> - cooling_ops = &cpufreq_cooling_ops;
> }
> +#endif
> + cooling_ops = &cpufreq_cooling_ops;

Argh, that is actually broken with !capacitance and
THERMAL_GOV_POWER_ALLOCATOR=y ... Perhaps it's best to keep the two
thermal_cooling_device_ops struct separated in the end.

>
> cdev = thermal_of_cooling_device_register(np, dev_name, cpufreq_cdev,
> cooling_ops);

\
 
 \ /
  Last update: 2019-05-15 12:47    [W:0.062 / U:23.004 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site