cpufreq: intel_pstate: Fix cpu->pstate.turbo_freq initialization

BugLink: https://bugs.launchpad.net/bugs/1951822
[ Upstream commit c72bcf0ab87a92634e58af62e89af0f40dfd0b88 ]

Fix a problem in active mode that cpu->pstate.turbo_freq is initialized
only if HWP-to-frequency scaling factor is refined.

In passive mode, this problem is not exposed, because
cpu->pstate.turbo_freq is set again, later in
intel_cpufreq_cpu_init()->intel_pstate_get_hwp_cap().

Fixes: eb3693f0521e ("cpufreq: intel_pstate: hybrid: CPU-specific scaling factor")
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 8c176b7dae415bbb112b5721deb67faffa7c1de5..fc7a429f22d33e1667da0cb6d99703496c2db346 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -537,7 +537,8 @@ static void intel_pstate_hybrid_hwp_adjust(struct cpudata *cpu)
         * scaling factor is too high, so recompute it to make the HWP_CAP
         * highest performance correspond to the maximum turbo frequency.
         */
-       if (turbo_freq < cpu->pstate.turbo_pstate * scaling) {
+       cpu->pstate.turbo_freq = cpu->pstate.turbo_pstate * scaling;
+       if (turbo_freq < cpu->pstate.turbo_freq) {
                cpu->pstate.turbo_freq = turbo_freq;
                scaling = DIV_ROUND_UP(turbo_freq, cpu->pstate.turbo_pstate);
                cpu->pstate.scaling = scaling;