leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cppc_cpufreq: simplify use of performance capabilities

Browse Source 
The CPPC performance capabilities are used significantly throughout
the driver.

Simplify the use of them by introducing a local pointer "caps" to
point to cpu_data->perf_caps, in functions that access performance
capabilities often.

Signed-off-by: Ionela Voinescu <ionela.voinescu@arm.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Ionela Voinescu
2020-11-05 12:55:19 +00:00
committed by Rafael J. Wysocki
parent 48ad8dc940
commit bb025fb6c2
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/cpufreq/cppc_cpufreq.c
View File

@@ -183,15 +183,16 @@ static int cppc_verify_policy(struct cpufreq_policy_data *policy)
static void cppc_cpufreq_stop_cpu(struct cpufreq_policy *policy) static void cppc_cpufreq_stop_cpu(struct cpufreq_policy *policy)
{ {
struct cppc_cpudata *cpu_data = all_cpu_data[policy->cpu]; struct cppc_cpudata *cpu_data = all_cpu_data[policy->cpu];
struct cppc_perf_caps *caps = &cpu_data->perf_caps;
unsigned int cpu = policy->cpu; unsigned int cpu = policy->cpu;
int ret; int ret;
cpu_data->perf_ctrls.desired_perf = cpu_data->perf_caps.lowest_perf; cpu_data->perf_ctrls.desired_perf = caps->lowest_perf;
ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls); ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls);
if (ret) if (ret)
pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n", pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n",
cpu_data->perf_caps.lowest_perf, cpu, ret); caps->lowest_perf, cpu, ret);
} }
/* /*
@@ -240,11 +241,12 @@ static unsigned int cppc_cpufreq_get_transition_delay_us(unsigned int cpu)
static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy) static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
{ {
struct cppc_cpudata *cpu_data = all_cpu_data[policy->cpu]; struct cppc_cpudata *cpu_data = all_cpu_data[policy->cpu];
struct cppc_perf_caps *caps = &cpu_data->perf_caps;
unsigned int cpu = policy->cpu; unsigned int cpu = policy->cpu;
int ret = 0; int ret = 0;
cpu_data->cpu = cpu; cpu_data->cpu = cpu;
ret = cppc_get_perf_caps(cpu, &cpu_data->perf_caps); ret = cppc_get_perf_caps(cpu, caps);
if (ret) { if (ret) {
pr_debug("Err reading CPU%d perf capabilities. ret:%d\n", pr_debug("Err reading CPU%d perf capabilities. ret:%d\n",
@@ -253,23 +255,27 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
} }
/* Convert the lowest and nominal freq from MHz to KHz */ /* Convert the lowest and nominal freq from MHz to KHz */
cpu_data->perf_caps.lowest_freq *= 1000; caps->lowest_freq *= 1000;
cpu_data->perf_caps.nominal_freq *= 1000; caps->nominal_freq *= 1000;
/* /*
* Set min to lowest nonlinear perf to avoid any efficiency penalty (see * Set min to lowest nonlinear perf to avoid any efficiency penalty (see
* Section 8.4.7.1.1.5 of ACPI 6.1 spec) * Section 8.4.7.1.1.5 of ACPI 6.1 spec)
*/ */
policy->min = cppc_cpufreq_perf_to_khz(cpu_data, cpu_data->perf_caps.lowest_nonlinear_perf); policy->min = cppc_cpufreq_perf_to_khz(cpu_data,
policy->max = cppc_cpufreq_perf_to_khz(cpu_data, cpu_data->perf_caps.nominal_perf); caps->lowest_nonlinear_perf);
policy->max = cppc_cpufreq_perf_to_khz(cpu_data,
caps->nominal_perf);
/* /*
* Set cpuinfo.min_freq to Lowest to make the full range of performance * Set cpuinfo.min_freq to Lowest to make the full range of performance
* available if userspace wants to use any perf between lowest & lowest * available if userspace wants to use any perf between lowest & lowest
* nonlinear perf * nonlinear perf
*/ */
policy->cpuinfo.min_freq = cppc_cpufreq_perf_to_khz(cpu_data, cpu_data->perf_caps.lowest_perf); policy->cpuinfo.min_freq = cppc_cpufreq_perf_to_khz(cpu_data,
policy->cpuinfo.max_freq = cppc_cpufreq_perf_to_khz(cpu_data, cpu_data->perf_caps.nominal_perf); caps->lowest_perf);
policy->cpuinfo.max_freq = cppc_cpufreq_perf_to_khz(cpu_data,
caps->nominal_perf);
policy->transition_delay_us = cppc_cpufreq_get_transition_delay_us(cpu); policy->transition_delay_us = cppc_cpufreq_get_transition_delay_us(cpu);
policy->shared_type = cpu_data->shared_type; policy->shared_type = cpu_data->shared_type;
@@ -283,7 +289,7 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
if (unlikely(i == cpu)) if (unlikely(i == cpu))
continue; continue;
memcpy(&all_cpu_data[i]->perf_caps, &cpu_data->perf_caps, memcpy(&all_cpu_data[i]->perf_caps, caps,
sizeof(cpu_data->perf_caps)); sizeof(cpu_data->perf_caps));
} }
} else if (policy->shared_type == CPUFREQ_SHARED_TYPE_ALL) { } else if (policy->shared_type == CPUFREQ_SHARED_TYPE_ALL) {
@@ -298,18 +304,17 @@ static int cppc_cpufreq_cpu_init(struct cpufreq_policy *policy)
* If 'highest_perf' is greater than 'nominal_perf', we assume CPU Boost * If 'highest_perf' is greater than 'nominal_perf', we assume CPU Boost
* is supported. * is supported.
*/ */
if (cpu_data->perf_caps.highest_perf > cpu_data->perf_caps.nominal_perf) if (caps->highest_perf > caps->nominal_perf)
boost_supported = true; boost_supported = true;
/* Set policy->cur to max now. The governors will adjust later. */ /* Set policy->cur to max now. The governors will adjust later. */
policy->cur = cppc_cpufreq_perf_to_khz(cpu_data, policy->cur = cppc_cpufreq_perf_to_khz(cpu_data, caps->highest_perf);
cpu_data->perf_caps.highest_perf); cpu_data->perf_ctrls.desired_perf = caps->highest_perf;
cpu_data->perf_ctrls.desired_perf = cpu_data->perf_caps.highest_perf;
ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls); ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls);
if (ret) if (ret)
pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n", pr_debug("Err setting perf value:%d on CPU:%d. ret:%d\n",
cpu_data->perf_caps.highest_perf, cpu, ret); caps->highest_perf, cpu, ret);
return ret; return ret;
} }
@@ -368,6 +373,7 @@ static unsigned int cppc_cpufreq_get_rate(unsigned int cpu)
static int cppc_cpufreq_set_boost(struct cpufreq_policy *policy, int state) static int cppc_cpufreq_set_boost(struct cpufreq_policy *policy, int state)
{ {
struct cppc_cpudata *cpu_data = all_cpu_data[policy->cpu]; struct cppc_cpudata *cpu_data = all_cpu_data[policy->cpu];
struct cppc_perf_caps *caps = &cpu_data->perf_caps;
int ret; int ret;
if (!boost_supported) { if (!boost_supported) {
@@ -377,10 +383,10 @@ static int cppc_cpufreq_set_boost(struct cpufreq_policy *policy, int state)
if (state) if (state)
policy->max = cppc_cpufreq_perf_to_khz(cpu_data, policy->max = cppc_cpufreq_perf_to_khz(cpu_data,
cpu_data->perf_caps.highest_perf); caps->highest_perf);
else else
policy->max = cppc_cpufreq_perf_to_khz(cpu_data, policy->max = cppc_cpufreq_perf_to_khz(cpu_data,
cpu_data->perf_caps.nominal_perf); caps->nominal_perf);
policy->cpuinfo.max_freq = policy->max; policy->cpuinfo.max_freq = policy->max;
ret = freq_qos_update_request(policy->max_freq_req, policy->max); ret = freq_qos_update_request(policy->max_freq_req, policy->max);