From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759087Ab0ECNKT (ORCPT ); Mon, 3 May 2010 09:10:19 -0400 Received: from hera.kernel.org ([140.211.167.34]:39215 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758928Ab0ECNKR (ORCPT ); Mon, 3 May 2010 09:10:17 -0400 Date: Mon, 3 May 2010 13:09:43 GMT From: tip-bot for Mark Langsdorf Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, mark.langsdorf@amd.com, tglx@linutronix.de, trenn@suse.de, borislav.petkov@amd.com, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, mark.langsdorf@amd.com, tglx@linutronix.de, trenn@suse.de, borislav.petkov@amd.com, mingo@elte.hu In-Reply-To: <1270065406-1814-6-git-send-email-bp@amd64.org> References: <1270065406-1814-6-git-send-email-bp@amd64.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] powernow-k8: Fix frequency reporting Message-ID: Git-Commit-ID: b810e94c9d8e3fff6741b66cd5a6f099a7887871 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (hera.kernel.org [127.0.0.1]); Mon, 03 May 2010 13:09:44 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b810e94c9d8e3fff6741b66cd5a6f099a7887871 Gitweb: http://git.kernel.org/tip/b810e94c9d8e3fff6741b66cd5a6f099a7887871 Author: Mark Langsdorf AuthorDate: Wed, 31 Mar 2010 21:56:45 +0200 Committer: Ingo Molnar 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: # 33.x 32.x Signed-off-by: Mark Langsdorf LKML-Reference: <1270065406-1814-6-git-send-email-bp@amd64.org> Signed-off-by: Borislav Petkov Reviewed-by: Thomas Renninger Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar --- 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