Commit 5fc8f707 authored Jul 08, 2016 by Jan Kiszka Committed by Rafael J. Wysocki Jul 11, 2016

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>

parent 82577360

drivers/cpufreq/intel_pstate.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;