hwmon: Add individual alarm files to 4 drivers

hwmon: Add individual alarm files to 4 drivers

Add individual sysfs files for all f71805f, lm63, lm83 and lm90 alarm
and fault conditions. This is a requirement for the planned
chip-independent libsensors. Almost all other hwmon drivers will need
the same improvement.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

4 files changed, 151 insertions, 14 deletions

diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index fd72440faf76..678bae43716d 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -1,7 +1,7 @@
 /*
  * f71805f.c - driver for the Fintek F71805F/FG Super-I/O chip integrated
  *             hardware monitoring features
- * Copyright (C) 2005  Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2005-2006  Jean Delvare <khali@linux-fr.org>
  *
  * The F71805F/FG is a LPC Super-I/O chip made by Fintek. It integrates
  * complete hardware monitoring features: voltage, fan and temperature
@@ -147,7 +147,7 @@ struct f71805f_data {
         u8 temp_high[3];
         u8 temp_hyst[3];
         u8 temp_mode;
-        u8 alarms[3];
+        unsigned long alarms;
 };
 
 static inline long in_from_reg(u8 reg)
@@ -311,10 +311,9 @@ static struct f71805f_data *f71805f_update_device(struct device *dev)
                         data->temp[nr] = f71805f_read8(data,
                                          F71805F_REG_TEMP(nr));
                 }
-                for (nr = 0; nr < 3; nr++) {
-                        data->alarms[nr] = f71805f_read8(data,
-                                           F71805F_REG_STATUS(nr));
-                }
+                data->alarms = f71805f_read8(data, F71805F_REG_STATUS(0))
+                        + (f71805f_read8(data, F71805F_REG_STATUS(1)) << 8)
+                        + (f71805f_read8(data, F71805F_REG_STATUS(2)) << 16);
 
                 data->last_updated = jiffies;
                 data->valid = 1;
@@ -557,8 +556,7 @@ static ssize_t show_alarms_in(struct device *dev, struct device_attribute
 {
         struct f71805f_data *data = f71805f_update_device(dev);
 
-        return sprintf(buf, "%d\n", data->alarms[0] |
-                                    ((data->alarms[1] & 0x01) << 8));
+        return sprintf(buf, "%lu\n", data->alarms & 0x1ff);
 }
 
 static ssize_t show_alarms_fan(struct device *dev, struct device_attribute
@@ -566,7 +564,7 @@ static ssize_t show_alarms_fan(struct device *dev, struct device_attribute
 {
         struct f71805f_data *data = f71805f_update_device(dev);
 
-        return sprintf(buf, "%d\n", data->alarms[2] & 0x07);
+        return sprintf(buf, "%lu\n", (data->alarms >> 16) & 0x07);
 }
 
 static ssize_t show_alarms_temp(struct device *dev, struct device_attribute
@@ -574,7 +572,17 @@ static ssize_t show_alarms_temp(struct device *dev, struct device_attribute
 {
         struct f71805f_data *data = f71805f_update_device(dev);
 
-        return sprintf(buf, "%d\n", (data->alarms[1] >> 3) & 0x07);
+        return sprintf(buf, "%lu\n", (data->alarms >> 11) & 0x07);
+}
+
+static ssize_t show_alarm(struct device *dev, struct device_attribute
+                          *devattr, char *buf)
+{
+        struct f71805f_data *data = f71805f_update_device(dev);
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        int bitnr = attr->index;
+
+        return sprintf(buf, "%lu\n", (data->alarms >> bitnr) & 1);
 }
 
 static ssize_t show_name(struct device *dev, struct device_attribute
@@ -655,18 +663,34 @@ static struct sensor_device_attribute f71805f_sensor_attr[] = {
         SENSOR_ATTR(temp3_max_hyst, S_IRUGO | S_IWUSR,
                     show_temp_hyst, set_temp_hyst, 2),
         SENSOR_ATTR(temp3_type, S_IRUGO, show_temp_type, NULL, 2),
+
+        SENSOR_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0),
+        SENSOR_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1),
+        SENSOR_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2),
+        SENSOR_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3),
+        SENSOR_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 4),
+        SENSOR_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 5),
+        SENSOR_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 6),
+        SENSOR_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 7),
+        SENSOR_ATTR(in8_alarm, S_IRUGO, show_alarm, NULL, 8),
+        SENSOR_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 11),
+        SENSOR_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 12),
+        SENSOR_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 13),
 };
 
 static struct sensor_device_attribute f71805f_fan_attr[] = {
         SENSOR_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0),
         SENSOR_ATTR(fan1_min, S_IRUGO | S_IWUSR,
                     show_fan_min, set_fan_min, 0),
+        SENSOR_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 16),
         SENSOR_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 1),
         SENSOR_ATTR(fan2_min, S_IRUGO | S_IWUSR,
                     show_fan_min, set_fan_min, 1),
+        SENSOR_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 17),
         SENSOR_ATTR(fan3_input, S_IRUGO, show_fan, NULL, 2),
         SENSOR_ATTR(fan3_min, S_IRUGO | S_IWUSR,
                     show_fan_min, set_fan_min, 2),
+        SENSOR_ATTR(fan3_alarm, S_IRUGO, show_alarm, NULL, 18),
 };
 
 /*
@@ -737,7 +761,7 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
                         goto exit_class;
         }
         for (i = 0; i < ARRAY_SIZE(f71805f_fan_attr); i++) {
-                if (!(data->fan_enabled & (1 << (i / 2))))
+                if (!(data->fan_enabled & (1 << (i / 3))))
                         continue;
                 err = device_create_file(&pdev->dev,
                                          &f71805f_fan_attr[i].dev_attr);
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index 071f0fc6adec..00a50bea7cbd 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -1,7 +1,7 @@
 /*
  * lm63.c - driver for the National Semiconductor LM63 temperature sensor
  *          with integrated fan control
- * Copyright (C) 2004-2005  Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2004-2006  Jean Delvare <khali@linux-fr.org>
  * Based on the lm90 driver.
  *
  * The LM63 is a sensor chip made by National Semiconductor. It measures
@@ -330,6 +330,16 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *dummy,
         return sprintf(buf, "%u\n", data->alarms);
 }
 
+static ssize_t show_alarm(struct device *dev, struct device_attribute *devattr,
+                          char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm63_data *data = lm63_update_device(dev);
+        int bitnr = attr->index;
+
+        return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1);
+}
+
 static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 0);
 static SENSOR_DEVICE_ATTR(fan1_min, S_IWUSR | S_IRUGO, show_fan,
         set_fan, 1);
@@ -350,6 +360,14 @@ static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp8, NULL, 2);
 static DEVICE_ATTR(temp2_crit_hyst, S_IWUSR | S_IRUGO, show_temp2_crit_hyst,
         set_temp2_crit_hyst);
 
+/* Individual alarm files */
+static SENSOR_DEVICE_ATTR(fan1_min_alarm, S_IRUGO, show_alarm, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp2_input_fault, S_IRUGO, show_alarm, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3);
+static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 4);
+static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 6);
+/* Raw alarm file for compatibility */
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 /*
@@ -449,6 +467,8 @@ static int lm63_detect(struct i2c_adapter *adapter, int address, int kind)
                                    &sensor_dev_attr_fan1_input.dev_attr);
                 device_create_file(&new_client->dev,
                                    &sensor_dev_attr_fan1_min.dev_attr);
+                device_create_file(&new_client->dev,
+                                   &sensor_dev_attr_fan1_min_alarm.dev_attr);
         }
         device_create_file(&new_client->dev, &dev_attr_pwm1);
         device_create_file(&new_client->dev, &dev_attr_pwm1_enable);
@@ -465,6 +485,17 @@ static int lm63_detect(struct i2c_adapter *adapter, int address, int kind)
         device_create_file(&new_client->dev,
                            &sensor_dev_attr_temp2_crit.dev_attr);
         device_create_file(&new_client->dev, &dev_attr_temp2_crit_hyst);
+
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_input_fault.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_min_alarm.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_max_alarm.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_max_alarm.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_crit_alarm.dev_attr);
         device_create_file(&new_client->dev, &dev_attr_alarms);
 
         return 0;
diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index 2137d7879df6..ea224891d311 100644
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -1,7 +1,7 @@
 /*
  * lm83.c - Part of lm_sensors, Linux kernel modules for hardware
  *          monitoring
- * Copyright (C) 2003-2005  Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2003-2006  Jean Delvare <khali@linux-fr.org>
  *
  * Heavily inspired from the lm78, lm75 and adm1021 drivers. The LM83 is
  * a sensor chip made by National Semiconductor. It reports up to four
@@ -191,6 +191,16 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *dummy,
         return sprintf(buf, "%d\n", data->alarms);
 }
 
+static ssize_t show_alarm(struct device *dev, struct device_attribute
+                          *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm83_data *data = lm83_update_device(dev);
+        int bitnr = attr->index;
+
+        return sprintf(buf, "%d\n", (data->alarms >> bitnr) & 1);
+}
+
 static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
 static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 1);
 static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, show_temp, NULL, 2);
@@ -208,6 +218,20 @@ static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO, show_temp, NULL, 8);
 static SENSOR_DEVICE_ATTR(temp3_crit, S_IWUSR | S_IRUGO, show_temp,
         set_temp, 8);
 static SENSOR_DEVICE_ATTR(temp4_crit, S_IRUGO, show_temp, NULL, 8);
+
+/* Individual alarm files */
+static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp3_crit_alarm, S_IRUGO, show_alarm, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp3_input_fault, S_IRUGO, show_alarm, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp3_max_alarm, S_IRUGO, show_alarm, NULL, 4);
+static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 6);
+static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, 8);
+static SENSOR_DEVICE_ATTR(temp4_crit_alarm, S_IRUGO, show_alarm, NULL, 9);
+static SENSOR_DEVICE_ATTR(temp4_input_fault, S_IRUGO, show_alarm, NULL, 10);
+static SENSOR_DEVICE_ATTR(temp4_max_alarm, S_IRUGO, show_alarm, NULL, 12);
+static SENSOR_DEVICE_ATTR(temp2_input_fault, S_IRUGO, show_alarm, NULL, 13);
+static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 15);
+/* Raw alarm file for compatibility */
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 /*
@@ -350,6 +374,16 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)
         device_create_file(&new_client->dev,
                            &sensor_dev_attr_temp3_crit.dev_attr);
 
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp3_input_fault.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_max_alarm.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp3_max_alarm.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_crit_alarm.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp3_crit_alarm.dev_attr);
         device_create_file(&new_client->dev, &dev_attr_alarms);
 
         if (kind == lm83) {
@@ -367,6 +401,19 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)
                                    &sensor_dev_attr_temp2_crit.dev_attr);
                 device_create_file(&new_client->dev,
                                    &sensor_dev_attr_temp4_crit.dev_attr);
+
+                device_create_file(&new_client->dev,
+                                &sensor_dev_attr_temp2_input_fault.dev_attr);
+                device_create_file(&new_client->dev,
+                                &sensor_dev_attr_temp4_input_fault.dev_attr);
+                device_create_file(&new_client->dev,
+                                &sensor_dev_attr_temp2_max_alarm.dev_attr);
+                device_create_file(&new_client->dev,
+                                &sensor_dev_attr_temp4_max_alarm.dev_attr);
+                device_create_file(&new_client->dev,
+                                &sensor_dev_attr_temp2_crit_alarm.dev_attr);
+                device_create_file(&new_client->dev,
+                                &sensor_dev_attr_temp4_crit_alarm.dev_attr);
         }
 
         return 0;
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index d9eeaf7585bd..77f8e3f7fd49 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -1,7 +1,7 @@
 /*
  * lm90.c - Part of lm_sensors, Linux kernel modules for hardware
  *          monitoring
- * Copyright (C) 2003-2005  Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2003-2006  Jean Delvare <khali@linux-fr.org>
  *
  * Based on the lm83 driver. The LM90 is a sensor chip made by National
  * Semiconductor. It reports up to two temperatures (its own plus up to
@@ -327,6 +327,16 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *dummy,
         return sprintf(buf, "%d\n", data->alarms);
 }
 
+static ssize_t show_alarm(struct device *dev, struct device_attribute
+                          *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct lm90_data *data = lm90_update_device(dev);
+        int bitnr = attr->index;
+
+        return sprintf(buf, "%d\n", (data->alarms >> bitnr) & 1);
+}
+
 static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp8, NULL, 0);
 static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp11, NULL, 0);
 static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp8,
@@ -344,6 +354,16 @@ static SENSOR_DEVICE_ATTR(temp2_crit, S_IWUSR | S_IRUGO, show_temp8,
 static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IWUSR | S_IRUGO, show_temphyst,
         set_temphyst, 3);
 static SENSOR_DEVICE_ATTR(temp2_crit_hyst, S_IRUGO, show_temphyst, NULL, 4);
+
+/* Individual alarm files */
+static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp2_input_fault, S_IRUGO, show_alarm, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3);
+static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 4);
+static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL, 5);
+static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 6);
+/* Raw alarm file for compatibility */
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 /* pec used for ADM1032 only */
@@ -595,6 +615,21 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
                            &sensor_dev_attr_temp1_crit_hyst.dev_attr);
         device_create_file(&new_client->dev,
                            &sensor_dev_attr_temp2_crit_hyst.dev_attr);
+
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_input_fault.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_min_alarm.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_min_alarm.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_max_alarm.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_max_alarm.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp1_crit_alarm.dev_attr);
+        device_create_file(&new_client->dev,
+                           &sensor_dev_attr_temp2_crit_alarm.dev_attr);
         device_create_file(&new_client->dev, &dev_attr_alarms);
 
         if (new_client->flags & I2C_CLIENT_PEC)