Skip to content

Commit c72bcf0

Browse files
zhang-ruirafaeljw
authored andcommitted
cpufreq: intel_pstate: Fix cpu->pstate.turbo_freq initialization
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: eb3693f ("cpufreq: intel_pstate: hybrid: CPU-specific scaling factor") Signed-off-by: Zhang Rui <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 3598b30 commit c72bcf0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/cpufreq/intel_pstate.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,8 @@ static void intel_pstate_hybrid_hwp_adjust(struct cpudata *cpu)
540540
* scaling factor is too high, so recompute it to make the HWP_CAP
541541
* highest performance correspond to the maximum turbo frequency.
542542
*/
543-
if (turbo_freq < cpu->pstate.turbo_pstate * scaling) {
543+
cpu->pstate.turbo_freq = cpu->pstate.turbo_pstate * scaling;
544+
if (turbo_freq < cpu->pstate.turbo_freq) {
544545
cpu->pstate.turbo_freq = turbo_freq;
545546
scaling = DIV_ROUND_UP(turbo_freq, cpu->pstate.turbo_pstate);
546547
cpu->pstate.scaling = scaling;

0 commit comments

Comments
 (0)