rpms/cpuspeed/devel cpuspeed.init, 1.41, 1.42 cpuspeed.spec, 1.74, 1.75

[Jarod Wilson]

Author: jwilson

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

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
* Fri Mar 06 2009 Jarod Wilson <jarod at redhat.com> 1.5-5
- Fix up p4-clockmod support so start/stop/status actually report
  something sane to the user



Index: cpuspeed.init
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- cpuspeed.init	3 Nov 2008 20:34:41 -0000	1.41
+++ cpuspeed.init	6 Mar 2009 20:09:36 -0000	1.42
@@ -41,6 +41,13 @@
   return $?
 }
 
+is_p4_clockmod() {
+  if [ `/sbin/lsmod | grep -c -w "p4.clockmod"` -ge 1 -a -d "/sys/devices/system/cpu/cpu0/thermal_throttle" ]; then
+    return 0
+  fi
+  return 1
+}
+
 governor_module_loaded() {
 # Check to see if we have a module loaded for
 # the current cpufreq governor
@@ -137,7 +144,13 @@
         # 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
+        if [ -d ${cpu0freqd} ]; then
+          echo -n "Enabling p4-clockmod driver (passive cooling only): "
+          success; echo
+          return 0
+        else
+          /sbin/modprobe -r p4-clockmod 2> /dev/null
+        fi
       fi
     fi
 
@@ -153,9 +166,6 @@
       centrino|powernow-k8|acpi-cpufreq|e_powersaver)
         default_governor=ondemand
         ;;
-      p4-clockmod)
-        default_governor=none
-        ;;
       *)
         default_governor=userspace
         ;;
@@ -180,10 +190,6 @@
     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
@@ -219,6 +225,10 @@
 }
 
 stop() {
+  if [ is_p4_clockmod ]; then
+    echo "p4-clockmod passive cooling support cannot be stopped"
+    return 0
+  fi
   [ ! -f ${cpu0freqd}/scaling_driver ] && return 0
   drv=`cat ${cpu0freqd}/scaling_driver`
   governor_module_loaded && module_loaded=true
@@ -256,13 +266,20 @@
     ;;
 
   status)
+    if [ is_p4_clockmod ]; then
+      echo "p4-clockmod passive cooling is enabled"
+      exit 0
+    fi
     governor_module_loaded && module_loaded=true
     if [ -d "$xendir" ]; then
       echo "Frequency scaling not supported under xen kernels"
+      RETVAL=0
     elif [ $module_loaded == true -o ${governor} == "performance" ]; then
       echo "Frequency scaling enabled using ${governor} governor"
+      RETVAL=0
     else
       status $prog
+      RETVAL="$?"
     fi
     ;;
 


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- cpuspeed.spec	2 Mar 2009 20:54:35 -0000	1.74
+++ cpuspeed.spec	6 Mar 2009 20:09:36 -0000	1.75
@@ -1,7 +1,7 @@
 Summary:        CPU frequency adjusting daemon
 Name:           cpuspeed
 Version:        1.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -81,6 +81,10 @@
 exit 0
 
 %changelog
+* Fri Mar 06 2009 Jarod Wilson <jarod at redhat.com> 1.5-5
+- Fix up p4-clockmod support so start/stop/status actually report
+  something sane to the user
+
 * Mon Mar 02 2009 Jarod Wilson <jarod at redhat.com> 1.5-4
 - Fix up ExclusiveArch, now that 32-bit x86 is built i586 for F11