Changeset 484

Timestamp:

06/17/99 00:16:48 (9 years ago)

Author:

kmalkki

Message:

(Kyösti) gl518sm driver code updates

* rewrote iteration code for rev 0x00
* fan1 on/off control

Files:

• lm-sensors/trunk/TODO (modified) (2 diffs)
• lm-sensors/trunk/doc/chips/gl518sm (modified) (4 diffs)
• lm-sensors/trunk/kernel/chips/gl518sm.c (modified) (14 diffs)
• lm-sensors/trunk/kernel/include/sensors.h (modified) (1 diff)

lm-sensors/trunk/TODO

@@ -38 +38 @@
-* Test SIS5595(/91/98) sensor support. Write generic i2c support. 
-  Thomas Dickel <Thomas.Dickel@mni.fh-giessen.de> owns one SIS5595.
-* Make GL518SM rev 00 voltage iteration run as a kernel thread.
-  Add libsensors support for the new readable registers.
-* adm9240: check whether the current voltage computations are correct.
-  Probably not, as they are different from the datasheet specifications.
@@ -45 +43 @@
-* lm80: Check how OS alarms work. At page 17 of the sheet, it tells
-  something completely different from the description at page 25.
-
-
-
-
-
-
+
+
-
-LIBRARY

lm-sensors/trunk/doc/chips/gl518sm

