Re: [PATCH v1 2/3] cpufreq: intel_pstate: Change intel_pstate_get_hwp_max() argument

[Chen Yu]

On Thu, Jan 07, 2021 at 07:43:30PM +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki 
> 
> 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 
 Tested-by: Chen Yu 


 thanks,
 Chenyu

[PATCH v1 2/3] cpufreq: intel_pstate: Change intel_pstate_get_hwp_max() argument

[Rafael J. Wysocki]

From: Rafael J. Wysocki 

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 
---
 drivers/cpufreq/intel_pstate.c |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

Index: linux-pm/drivers/cpufreq/intel_pstate.c
===
--- linux-pm.orig/drivers/cpufreq/intel_pstate.c
+++ linux-pm/drivers/cpufreq/intel_pstate.c
@@ -819,13 +819,13 @@ static struct freq_attr *hwp_cpufreq_att
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)
 {
u64 cap;
 
-   rdmsrl_on_cpu(cpu, MSR_HWP_CAPABILITIES, );
-   WRITE_ONCE(all_cpu_data[cpu]->hwp_cap_cached, cap);
+   rdmsrl_on_cpu(cpu->cpu, MSR_HWP_CAPABILITIES, );
+   WRITE_ONCE(cpu->hwp_cap_cached, cap);
if (global.no_turbo || global.turbo_disabled)
*current_max = HWP_GUARANTEED_PERF(cap);
else
@@ -1213,7 +1213,7 @@ static void update_qos_request(enum freq
continue;
 
if (hwp_active)
-   intel_pstate_get_hwp_max(i, _max, _state);
+   intel_pstate_get_hwp_max(cpu, _max, _state);
else
turbo_max = cpu->pstate.turbo_pstate;
 
@@ -1723,7 +1723,7 @@ static void intel_pstate_get_cpu_pstates
if (hwp_active && !hwp_mode_bdw) {
unsigned int phy_max, current_max;
 
-   intel_pstate_get_hwp_max(cpu->cpu, _max, _max);
+   intel_pstate_get_hwp_max(cpu, _max, _max);
cpu->pstate.turbo_freq = phy_max * cpu->pstate.scaling;
cpu->pstate.turbo_pstate = phy_max;
} else {
@@ -2208,7 +2208,7 @@ static void intel_pstate_update_perf_lim
 * rather than pure ratios.
 */
if (hwp_active) {
-   intel_pstate_get_hwp_max(cpu->cpu, _max, _state);
+   intel_pstate_get_hwp_max(cpu, _max, _state);
} else {
max_state = global.no_turbo || global.turbo_disabled ?
cpu->pstate.max_pstate : cpu->pstate.turbo_pstate;
@@ -2323,7 +2323,7 @@ static void intel_pstate_verify_cpu_poli
if (hwp_active) {
int max_state, turbo_max;
 
-   intel_pstate_get_hwp_max(cpu->cpu, _max, _state);
+   intel_pstate_get_hwp_max(cpu, _max, _state);
max_freq = max_state * cpu->pstate.scaling;
} else {
max_freq = intel_pstate_get_max_freq(cpu);
@@ -2710,7 +2710,7 @@ static int intel_cpufreq_cpu_init(struct
if (hwp_active) {
u64 value;
 
-   intel_pstate_get_hwp_max(policy->cpu, _max, _state);
+   intel_pstate_get_hwp_max(cpu, _max, _state);
policy->transition_delay_us = 
INTEL_CPUFREQ_TRANSITION_DELAY_HWP;
rdmsrl_on_cpu(cpu->cpu, MSR_HWP_REQUEST, );
WRITE_ONCE(cpu->hwp_req_cached, value);