]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/hwmon/w83627ehf.c
[PATCH] autofs4: fix another race between mount and expire
[linux-2.6-omap-h63xx.git] / drivers / hwmon / w83627ehf.c
index 23824183e02ff9a862db12460063812309326ba3..da5828f2dfc200d50381498e053bcb2fbdb05642 100644 (file)
@@ -2,8 +2,9 @@
     w83627ehf - Driver for the hardware monitoring functionality of
                 the Winbond W83627EHF Super-I/O chip
     Copyright (C) 2005  Jean Delvare <khali@linux-fr.org>
-    Copyright (C) 2006  Yuan Mu <Ymu@Winbond.com.tw>,
-                        Rudolf Marek <r.marek@sh.cvut.cz>
+    Copyright (C) 2006  Yuan Mu (Winbond),
+                        Rudolf Marek <r.marek@assembler.cz>
+                        David Hubbard <david.c.hubbard@gmail.com>
 
     Shamelessly ripped from the w83627hf driver
     Copyright (C) 2003  Mark Studebaker
 
     Supports the following chips:
 
-    Chip        #vin    #fan    #pwm    #temp   chip_id    man_id
-    w83627ehf   10      5       4       3       0x88,0xa1  0x5ca3
+    Chip        #vin    #fan    #pwm    #temp  chip IDs       man ID
+    w83627ehf   10      5       4       3      0x8850 0x88    0x5ca3
+                                               0x8860 0xa1
+    w83627dhg    9      5       4       3      0xa020 0xc1    0x5ca3
 */
 
 #include <linux/module.h>
@@ -54,8 +57,18 @@ static unsigned short address;
  * Super-I/O constants and functions
  */
 
+/*
+ * The three following globals are initialized in w83627ehf_find(), before
+ * the i2c-isa device is created. Otherwise, they could be stored in
+ * w83627ehf_data. This is ugly, but necessary, and when the driver is next
+ * updated to become a platform driver, the globals will disappear.
+ */
 static int REG;                /* The register to read/write */
 static int VAL;                /* The value to read/write */
+/* The w83627ehf/ehg have 10 voltage inputs, but the w83627dhg has 9. This
+ * value is also used in w83627ehf_detect() to export a device name in sysfs
+ * (e.g. w83627ehf or w83627dhg) */
+static int w83627ehf_num_in;
 
 #define W83627EHF_LD_HWM       0x0b
 
@@ -64,8 +77,10 @@ static int VAL;              /* The value to read/write */
 #define SIO_REG_ENABLE         0x30    /* Logical device enable */
 #define SIO_REG_ADDR           0x60    /* Logical device address (2 bytes) */
 
-#define SIO_W83627EHF_ID       0x8840
-#define SIO_ID_MASK            0xFFC0
+#define SIO_W83627EHF_ID       0x8850
+#define SIO_W83627EHG_ID       0x8860
+#define SIO_W83627DHG_ID       0xa020
+#define SIO_ID_MASK            0xFFF0
 
 static inline void
 superio_outb(int reg, int val)
@@ -114,8 +129,12 @@ superio_exit(void)
 
 #define W83627EHF_REG_BANK             0x4E
 #define W83627EHF_REG_CONFIG           0x40
-#define W83627EHF_REG_CHIP_ID          0x49
-#define W83627EHF_REG_MAN_ID           0x4F
+
+/* Not currently used:
+ * REG_MAN_ID has the value 0x5ca3 for all supported chips.
+ * REG_CHIP_ID == 0x88/0xa1/0xc1 depending on chip model.
+ * REG_MAN_ID is at port 0x4f
+ * REG_CHIP_ID is at port 0x58 */
 
 static const u16 W83627EHF_REG_FAN[] = { 0x28, 0x29, 0x2a, 0x3f, 0x553 };
 static const u16 W83627EHF_REG_FAN_MIN[] = { 0x3b, 0x3c, 0x3d, 0x3e, 0x55c };
