hwmon: (max31790) Detect and report zero fan speed
authorGuenter Roeck <linux@roeck-us.net>
Wed, 26 May 2021 15:40:21 +0000 (08:40 -0700)
committerGuenter Roeck <linux@roeck-us.net>
Thu, 17 Jun 2021 11:21:46 +0000 (04:21 -0700)
If a fan is not running or not connected, of if fan monitoring is disabled,
the fan count register returns a fixed value of 0xffe0. So far this is then
translated to a RPM value larger than 0. Since this is misleading and does
not really make much sense, report a fan RPM of 0 in this situation.

Cc: Jan Kundrát <jan.kundrat@cesnet.cz>
Cc: Václav Kubernát <kubernat@cesnet.cz>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Václav Kubernát <kubernat@cesnet.cz>
Link: https://lore.kernel.org/r/20210526154022.3223012-7-linux@roeck-us.net
drivers/hwmon/max31790.c

index 7927468c527158c45fc9aabcaeca8c8100fc0575..7e9362f6dc29ee9c6ed79bd5c9973cedc43e937c 100644 (file)
@@ -40,6 +40,8 @@
 #define FAN_RPM_MIN                    120
 #define FAN_RPM_MAX                    7864320
 
+#define FAN_COUNT_REG_MAX              0xffe0
+
 #define RPM_FROM_REG(reg, sr)          (((reg) >> 4) ? \
                                         ((60 * (sr) * 8192) / ((reg) >> 4)) : \
                                         FAN_RPM_MAX)
@@ -172,7 +174,10 @@ static int max31790_read_fan(struct device *dev, u32 attr, int channel,
        switch (attr) {
        case hwmon_fan_input:
                sr = get_tach_period(data->fan_dynamics[channel % NR_CHANNEL]);
-               rpm = RPM_FROM_REG(data->tach[channel], sr);
+               if (data->tach[channel] == FAN_COUNT_REG_MAX)
+                       rpm = 0;
+               else
+                       rpm = RPM_FROM_REG(data->tach[channel], sr);
                *val = rpm;
                return 0;
        case hwmon_fan_target: