Changeset 5855

Timestamp:

08/22/10 18:07:22 (3 years ago)

Author:

khali

Message:

When looking for pwm/fan correlations, sample all fans before returning
a given PWM output to full speed. The code used to only sample the first
fan before doing so, so correlation with other fans could be missed.
Problem reported by Charles Pillar. This closes ticket #2380.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/pwm/pwmconfig (modified) (2 diffs)

lm-sensors/trunk/CHANGES

@@ -6 +6 @@
               Map individual beep features
               Change license to LGPL
+  pwmconfig: Sample all fan speeds before returning to full speed (#2380)
   sensors.conf.default: W83667HG config is similar to W83627EHF/DHG
   sensord: Fix support of multiple chips (#2377)

lm-sensors/trunk/prog/pwm/pwmconfig

@@ -438 +438 @@
                 exit 1
         fi
+
+        # Sample all current fan speeds at once, so that we can quickly
+        # disable PWM and return all fans to full speed
+        CURRENT_SPEEDS="`cat $GOODFAN`"
+        pwmdisable $i
+
         let pwmactivecount=0
         let count=1
@@ -443 +449 @@
         do
                 OS=`echo $SPEEDS | cut -d' ' -f$count`
-                # this will return the first field if there's only one (sysfs)
-                S=`cat $j | cut -d' ' -f2`
+                S=`echo $CURRENT_SPEEDS | cut -d' ' -f$count`
                 echo "  $j ... speed was $OS now $S"
-                pwmdisable $i
                 let threshold=2*$OS/3
                 if [ $S -lt $threshold ]