@@ -353,6 +372,8 @@ static void w83627ehf_write_fan_div(struct i2c_client *client, int nr)
        case 0:
                reg = (w83627ehf_read_value(client, W83627EHF_REG_FANDIV1) & 0xcf)
                    | ((data->fan_div[0] & 0x03) << 4);
+               /* fan5 input control bit is write only, compute the value */
+               reg |= (data->has_fan & (1 << 4)) ? 1 : 0;
                w83627ehf_write_value(client, W83627EHF_REG_FANDIV1, reg);
                reg = (w83627ehf_read_value(client, W83627EHF_REG_VBAT) & 0xdf)
                    | ((data->fan_div[0] & 0x04) << 3);
@@ -361,6 +382,8 @@ static void w83627ehf_write_fan_div(struct i2c_client *client, int nr)
        case 1:
                reg = (w83627ehf_read_value(client, W83627EHF_REG_FANDIV1) & 0x3f)
                    | ((data->fan_div[1] & 0x03) << 6);
+               /* fan5 input control bit is write only, compute the value */
+               reg |= (data->has_fan & (1 << 4)) ? 1 : 0;
                w83627ehf_write_value(client, W83627EHF_REG_FANDIV1, reg);
                reg = (w83627ehf_read_value(client, W83627EHF_REG_VBAT) & 0xbf)
                    | ((data->fan_div[1] & 0x04) << 4);
@@ -424,7 +447,7 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
                }
 
                /* Measured voltages and limits */
-               for (i = 0; i < 10; i++) {
+               for (i = 0; i < w83627ehf_num_in; i++) {
                        data->in[i] = w83627ehf_read_value(client,
                                      W83627EHF_REG_IN(i));
                        data->in_min[i] = w83627ehf_read_value(client,
@@ -621,14 +644,6 @@ static struct sensor_device_attribute sda_in_max[] = {
        SENSOR_ATTR(in9_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 9),
 };
 
-static void device_create_file_in(struct device *dev, int i)
-{
-       device_create_file(dev, &sda_in_input[i].dev_attr);
-       device_create_file(dev, &sda_in_alarm[i].dev_attr);
-       device_create_file(dev, &sda_in_min[i].dev_attr);
-       device_create_file(dev, &sda_in_max[i].dev_attr);
-}
-
 #define show_fan_reg(reg) \
 static ssize_t \
 show_##reg(struct device *dev, struct device_attribute *attr, \
@@ -756,14 +771,6 @@ static struct sensor_device_attribute sda_fan_div[] = {
        SENSOR_ATTR(fan5_div, S_IRUGO, show_fan_div, NULL, 4),
 };
 
-static void device_create_file_fan(struct device *dev, int i)
-{
-       device_create_file(dev, &sda_fan_input[i].dev_attr);
-       device_create_file(dev, &sda_fan_alarm[i].dev_attr);
-       device_create_file(dev, &sda_fan_div[i].dev_attr);
-       device_create_file(dev, &sda_fan_min[i].dev_attr);
-}
-
 #define show_temp1_reg(reg) \
 static ssize_t \
 show_##reg(struct device *dev, struct device_attribute *attr, \
@@ -1036,15 +1043,6 @@ static struct sensor_device_attribute sda_tolerance[] = {
                    store_tolerance, 3),
 };
 
-static void device_create_file_pwm(struct device *dev, int i)
-{
-       device_create_file(dev, &sda_pwm[i].dev_attr);
-       device_create_file(dev, &sda_pwm_mode[i].dev_attr);
-       device_create_file(dev, &sda_pwm_enable[i].dev_attr);
-       device_create_file(dev, &sda_target_temp[i].dev_attr);
-       device_create_file(dev, &sda_tolerance[i].dev_attr);
-}
-
 /* Smart Fan registers */
 
 #define fan_functions(reg, REG) \
@@ -1131,6 +1129,39 @@ static struct sensor_device_attribute sda_sf3_arrays[] = {
  * Driver and client management
  */
 
+static void w83627ehf_device_remove_files(struct device *dev)
+{
+       /* some entries in the following arrays may not have been used in
+        * device_create_file(), but device_remove_file() will ignore them */
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays); i++)
+               device_remove_file(dev, &sda_sf3_arrays[i].dev_attr);
+       for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays_fan4); i++)
+               device_remove_file(dev, &sda_sf3_arrays_fan4[i].dev_attr);
+       for (i = 0; i < w83627ehf_num_in; i++) {
+               device_remove_file(dev, &sda_in_input[i].dev_attr);
+               device_remove_file(dev, &sda_in_alarm[i].dev_attr);
+               device_remove_file(dev, &sda_in_min[i].dev_attr);
+               device_remove_file(dev, &sda_in_max[i].dev_attr);
+       }
+       for (i = 0; i < 5; i++) {
+               device_remove_file(dev, &sda_fan_input[i].dev_attr);
+               device_remove_file(dev, &sda_fan_alarm[i].dev_attr);
+               device_remove_file(dev, &sda_fan_div[i].dev_attr);
+               device_remove_file(dev, &sda_fan_min[i].dev_attr);
+       }
+       for (i = 0; i < 4; i++) {
+               device_remove_file(dev, &sda_pwm[i].dev_attr);
+               device_remove_file(dev, &sda_pwm_mode[i].dev_attr);
+               device_remove_file(dev, &sda_pwm_enable[i].dev_attr);
+               device_remove_file(dev, &sda_target_temp[i].dev_attr);
+               device_remove_file(dev, &sda_tolerance[i].dev_attr);
+       }
+       for (i = 0; i < ARRAY_SIZE(sda_temp); i++)
+               device_remove_file(dev, &sda_temp[i].dev_attr);
+}
+
 static struct i2c_driver w83627ehf_driver;
 
 static void w83627ehf_init_client(struct i2c_client *client)
