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

cpufreq: intel_pstate: Change intel_pstate_get_hwp_max() argument

Browse Source 
All of the callers of intel_pstate_get_hwp_max() access the struct
cpudata object that corresponds to the given CPU already and the
function itself needs to access that object (in order to update
hwp_cap_cached), so modify the code to pass a struct cpudata pointer
to it instead of the CPU number.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: Chen Yu <yu.c.chen@intel.com>
This commit is contained in:
Rafael J. Wysocki 2021-01-07 19:43:30 +01:00
parent 9dd04ec6bc
commit a45ee4d4e1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/cpufreq/intel_pstate.c
View File

@ -819,13 +819,13 @@ static struct freq_attr *hwp_cpufreq_attrs[] = {
NULL, NULL,
}; };
static void intel_pstate_get_hwp_max(unsigned int cpu, int *phy_max, static void intel_pstate_get_hwp_max(struct cpudata *cpu, int *phy_max,
int *current_max) int *current_max)
{ {
u64 cap; u64 cap;
rdmsrl_on_cpu(cpu, MSR_HWP_CAPABILITIES, &cap); rdmsrl_on_cpu(cpu->cpu, MSR_HWP_CAPABILITIES, &cap);
WRITE_ONCE(all_cpu_data[cpu]->hwp_cap_cached, cap); WRITE_ONCE(cpu->hwp_cap_cached, cap);
if (global.no_turbo || global.turbo_disabled) if (global.no_turbo || global.turbo_disabled)
*current_max = HWP_GUARANTEED_PERF(cap); *current_max = HWP_GUARANTEED_PERF(cap);
else else
@ -1213,7 +1213,7 @@ static void update_qos_request(enum freq_qos_req_type type)
continue; continue;
if (hwp_active) if (hwp_active)
intel_pstate_get_hwp_max(i, &turbo_max, &max_state); intel_pstate_get_hwp_max(cpu, &turbo_max, &max_state);
else else
turbo_max = cpu->pstate.turbo_pstate; turbo_max = cpu->pstate.turbo_pstate;
@ -1723,7 +1723,7 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
if (hwp_active && !hwp_mode_bdw) { if (hwp_active && !hwp_mode_bdw) {
unsigned int phy_max, current_max; unsigned int phy_max, current_max;
intel_pstate_get_hwp_max(cpu->cpu, &phy_max, &current_max); intel_pstate_get_hwp_max(cpu, &phy_max, &current_max);
cpu->pstate.turbo_freq = phy_max * cpu->pstate.scaling; cpu->pstate.turbo_freq = phy_max * cpu->pstate.scaling;
cpu->pstate.turbo_pstate = phy_max; cpu->pstate.turbo_pstate = phy_max;
} else { } else {
@ -2208,7 +2208,7 @@ static void intel_pstate_update_perf_limits(struct cpudata *cpu,
* rather than pure ratios. * rather than pure ratios.
*/ */
if (hwp_active) { if (hwp_active) {
intel_pstate_get_hwp_max(cpu->cpu, &turbo_max, &max_state); intel_pstate_get_hwp_max(cpu, &turbo_max, &max_state);
} else { } else {
max_state = global.no_turbo || global.turbo_disabled ? max_state = global.no_turbo || global.turbo_disabled ?
cpu->pstate.max_pstate : cpu->pstate.turbo_pstate; cpu->pstate.max_pstate : cpu->pstate.turbo_pstate;
@ -2323,7 +2323,7 @@ static void intel_pstate_verify_cpu_policy(struct cpudata *cpu,
if (hwp_active) { if (hwp_active) {
int max_state, turbo_max; int max_state, turbo_max;
intel_pstate_get_hwp_max(cpu->cpu, &turbo_max, &max_state); intel_pstate_get_hwp_max(cpu, &turbo_max, &max_state);
max_freq = max_state * cpu->pstate.scaling; max_freq = max_state * cpu->pstate.scaling;
} else { } else {
max_freq = intel_pstate_get_max_freq(cpu); max_freq = intel_pstate_get_max_freq(cpu);
@ -2710,7 +2710,7 @@ static int intel_cpufreq_cpu_init(struct cpufreq_policy *policy)
if (hwp_active) { if (hwp_active) {
u64 value; u64 value;
intel_pstate_get_hwp_max(policy->cpu, &turbo_max, &max_state); intel_pstate_get_hwp_max(cpu, &turbo_max, &max_state);
policy->transition_delay_us = INTEL_CPUFREQ_TRANSITION_DELAY_HWP; policy->transition_delay_us = INTEL_CPUFREQ_TRANSITION_DELAY_HWP;
rdmsrl_on_cpu(cpu->cpu, MSR_HWP_REQUEST, &value); rdmsrl_on_cpu(cpu->cpu, MSR_HWP_REQUEST, &value);
WRITE_ONCE(cpu->hwp_req_cached, value); WRITE_ONCE(cpu->hwp_req_cached, value);