aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Langsdorf <mark.langsdorf@amd.com>2010-03-31 21:56:45 +0200
committerIngo Molnar <mingo@elte.hu>2010-05-03 15:04:18 +0200
commitb810e94c9d8e3fff6741b66cd5a6f099a7887871 (patch)
tree08fdfa940a10eab6fc4b5f0a1729fe8d08b9b834
parent56f0e74c9cf98941af700b61466648a2d06277bb (diff)
downloadmrst-s0i3-test-b810e94c9d8e3fff6741b66cd5a6f099a7887871.tar.gz
mrst-s0i3-test-b810e94c9d8e3fff6741b66cd5a6f099a7887871.tar.xz
mrst-s0i3-test-b810e94c9d8e3fff6741b66cd5a6f099a7887871.zip
powernow-k8: Fix frequency reporting
With F10, model 10, all valid frequencies are in the ACPI _PST table. Cc: <stable@kernel.org> # 33.x 32.x Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com> LKML-Reference: <1270065406-1814-6-git-send-email-bp@amd64.org> Signed-off-by: Borislav Petkov <borislav.petkov@amd.com> Reviewed-by: Thomas Renninger <trenn@suse.de> Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/cpu/cpufreq/powernow-k8.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
index d360b56e982..b6215b9798e 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
@@ -929,7 +929,8 @@ static int fill_powernow_table_pstate(struct powernow_k8_data *data,
powernow_table[i].index = index;
/* Frequency may be rounded for these */
- if (boot_cpu_data.x86 == 0x10 || boot_cpu_data.x86 == 0x11) {
+ if ((boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model < 10)
+ || boot_cpu_data.x86 == 0x11) {
powernow_table[i].frequency =
freq_from_fid_did(lo & 0x3f, (lo >> 6) & 7);
} else