rpms/cpuspeed/devel cpuspeed.init, 1.40, 1.41 cpuspeed.spec, 1.71, 1.72

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/cpuspeed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12808

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
* Mon Nov 03 2008 Jarod Wilson <jarod at redhat.com> 1.5-2
- Revive p4-clockmod support, for passive cooling only, when
  all else fails on Intel boxes



Index: cpuspeed.init
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cpuspeed.init	26 Sep 2008 21:23:31 -0000	1.40
+++ cpuspeed.init	3 Nov 2008 20:34:41 -0000	1.41
@@ -126,17 +126,18 @@
           /sbin/modprobe powernow-k8 2> /dev/null
           [ -d ${cpu0freqd} ] || /sbin/modprobe -r powernow-k8 2> /dev/null
         fi
-      else
-        if [ -d /proc/acpi ]; then
-          # use ACPI as a fallback 
-          /sbin/modprobe acpi-cpufreq 2> /dev/null
-          # if even ACPI didn't work, remove it
-          # and then next test will bail out.
-          [ -d ${cpu0freqd} ] || /sbin/modprobe -r acpi-cpufreq 2> /dev/null
-        else
-          # No scaling. Just exit.
-          return 6
-        fi
+      elif [ -d /proc/acpi ]; then
+        # use ACPI as a fallback 
+        /sbin/modprobe acpi-cpufreq 2> /dev/null
+        # if even ACPI didn't work, remove it
+        # and then next test will bail out.
+        [ -d ${cpu0freqd} ] || /sbin/modprobe -r acpi-cpufreq 2> /dev/null
+      fi
+      if [ ! -d ${cpu0freqd} -a "$cpu_vendor" == GenuineIntel ]; then
+        # last-ditch effort for Intel proc boxes, try our neutered p4-clockmod
+        # to get at least passive cooling support (no clock changes)
+        /sbin/modprobe p4-clockmod 2> /dev/null
+        [ -d ${cpu0freqd} ] || /sbin/modprobe -r p4-clockmod 2> /dev/null
       fi
     fi
 
@@ -149,9 +150,12 @@
 
     # Figure out default governor to use
     case "$drv" in
-      centrino|powernow-k8|p4-clockmod|acpi-cpufreq|e_powersaver)
+      centrino|powernow-k8|acpi-cpufreq|e_powersaver)
         default_governor=ondemand
         ;;
+      p4-clockmod)
+        default_governor=none
+        ;;
       *)
         default_governor=userspace
         ;;
@@ -176,6 +180,10 @@
     if [ "${governor}" == "userspace" ]; then
       start_cpuspeed
       RETVAL=$?
+    elif [ "${drv}" == "p4-clockmod" -a "${governor}" == "none" ]; then
+      echo -n "Enabling p4-clockmod driver (passive cooling only): "
+      success
+      RETVAL=0
     else
       if [ -n "$MIN_SPEED" ]; then
         adjust_cpufreq scaling_min_freq $MIN_SPEED


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- cpuspeed.spec	8 Oct 2008 23:08:02 -0000	1.71
+++ cpuspeed.spec	3 Nov 2008 20:34:41 -0000	1.72
@@ -1,7 +1,7 @@
 Summary:        CPU frequency adjusting daemon
 Name:           cpuspeed
 Version:        1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -81,6 +81,10 @@
 exit 0
 
 %changelog
+* Mon Nov 03 2008 Jarod Wilson <jarod at redhat.com> 1.5-2
+- Revive p4-clockmod support, for passive cooling only, when
+  all else fails on Intel boxes
+
 * Wed Oct 08 2008 Jarod Wilson <jarod at redhat.com> 1.5-1
 - Update to v1.5 release