diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2016-07-08 20:42:04 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-11 15:12:30 +0200 |
| commit | 5fc8f707a2aa40c767c3a338738b9b6fcd151ac1 (patch) | |
| tree | ca8a826907dbe6681ac47a8146bce898ba7b48db /drivers/cpufreq | |
| parent | 825773609c8ae34a19d4b593555493ae2754eff7 (diff) | |
| download | linux-5fc8f707a2aa40c767c3a338738b9b6fcd151ac1.tar.gz linux-5fc8f707a2aa40c767c3a338738b9b6fcd151ac1.tar.bz2 linux-5fc8f707a2aa40c767c3a338738b9b6fcd151ac1.zip | |
intel_pstate: Fix MSR_CONFIG_TDP_x addressing in core_get_max_pstate()
If MSR_CONFIG_TDP_CONTROL is locked, we currently try to address some
MSR 0x80000648 or so. Mask out the relevant level bits 0 and 1.
Found while running over the Jailhouse hypervisor which became upset
about this strange MSR index.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Acked-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')
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index f6dd07275862..25bfdec4e74e 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -945,7 +945,7 @@ static int core_get_max_pstate(void) if (err) goto skip_tar; - tdp_msr = MSR_CONFIG_TDP_NOMINAL + tdp_ctrl; + tdp_msr = MSR_CONFIG_TDP_NOMINAL + (tdp_ctrl & 0x3); err = rdmsrl_safe(tdp_msr, &tdp_ratio); if (err) goto skip_tar; |