@@ -1183,7 +1214,11 @@ static int w83627ehf_detect(struct i2c_adapter *adapter)
        client->flags = 0;
        dev = &client->dev;
 
-       strlcpy(client->name, "w83627ehf", I2C_NAME_SIZE);
+       if (w83627ehf_num_in == 9)
+               strlcpy(client->name, "w83627dhg", I2C_NAME_SIZE);
+       else    /* just say ehf. 627EHG is 627EHF in lead-free packaging. */
+               strlcpy(client->name, "w83627ehf", I2C_NAME_SIZE);
+
        data->valid = 0;
        mutex_init(&data->update_lock);
 
@@ -1207,47 +1242,82 @@ static int w83627ehf_detect(struct i2c_adapter *adapter)
        superio_exit();
 
        /* It looks like fan4 and fan5 pins can be alternatively used
-          as fan on/off switches */
+          as fan on/off switches, but fan5 control is write only :/
+          We assume that if the serial interface is disabled, designers
+          connected fan5 as input unless they are emitting log 1, which
+          is not the default. */
 
        data->has_fan = 0x07; /* fan1, fan2 and fan3 */
        i = w83627ehf_read_value(client, W83627EHF_REG_FANDIV1);
        if ((i & (1 << 2)) && (!fan4pin))
                data->has_fan |= (1 << 3);
-       if ((i & (1 << 0)) && (!fan5pin))
+       if (!(i & (1 << 1)) && (!fan5pin))
                data->has_fan |= (1 << 4);
 
        /* Register sysfs hooks */
-       data->class_dev = hwmon_device_register(dev);
-       if (IS_ERR(data->class_dev)) {
-               err = PTR_ERR(data->class_dev);
-               goto exit_detach;
-       }
-
        for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays); i++)
-               device_create_file(dev, &sda_sf3_arrays[i].dev_attr);
+               if ((err = device_create_file(dev,
+                       &sda_sf3_arrays[i].dev_attr)))
+                       goto exit_remove;
 
        /* if fan4 is enabled create the sf3 files for it */
        if (data->has_fan & (1 << 3))
