diff options
| author |   Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> | 2016-04-22 19:53:59 -0700 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-25 23:39:09 +0200 |
| commit | 1becf03545a0859ceaaf9e8c2d9861882a71cb01 (patch) | |
| tree | df0ada1f56f1f3fbd41f967db21b5b59c361146d /drivers/cpufreq/intel_pstate.c | |
| parent | Revert "cpufreq: governor: Fix negative idle_time when configured with CONFIG_HZ_PERIODIC" (diff) | |
| download | linux-dev-1becf03545a0859ceaaf9e8c2d9861882a71cb01.tar.xz linux-dev-1becf03545a0859ceaaf9e8c2d9861882a71cb01.zip | |
cpufreq: intel_pstate: Fix processing for turbo activation ratio
When the config TDP level is not nominal (level = 0), the MSR values for
reading level 1 and level 2 ratios contain power in low 14 bits and actual
ratio bits are at bits [23:16]. The current processing for level 1 and
level 2 is wrong as there is no shift done to get actual ratio.
Fixes: 6a35fc2d6c22 (cpufreq: intel_pstate: get P1 from TAR when available)
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: 4.4+ <stable@vger.kernel.org> # 4.4+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpufreq/intel_pstate.c')
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 30fe323c4551..f502d5b90c25 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -813,6 +813,11 @@ static int core_get_max_pstate(void) if (err) goto skip_tar; + /* For level 1 and 2, bits[23:16] contain the ratio */ + if (tdp_ctrl) + tdp_ratio >>= 16; + + tdp_ratio &= 0xff; /* ratios are only 8 bits long */ if (tdp_ratio - 1 == tar) { max_pstate = tar; pr_debug("max_pstate=TAC %x\n", max_pstate); |