[PATCH] speedstep-smi: only allow it to run on mobile Intel Pentium III

[PATCH] speedstep-smi: only allow it to run on mobile Intel Pentium III

[Dominik Brodowski]

speedstep-smi only makes sense on Intel mobile Pentium III systems.
So, unify the distributed checks for speedstep_processor there,
and disallow P4s.

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

 arch/i386/kernel/cpu/cpufreq/speedstep-smi.c |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff -ruN linux-original/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c linux/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
--- linux-original/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c	2004-08-30 22:50:56.000000000 +0200
+++ linux/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c	2004-09-03 17:56:57.460143128 +0200
@@ -260,12 +260,6 @@
 	if (result) {
 		/* fall back to speedstep_lib.c dection mechanism: try both states out */
 		dprintk(KERN_INFO PFX "could not detect low and high frequencies by SMI call.\n");
-		if (!speedstep_processor)
-			speedstep_processor = speedstep_detect_processor();
-
-		if (!speedstep_processor)
-			return -ENODEV;
-
 		result = speedstep_get_freqs(speedstep_processor,
 				&speedstep_freqs[SPEEDSTEP_LOW].frequency,
 				&speedstep_freqs[SPEEDSTEP_HIGH].frequency,
@@ -310,10 +304,6 @@
 {
 	if (cpu)
 		return -ENODEV;
-	if (!speedstep_processor)
-		speedstep_processor = speedstep_detect_processor();
-	if (!speedstep_processor)
-		return 0;
 	return speedstep_get_processor_frequency(speedstep_processor);
 }
 
@@ -354,10 +344,19 @@
  */
 static int __init speedstep_init(void)
 {
-    struct cpuinfo_x86 *c = cpu_data;
+	speedstep_processor = speedstep_detect_processor();
+
+	switch (speedstep_processor) {
+	case SPEEDSTEP_PROCESSOR_PIII_T:
+        case SPEEDSTEP_PROCESSOR_PIII_C:
+        case SPEEDSTEP_PROCESSOR_PIII_C_EARLY:
+		break;
+	default:
+		speedstep_processor = 0;
+	}
 
-    if (c->x86_vendor != X86_VENDOR_INTEL) {
-		printk (KERN_INFO PFX "No Intel CPU detected.\n");
+	if (!speedstep_processor) {
+		dprintk (KERN_INFO PFX "No supported Intel CPU detected.\n");
 		return -ENODEV;
 	}

Re: [PATCH] speedstep-smi: only allow it to run on mobile Intel Pentium III

[Dave Jones]

On Fri, Sep 03, 2004 at 06:00:43PM +0200, Dominik Brodowski wrote:
 > speedstep-smi only makes sense on Intel mobile Pentium III systems.
 > So, unify the distributed checks for speedstep_processor there,
 > and disallow P4s.
 > 
 > Signed-off-by: Dominik Brodowski <linux@brodo.de>
 > 
 >  arch/i386/kernel/cpu/cpufreq/speedstep-smi.c |   25 ++++++++++++-------------
 >  1 files changed, 12 insertions(+), 13 deletions(-)

Applied.

 > +	switch (speedstep_processor) {
 > +	case SPEEDSTEP_PROCESSOR_PIII_T:
 > +        case SPEEDSTEP_PROCESSOR_PIII_C:
 > +        case SPEEDSTEP_PROCESSOR_PIII_C_EARLY:
 > +		break;

Careful with indentation 8-)  I fixed this up..

		Dave