-               for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays_fan4); i++)
-                       device_create_file(dev, &sda_sf3_arrays_fan4[i].dev_attr);
+               for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays_fan4); i++) {
+                       if ((err = device_create_file(dev,
+                               &sda_sf3_arrays_fan4[i].dev_attr)))
+                               goto exit_remove;
+               }
 
-       for (i = 0; i < 10; i++)
-               device_create_file_in(dev, i);
+       for (i = 0; i < w83627ehf_num_in; i++)
+               if ((err = device_create_file(dev, &sda_in_input[i].dev_attr))
+                       || (err = device_create_file(dev,
+                               &sda_in_alarm[i].dev_attr))
+                       || (err = device_create_file(dev,
+                               &sda_in_min[i].dev_attr))
+                       || (err = device_create_file(dev,
+                               &sda_in_max[i].dev_attr)))
+                       goto exit_remove;
 
        for (i = 0; i < 5; i++) {
                if (data->has_fan & (1 << i)) {
-                       device_create_file_fan(dev, i);
-                       if (i != 4) /* we have only 4 pwm */
-                               device_create_file_pwm(dev, i);
+                       if ((err = device_create_file(dev,
+                                       &sda_fan_input[i].dev_attr))
+                               || (err = device_create_file(dev,
+                                       &sda_fan_alarm[i].dev_attr))
+                               || (err = device_create_file(dev,
+                                       &sda_fan_div[i].dev_attr))
+                               || (err = device_create_file(dev,
+                                       &sda_fan_min[i].dev_attr)))
+                               goto exit_remove;
+                       if (i < 4 && /* w83627ehf only has 4 pwm */
+                               ((err = device_create_file(dev,
+                                       &sda_pwm[i].dev_attr))
+                               || (err = device_create_file(dev,
+                                       &sda_pwm_mode[i].dev_attr))
+                               || (err = device_create_file(dev,
+                                       &sda_pwm_enable[i].dev_attr))
+                               || (err = device_create_file(dev,
+                                       &sda_target_temp[i].dev_attr))
+                               || (err = device_create_file(dev,
+                                       &sda_tolerance[i].dev_attr))))
+                               goto exit_remove;
                }
        }
 
        for (i = 0; i < ARRAY_SIZE(sda_temp); i++)
-               device_create_file(dev, &sda_temp[i].dev_attr);
+               if ((err = device_create_file(dev, &sda_temp[i].dev_attr)))
+                       goto exit_remove;
+
+       data->class_dev = hwmon_device_register(dev);
+       if (IS_ERR(data->class_dev)) {
+               err = PTR_ERR(data->class_dev);
+               goto exit_remove;
+       }
 
        return 0;
 
-exit_detach:
+exit_remove:
+       w83627ehf_device_remove_files(dev);
        i2c_detach_client(client);
 exit_free:
        kfree(data);
@@ -1263,6 +1333,7 @@ static int w83627ehf_detach_client(struct i2c_client *client)
        int err;
 
        hwmon_device_unregister(data->class_dev);
+       w83627ehf_device_remove_files(&client->dev);
 
        if ((err = i2c_detach_client(client)))
                return err;
@@ -1291,7 +1362,17 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr)
 
        val = (superio_inb(SIO_REG_DEVID) << 8)
            | superio_inb(SIO_REG_DEVID + 1);
-       if ((val & SIO_ID_MASK) != SIO_W83627EHF_ID) {
+       switch (val & SIO_ID_MASK) {
+       case SIO_W83627DHG_ID:
+               w83627ehf_num_in = 9;
+               break;
+       case SIO_W83627EHF_ID:
+       case SIO_W83627EHG_ID:
+               w83627ehf_num_in = 10;
+               break;
+       default:
+               printk(KERN_WARNING "w83627ehf: unsupported chip ID: 0x%04x\n",
+                       val);
                superio_exit();
                return -ENODEV;
        }