Commit c72bcf0a authored by Zhang Rui's avatar Zhang Rui Committed by Rafael J. Wysocki
Browse files

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: eb3693f0 ("cpufreq: intel_pstate: hybrid: CPU-specific scaling factor")
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 3598b30b

drivers/cpufreq/intel_pstate.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -540,7 +540,8 @@ static void intel_pstate_hybrid_hwp_adjust(struct cpudata *cpu) 
	 * scaling factor is too high, so recompute it to make the HWP_CAP

	 * scaling factor is too high, so recompute it to make the HWP_CAP

	 * highest performance correspond to the maximum turbo frequency.

	 * 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;

		cpu->pstate.turbo_freq = turbo_freq;

		scaling = DIV_ROUND_UP(turbo_freq, cpu->pstate.turbo_pstate);

		scaling = DIV_ROUND_UP(turbo_freq, cpu->pstate.turbo_pstate);

		cpu->pstate.scaling = scaling;

		cpu->pstate.scaling = scaling;