[PATCH] cpufreq: speedstep-centrino should only decode MSR on certain CPUs

[PATCH] cpufreq: speedstep-centrino should only decode MSR on certain CPUs

[Dominik Brodowski]

The encoding of the MSR only works as described in extract_clock() on
certain EST-enabled CPUs. So, limit the actual MSR check to these
CPUs.

Signed-off-by: Dominik Brodowski <linux@brodo.de>

diff -ruN linux-original/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c linux/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
--- linux-original/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c	2004-08-30 22:50:56.000000000 +0200
+++ linux/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c	2004-09-04 09:48:49.044458312 +0200
@@ -77,7 +77,7 @@
 
 /* Operating points for current CPU */
 static struct cpu_model *centrino_model;
-static int centrino_cpu;
+static const struct cpu_id *centrino_cpu;
 
 #ifdef CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE
 
@@ -289,7 +289,9 @@
 	 * for centrino, as some DSDTs are buggy.
 	 * Ideally, this can be done using the acpi_data structure.
 	 */
-	if (centrino_cpu) {
+	if ((centrino_cpu == &cpu_ids[CPU_BANIAS]) ||
+	    (centrino_cpu == &cpu_ids[CPU_DOTHAN_A1]) ||
+	    (centrino_cpu == &cpu_ids[CPU_DOTHAN_B0])) {
 		msr = (msr >> 8) & 0xff;
 		return msr * 100000;
 	}
@@ -457,7 +459,7 @@
 			break;
 
 	if (i != N_IDS)
-		centrino_cpu = 1;
+		centrino_cpu = &cpu_ids[i];
 
 	if (centrino_cpu_init_acpi(policy)) {
 		if (policy->cpu != 0)

Re: [PATCH] cpufreq: speedstep-centrino should only decode MSR on certain CPUs

[Jeremy Fitzhardinge]

On Sat, 2004-09-04 at 09:55 +0200, Dominik Brodowski wrote:
> The encoding of the MSR only works as described in extract_clock() on
> certain EST-enabled CPUs. So, limit the actual MSR check to these
> CPUs.

What are the others?  EST-enabled P4 machines?

	J