From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias-Christian Ott <matthias.christian@tiscali.de>
Subject: [PATCH]: speedstep-lib: fix frequency multiplier for Pentium4 models
 0&1
Date: Sat, 22 Jan 2005 14:48:52 +0100
Message-ID: <41F259C4.9020903@tiscali.de>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Return-path: <linux-kernel-owner+glk-linux-kernel=40m.gmane.org-S262717AbVAVNs4@vger.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
List-Id: <cpufreq.vger.kernel.org>
Content-Type: text/plain; charset="us-ascii"; format="flowed"
To: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: Dave Jones <davej@codemonkey.org.uk>, cpufreq@lists.linux.org.uk, "H. Peter Anvin" <hpa@zytor.com>, Dominik Brodowski <linux@brodo.de>, Zwane Mwaikambo <zwane@commfireservices.com>, Arjan van de Ven <arjanv@redhat.com>, Linus Torvalds <torvalds@osdl.org>

The Pentium4 models 0&1 have a longer MSR_EBC_FREQUENCY_ID register as 
the models 2&3, so the bit shift must be bigger.

Signed-off-by: Matthias-Christian Ott <matthias.christian@tiscali.de>

--- linux-bk/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c.orig    
2005-01-21 13:55:37.000000000 +0100
+++ linux-bk/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c    2005-01-22 
10:58:34.000000000 +0100
@@ -160,7 +160,14 @@
         printk(KERN_DEBUG "speedstep-lib: couldn't detect FSB speed. 
Please send an e-mail to <linux@brodo.de>\n");
 
     /* Multiplier. */
-    mult = msr_lo >> 24;
+    if (c->x86_model < 2)
+        {
+        mult = msr_lo >> 27;
+        }
+    else
+        {
+        mult = msr_lo >> 24;
+        }
 
     dprintk("P4 - FSB %u kHz; Multiplier %u; Speed %u kHz\n", fsb, 
mult, (fsb * mult));