[tip:x86/urgent] powernow-k8: Fix frequency reporting

From: tip-bot for Mark Langsdorf
Date: Mon May 03 2010 - 09:10:25 EST


Commit-ID: b810e94c9d8e3fff6741b66cd5a6f099a7887871
Gitweb: http://git.kernel.org/tip/b810e94c9d8e3fff6741b66cd5a6f099a7887871
Author: Mark Langsdorf <mark.langsdorf@xxxxxxx>
AuthorDate: Wed, 31 Mar 2010 21:56:45 +0200
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Mon, 3 May 2010 15:04:18 +0200

powernow-k8: Fix frequency reporting

With F10, model 10, all valid frequencies are in the ACPI _PST table.

Cc: <stable@xxxxxxxxxx> # 33.x 32.x
Signed-off-by: Mark Langsdorf <mark.langsdorf@xxxxxxx>
LKML-Reference: <1270065406-1814-6-git-send-email-bp@xxxxxxxxx>
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
Reviewed-by: Thomas Renninger <trenn@xxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 3 ++-
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 d360b56..b6215b9 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/