When using performance policy, EPP value is restored to non "performance" mode EPP after offline and online.

For example: cat /sys/devices/system/cpu/cpu1/cpufreq/energy_performance_preference performance echo 0 > /sys/devices/system/cpu/cpu1/online echo 1 > /sys/devices/system/cpu/cpu1/online cat /sys/devices/system/cpu/cpu1/cpufreq/energy_performance_preference balance_performance

The commit 4adcf2e5829f ("cpufreq: intel_pstate: Add ->offline and ->online callbacks") optimized save restore path of the HWP request MSR, when there is no change in the policy. Also added special processing for performance mode EPP. If EPP has been set to "performance" by the active mode "performance" scaling algorithm, replace that value with the cached EPP. This ends up replacing with cached EPP during offline, which is restored during online again.

So add a change which will set cpu_data->epp_policy to zero, when in performance policy and has non zero epp. In this way EPP is set to zero again.

Fixes: 4adcf2e5829f ("cpufreq: intel_pstate: Add ->offline and ->online callbacks") Signed-off-by: Srinivas Pandruvada srinivas.pandruvada@linux.intel.com Cc: stable@vger.kernel.org # v5.9+ --- drivers/cpufreq/intel_pstate.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 815df3daae9d..49ff24d2b0ea 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -930,17 +930,23 @@ static void intel_pstate_hwp_set(unsigned int cpu) { struct cpudata *cpu_data = all_cpu_data[cpu]; int max, min; + s16 epp = 0; u64 value; - s16 epp;

max = cpu_data->max_perf_ratio; min = cpu_data->min_perf_ratio;

- if (cpu_data->policy == CPUFREQ_POLICY_PERFORMANCE) - min = max; - rdmsrl_on_cpu(cpu, MSR_HWP_REQUEST, &value);

+ if (boot_cpu_has(X86_FEATURE_HWP_EPP)) + epp = (value >> 24) & 0xff; + + if (cpu_data->policy == CPUFREQ_POLICY_PERFORMANCE) { + min = max; + if (epp) + cpu_data->epp_policy = 0; + } + value &= ~HWP_MIN_PERF(~0L); value |= HWP_MIN_PERF(min);