@@ -12 +12 @@
-    Prefix `gl518sm-r80'
-    Addresses scanned: I2C 0x2c and 0x2d
- at all, as far as we know
+
-
-Author: Frodo Looijaard <frodol@dds.nl>
@@ -36 +36 @@
-* probe_range: short array (min = 1, max = 48)
-  List of adapter,start-addr,end-addr triples to scan additionally
-* readall: int
-  Enable the experimental code, which tries to find the voltages of
-  revision zero chips by slow (10 seconds) interpolation
-
-
-Description
@@ -59 +55 @@
-
-FAN rotation speeds are reported in RPM (rotations per minute). An alarm is
-
-
+
+
+
+
+
-the readings more range or accuracy. This is important because some FANs
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-zero'; this is important for negative voltage measurements. The VDD input
-measures voltages between 0.000 and 5.865 volt, with a resolution of 0.023
-
-
-
-
-
+
+
+
+
-
-When an alarm goes off, you can be warned by a beeping signal through
@@ -91 +88 @@
-The GL518SM only updates its values each 1.5 seconds; reading it more often
-will do no harm, but will return 'old' values.
-
-Not supported is the option to use only one fan, and to enable/disable the 
-speed of that fan automatically as function of the current temperature.
-
-
-Chip Features

lm-sensors/trunk/kernel/chips/gl518sm.c

@@ -159 +159 @@
-         u8 fan_div[2];              /* Register encoding, shifted right */
-         u8 beep_enable;             /* Boolean */
-
+
+
-};
-
@@ -172 +173 @@
-MODULE_PARM_DESC(readall,"Enable the experimental code, which tries to find "
-                         "the voltages of revision zero chips by "
-nterpol
+ter
-#endif /* MODULE */
-
@@ -203 +204 @@
-static void gl518_beep(struct i2c_client *client, int operation, int ctl_name, 
-                int *nrels_mag, long *results);
+static void gl518_fan1off(struct i2c_client *client, int operation,
+                int ctl_name, int *nrels_mag, long *results);
+static void gl518_iterate(struct i2c_client *client, int operation,
+                int ctl_name, int *nrels_mag, long *results);
-
-/* This is the driver that will be inserted */
@@ -242 +247 @@
-  { GL518_SYSCTL_BEEP, "beep", NULL, 0, 0644, NULL, &sensors_proc_real,
-    &sensors_sysctl_real, NULL, &gl518_beep },
+  { GL518_SYSCTL_FAN1OFF, "fan1off", NULL, 0, 0644, NULL, &sensors_proc_real,
+    &sensors_sysctl_real, NULL, &gl518_fan1off },
+  { GL518_SYSCTL_ITERATE, "iterate", NULL, 0, 0644, NULL, &sensors_proc_real,
+    &sensors_sysctl_real, NULL, &gl518_iterate },
-  { 0 }
-};
@@ -427 +436 @@
-  gl518_write_value(client,GL518_REG_CONF,0x44);
-  
-
-
-
+
-}
-
@@ -538 +545 @@
-    data->voltage_max[3] = (val >> 8) & 0xff;
-
+    data->voltage[3] = gl518_read_value(client,GL518_REG_VIN3);
+#ifndef DEBUG_VIN    
-    if (data->type != gl518sm_r00) {
-      data->voltage[0] = gl518_read_value(client,GL518_REG_VDD);
-      data->voltage[1] = gl518_read_value(client,GL518_REG_VIN1);
-      data->voltage[2] = gl518_read_value(client,GL518_REG_VIN2);
- {
-if (!readall) {
-
-    data->voltage[1] = 0
-    data->voltage[2] = 0
-  }
-}
-
+
+gl518_update_client_rev00(client);
+
+data->voltage[0] = gl518_read_value(client,GL518_REG_VDD)
+data->voltage[1] = gl518_read_value(client,GL518_REG_VIN1)
+data->voltage[2] = gl518_read_value(client,GL518_REG_VIN2);
+gl518_update_client_rev00(client);
+
-
-    val = gl518_read_value(client,GL518_REG_FAN_COUNT);
@@ -566 +575 @@
-    data->fan_div[0] = (val >> 6) & 0x03;
-    data->fan_div[1] = (val >> 4) & 0x03;
-
+
+
+
+
+
+
+
+
+
+
+
-
-    data->last_updated = jiffies;
@@ -575 +594 @@
-}
-
-
-
-
-
+
+
+
-
-void gl518_update_client_rev00(struct i2c_client *client)
-{
-  struct gl518_data *data = client->data;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#ifndef DEBUG_VIN
-  /* as that update is slow, we consider the data valid for 30 seconds */
-jiffies - data->last_updated_v00 > 30*HZ 
+(jiffies - data->last_updated_v00 > 30*HZ) || (alarm & 7)
-#else
-  if (jiffies - data->last_updated_v00 > HZ+HZ/2 ) {
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-      /* we wait now 1.5 seconds before comparing */
-      current->state = TASK_INTERRUPTIBLE;
-      schedule_timeout(HZ + HZ/2);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-#endif
-    } while (delta != 0);
-    
-    /* do a final comparison to get to least significant bit */
-    gl518_write_value(client,GL518_REG_VDD_LIMIT,(max[0] << 8) | min);
-    gl518_write_value(client,GL518_REG_VIN1_LIMIT,(max[1] << 8) | min);
-    gl518_write_value(client,GL518_REG_VIN2_LIMIT,(max[2] << 8) | min);
- 
-    /* we wait now 1.5 seconds before comparing */
-    current->state = TASK_INTERRUPTIBLE;
-    schedule_timeout(HZ + HZ/2);
-
-    /* read comparators */      
-    j = gl518_read_value(client,GL518_REG_INT);
-    if ((j & 1) == 0) max[0]--;
-    if ((j & 2) == 0) max[1]--;
-    if ((j & 4) == 0) max[2]--;
-
-#ifdef DEBUG_VIN
-  if (data->type == gl518sm_r00) {
-     printk("Avdd: Meter: %3d, Search: %3d, Diff: %3d mV\n",
-             data->voltage[0], max[0], (max[0] - data->voltage[0]) * 23);
-     printk("Vin1: Meter: %3d, Search: %3d, Diff: %3d mV\n",
-             data->voltage[1], max[1], (max[1] - data->voltage[1]) * 19);
-     printk("Vin2: Meter: %3d, Search: %3d, Diff: %3d mV\n",
-             data->voltage[2], max[2], (max[2] - data->voltage[2]) * 19);
-  } else
-     printk("No voltage meter to read on rev 00 ICs\n");     
-#endif  
-
-    /* update voltages values */    
-    data->voltage[0] = max[0];
-    data->voltage[1] = max[1];
-    data->voltage[2] = max[2];
-    
-    /* restore original comparator values */
-    gl518_write_value(client,GL518_REG_VDD_LIMIT,
-                      (data->voltage_max[0] << 8) | data->voltage_min[0]);
-    gl518_write_value(client,GL518_REG_VIN1_LIMIT,
-                      (data->voltage_max[1] << 8) | data->voltage_min[1]);
-    gl518_write_value(client,GL518_REG_VIN2_LIMIT,
-                      (data->voltage_max[2] << 8) | data->voltage_min[2]);
-
-    data->last_updated_v00 = jiffies;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -720 +728 @@
-  else if (operation == SENSORS_PROC_REAL_READ) {
-    gl518_update_client(client);
-#ifndef DEBUG_VIN    
-    if ((data->type == gl518sm_r00) && (nr != 3) && readall)
-       /* only update VDD, VIN1, VIN2 voltages */
-       gl518_update_client_rev00(client);
-#else
-    gl518_update_client_rev00(client);
-#endif
-    results[0] = nr?IN_FROM_REG(data->voltage_min[nr]):
-                    VDD_FROM_REG(data->voltage_min[nr]);
@@ -778 +779 @@
-        old = (old & 0xff00) | data->fan_min[nr];
-
-      if (results[0])
-          data->sw_alarm_mask |= (nr ? GL518_ALARM_FAN2 : GL518_ALARM_FAN1);
-      else
-          data->sw_alarm_mask &= ~(nr ? GL518_ALARM_FAN2 : GL518_ALARM_FAN1);
-
-      gl518_write_value(client,GL518_REG_FAN_LIMIT,old);
-    }
@@ -797 +793 @@
-  else if (operation == SENSORS_PROC_REAL_READ) {
-    gl518_update_client(client);
- & data->sw_alarm_mask
+
-    *nrels_mag = 1;
-  }
@@ -827 +823 @@
-}
-
+
-void gl518_fan_div(struct i2c_client *client, int operation, int ctl_name,
-                   int *nrels_mag, long *results)
@@ -853 +850 @@
-}
-
+void gl518_fan1off(struct i2c_client *client, int operation, int ctl_name, 
+                int *nrels_mag, long *results)
+{
+  int old;
+  if (operation == SENSORS_PROC_REAL_INFO)
+    *nrels_mag = 0;
+  else if (operation == SENSORS_PROC_REAL_READ) {
+    results[0] = ((gl518_read_value(client, GL518_REG_MISC) & 0x08) !=0);
+    results[1] = ((gl518_read_value(client, GL518_REG_CONF) & 0x10) !=0);
+    *nrels_mag = 2;
+  } else if (operation == SENSORS_PROC_REAL_WRITE) {
+    if (*nrels_mag >= 1) {
+      old = gl518_read_value(client, GL518_REG_MISC) & 0xf7;
+      if (results[0])
+        old |= 0x08;
+      gl518_write_value(client,GL518_REG_MISC,old);
+    }
+    if (*nrels_mag >= 2) {
+      old = gl518_read_value(client, GL518_REG_CONF) & 0xef;
+      if (results[1])
+        old |= 0x10;
+      gl518_write_value(client,GL518_REG_CONF,old);
+    }
+  }
+}
+
+void gl518_iterate(struct i2c_client *client, int operation, int ctl_name, 
+                int *nrels_mag, long *results)
+{
+  struct gl518_data *data = client->data;
+  if (operation == SENSORS_PROC_REAL_INFO)
+    *nrels_mag = 0;
+  else if (operation == SENSORS_PROC_REAL_READ) {
+    results[0] = data->iterate;
+    *nrels_mag = 1;
+  } else if (operation == SENSORS_PROC_REAL_WRITE) {
+    if (*nrels_mag >= 1)
+      data->iterate=results[0];
+  }
+}
-
-int gl518_init(void)
@@ -901 +938 @@
-
-#endif /* MODULE */
+

lm-sensors/trunk/kernel/include/sensors.h

@@ -435 +435 @@
-#define GL518_SYSCTL_ALARMS 2001   /* bitvector */
-#define GL518_SYSCTL_BEEP 2002     /* bitvector */
+#define GL518_SYSCTL_FAN1OFF 2003
+#define GL518_SYSCTL_ITERATE 2004
-
-#define GL518_ALARM_VDD 0x01