lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 514/849] cpufreq: intel_pstate: Fix cpu->pstate.turbo_freq initialization
    Date
    From: Zhang Rui <rui.zhang@intel.com>

    [ 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>
    ---
    drivers/cpufreq/intel_pstate.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
    index e7cd3882bda4d..2789cad7403d8 100644
    --- a/drivers/cpufreq/intel_pstate.c
    +++ b/drivers/cpufreq/intel_pstate.c
    @@ -615,9 +615,8 @@ static void intel_pstate_hybrid_hwp_calibrate(struct cpudata *cpu)
    * the scaling factor is too high, so recompute it so that the HWP_CAP
    * highest performance corresponds to the maximum turbo frequency.
    */
    - if (turbo_freq < cpu->pstate.turbo_pstate * scaling) {
    - pr_debug("CPU%d: scaling too high (%d)\n", cpu->cpu, 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);
    }
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:10    [W:3.277 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site