Commit 9855d8ce authored Jan 22, 2013 by Stefan Bader Committed by Rafael J. Wysocki Jan 22, 2013

ACPI: Check MSR valid bit before using P-state frequencies



To fix incorrect P-state frequencies which can happen on
some AMD systems f594065f
   "ACPI: Add fixups for AMD P-state figures"
introduced a quirk to obtain the correct values by reading
from AMD specific MSRs.

This did cause a regression when running a kernel using that
quirk under Xen which does (currently) not pass through MSR
reads to the HW. Instead the guest gets a 0 in return.
And this seems to cause a failure to initialize the ondemand
governour (hard to say for sure as all P-states appear to run
at the same frequency).

While this should also be fixed in the hypervisor (to allow
a guest to read that MSR), this patch is intended to work
around the issue in the meantime. In discussion it turned out
that indeed real HW/BIOSes may choose to not set the valid bit
and thus mark the P-state as invalid. So this could be considered
a fix for broken BIOSes that also works around the issue on Xen.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Cc: 3.7+ <stable@vger.kernel.org>
Acked-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 8fa938ac

drivers/acpi/processor_perflib.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -340,6 +340,13 @@ static void amd_fixup_frequency(struct acpi_processor_px *px, int i)
		if ((boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model < 10)
		\|\| boot_cpu_data.x86 == 0x11) {
		rdmsr(MSR_AMD_PSTATE_DEF_BASE + index, lo, hi);
		/*
		* MSR C001_0064+:
		* Bit 63: PstateEn. Read-write. If set, the P-state is valid.
		*/
		if (!(hi & BIT(31)))
		return;

		fid = lo & 0x3f;
		did = (lo >> 6) & 7;
		if (boot_cpu_data.x86 == 0x10)