Changeset 27

Timestamp:

12/03/98 19:20:59 (14 years ago)

Author:

frodo

Message:

Some lm78 updates

* LM78, LM78-J and LM79 now all supported
* Chip type reflected in /proc/bus/i2c-?, /proc/.../sensors/* and

/proc/ioports.

* VID initialises IN0 and IN1, except if it is 3.50 V (then it falls back to

2.80 V)

* Slightly better ISA detection (but still not good enough)
* Temperature now in tenth of degrees, instead of whole degrees (for better

compatibility)

Location:

lm-sensors/trunk

Files:

• kernel/chips/lm78.c (modified) (21 diffs)
• kernel/include/sensors.h (modified) (2 diffs)
• src/lm78.c (modified) (21 diffs)
• src/sensors.h (modified) (2 diffs)

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

@@ -61 +61 @@
 
 #define LM78_REG_CONFIG 0x40
+#define LM78_REG_CHIPID 0x49
 
 
@@ -66 +67 @@
 static int lm78_in_conv[7] = {10000, 10000, 10000, 16892, 38000, 
                               -34768, -15050 };
-#define IN_TO_REG(val,nr) ((((val) * 100000 / lm78_in_conv[nr]) + 8) / 16)
+#define IN_TO_REG(val,nr) (((((val) * 100000 / lm78_in_conv[nr]) + 8) / 16) \
+                           & 0xff)
 #define IN_FROM_REG(val,nr) (((val) *  16 * lm78_in_conv[nr]) / 100000)
 
-#define FAN_TO_REG(val) (((val)==0)?255:((1350000+(val))/((val)*2)))
+#define FAN_TO_REG(val) ((((val)==0)?255:((1350000+(val))/((val)*2))) & 0xff)
 #define FAN_FROM_REG(val) (((val)==0)?-1:\
                            ((val)==255)?0:(1350000 + (val))/((val)*2))
 
-#define TEMP_TO_REG(val) ((val)<0?(val)&0xff:(val))
-#define TEMP_FROM_REG(val) ((val)>0x80?(val)-0x100:(val));
-
-#define VID_FROM_REG(val) ((val) == 0x0f?0:350-(val)*10)
-
+#define TEMP_TO_REG(val) (((val)<0?(val/10)&0xff:(val/10)) & 0xff)
+#define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*10)
+
+#define VID_FROM_REG(val) ((val)==0x1f?0:(val)>=0x10?510-(val)*10:\
+                           (val)>=0x06?0:205-(val)*5)
 #define ALARMS_FROM_REG(val) (val)
 
 #define DIV_FROM_REG(val) (1 >> (val))
-#define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?1:2)
+#define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?0:1)
 
 /* Initial limits */
-#define LM78_INIT_IN_0 280
-#define LM78_INIT_IN_1 280
+#define LM78_INIT_IN_0 (vid==350?280:vid)
+#define LM78_INIT_IN_1 (vid==350?280:vid)
 #define LM78_INIT_IN_2 330
 #define LM78_INIT_IN_3 500
@@ -127 +129 @@
 #define LM78_INIT_FAN_MIN_3 3000
 
-#define LM78_INIT_TEMP_OVER 60
-#define LM78_INIT_TEMP_HYST 50
+#define LM78_INIT_TEMP_OVER 600
+#define LM78_INIT_TEMP_HYST 500
 
 #ifdef MODULE
@@ -150 +152 @@
    some corners. */
 
+/* Types of chips supported */
+enum lm78_type { lm78, lm78j, lm79 };
+
 /* For each registered LM78, we need to keep some data in memory. That
    data is pointed to by lm78_list[NR]->data. The structure itself is
@@ -157 +162 @@
          struct semaphore lock;
          int sysctl_id;
+         enum lm78_type type;
 
          struct semaphore update_lock;
@@ -297 +303 @@
   int address,err;
   struct isa_client *new_client;
+  enum lm78_type type;
+  const char *type_name;
+  const char *client_name;
 
   /* OK, this is no detection. I know. It will do for now, though.  */
@@ -303 +312 @@
   for (address = 0x290; (! err) && (address <= 0x290); address += 0x08) {
     if (check_region(address, LM78_EXTENT))
+      continue;
+
+    /* Awful, but true: unused port addresses should return 0xff */
+    if ((inb_p(address + 1) != 0xff) || (inb_p(address + 2) != 0xff) ||
+       (inb_p(address + 3) != 0xff) || (inb_p(address + 7) != 0xff))
       continue;
     
@@ -312 +326 @@
     
     /* Real detection code goes here */
-   
-    request_region(address, LM78_EXTENT, "lm78");
+
+    /* Determine exact type */
+    outb_p(LM78_REG_CHIPID,address + LM78_ADDR_REG_OFFSET);
+    err = inb_p(address + LM78_DATA_REG_OFFSET);
+    if (err == 0x00) {
+      type = lm78;
+      type_name = "lm78";
+      client_name = "LM78 chip";
+    } else if (err == 0x40) {
+      type = lm78j;
+      type_name = "lm78-j";
+      client_name = "LM78-J chip";
+    } else if (err == 0x80) {
+      type = lm79;
+      type_name = "lm79";
+      client_name = "LM79 chip";
+    }
+    else
+      continue;
+      
+
+    request_region(address, LM78_EXTENT, type_name);
 
     /* Allocate space for a new client structure */
@@ -327 +361 @@
     new_client->data = (struct lm78_data *) (new_client + 1);
     new_client->addr = 0;
+    strcpy(new_client->name,client_name);
+    ((struct lm78_data *) (new_client->data))->type = type;
     new_client->isa_addr = address;
     if ((err = lm78_new_client((struct i2c_adapter *) adapter,
@@ -337 +373 @@
     
     /* Register a new directory entry with module sensors */
-    if ((err = sensors_register_entry((struct i2c_client *) new_client,"lm78",
+    if ((err = sensors_register_entry((struct i2c_client *) new_client,
+                                      type_name,
                                       lm78_dir_table_template)) < 0)
       goto ERROR4;
@@ -390 +427 @@
   int address,err;
   struct i2c_client *new_client;
+  enum lm78_type type;
+  const char *type_name,*client_name;
 
   /* OK, this is no detection. I know. It will do for now, though.  */
@@ -402 +441 @@
 
     /* Real detection code goes here */
+
+    /* Determine exact type */
+    err = smbus_read_byte_data(adapter,address,LM78_REG_CHIPID);
+    if (err == 0x00) {
+      type = lm78;
+      type_name = "lm78";
+      client_name = "LM78 chip";
+    } else if (err == 0x40) {
+      type = lm78j;
+      type_name = "lm78-j";
+      client_name = "LM78-J chip";
+    } else if (err == 0x80) {
+      type = lm79;
+      type_name = "lm79";
+      client_name = "LM79 chip";
+    } else
+      continue;
+
 
     /* Allocate space for a new client structure */
@@ -414 +471 @@
     new_client->data = (struct lm78_data *) (new_client + 1);
     new_client->addr = address;
+    strcpy(new_client->name,client_name);
+    ((struct lm78_data *) (new_client->data))->type = type;
     if ((err = lm78_new_client(adapter,new_client)))
       goto ERROR2;
@@ -422 +481 @@
 
     /* Register a new directory entry with module sensors */
-    if ((err = sensors_register_entry(new_client,"lm78",
+    if ((err = sensors_register_entry(new_client,type_name,
                                       lm78_dir_table_template)) < 0)
       goto ERROR4;
@@ -484 +543 @@
   
   lm78_list[i] = new_client;
-  strcpy(new_client->name,"LM78 chip");
   new_client->id = i;
   new_client->adapter = adapter;
@@ -561 +619 @@
 void lm78_init_client(struct i2c_client *client)
 {
+  int vid;
+
   /* Reset all except Watchdog values and last conversion values
      This sets fan-divs to 2, among others */
   lm78_write_value(client,LM78_REG_CONFIG,0x80);
+
+  vid = lm78_read_value(client,LM78_REG_VID_FANDIV) & 0x0f;
+  if (((struct lm78_data *) (client->data))->type == lm79)
+    vid |= (lm78_read_value(client,LM78_REG_CHIPID) & 0x01) >> 4;
+  else
+    vid |= 0x10;
+  vid = VID_FROM_REG(vid);
 
   lm78_write_value(client,LM78_REG_IN_MIN(0),IN_TO_REG(LM78_INIT_IN_MIN_0,0));
@@ -618 +685 @@
     i = lm78_read_value(client,LM78_REG_VID_FANDIV);
     data->vid = i & 0x0f;
+    if (data->type == lm79)
+      data->vid |= (lm78_read_value(client,LM78_REG_CHIPID) & 0x01) >> 4;
+    else
+      data->vid |= 0x10;
     data->fan_div[0] = (i >> 4) & 0x03;
     data->fan_div[1] = i >> 6;
@@ -656 +727 @@
     case LM78_SYSCTL_TEMP:
       nrels=3;
+      mag=1;
+      break;
+    case LM78_SYSCTL_FAN_DIV:
+      nrels=3;
       mag=0;
       break;
     case LM78_SYSCTL_FAN1: case LM78_SYSCTL_FAN2: case LM78_SYSCTL_FAN3:
-    case LM78_SYSCTL_FAN_DIV:
       nrels=2;
       mag=0;
@@ -742 +816 @@
     case LM78_SYSCTL_IN3: case LM78_SYSCTL_IN4: case LM78_SYSCTL_IN5: 
     case LM78_SYSCTL_IN6: case LM78_SYSCTL_TEMP: 
+    case LM78_SYSCTL_FAN_DIV:
       nrels=3;
       break;
     case LM78_SYSCTL_FAN1: case LM78_SYSCTL_FAN2: case LM78_SYSCTL_FAN3:
-    case LM78_SYSCTL_FAN_DIV:
       nrels=2;
       break;
@@ -859 +933 @@
   }
   if (nrels >= 2) {
-    data->temp_hyst = TEMP_TO_REG(results[0]);
+    data->temp_hyst = TEMP_TO_REG(results[1]);
     lm78_write_value(client,LM78_REG_TEMP_HYST,data->temp_hyst);
   }
@@ -889 +963 @@
   results[0] = DIV_FROM_REG(data->fan_div[0]);
   results[1] = DIV_FROM_REG(data->fan_div[1]);
+  results[2] = 2;
 }
  

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

@@ -47 +47 @@
 #endif /* def DEV_HWMON */
 
-#define LM78_SYSCTL_IN0 1000
+#define LM78_SYSCTL_IN0 1000  /* Volts * 100 */
 #define LM78_SYSCTL_IN1 1001
 #define LM78_SYSCTL_IN2 1002
@@ -54 +54 @@
 #define LM78_SYSCTL_IN5 1005
 #define LM78_SYSCTL_IN6 1006
-#define LM78_SYSCTL_FAN1 1101
+#define LM78_SYSCTL_FAN1 1101 /* Rotations/min */
 #define LM78_SYSCTL_FAN2 1102
 #define LM78_SYSCTL_FAN3 1103
-#define LM78_SYSCTL_TEMP 1200
-#define LM78_SYSCTL_VID 1300
-#define LM78_SYSCTL_FAN_DIV 2000
-#define LM78_SYSCTL_ALARMS 2001
+#define LM78_SYSCTL_TEMP 1200 /* Degrees Celcius * 10 */
+#define LM78_SYSCTL_VID 1300 /* Volts * 100 */
+#define LM78_SYSCTL_FAN_DIV 2000 /* 1, 2, 4 or 8 */
+#define LM78_SYSCTL_ALARMS 2001 /* bitvector */
 
 #endif /* def SENSORS_SENSORS_H */

lm-sensors/trunk/src/lm78.c

@@ -61 +61 @@
 
 #define LM78_REG_CONFIG 0x40
+#define LM78_REG_CHIPID 0x49
 
 
@@ -66 +67 @@
 static int lm78_in_conv[7] = {10000, 10000, 10000, 16892, 38000, 
                               -34768, -15050 };
-#define IN_TO_REG(val,nr) ((((val) * 100000 / lm78_in_conv[nr]) + 8) / 16)
+#define IN_TO_REG(val,nr) (((((val) * 100000 / lm78_in_conv[nr]) + 8) / 16) \
+                           & 0xff)
 #define IN_FROM_REG(val,nr) (((val) *  16 * lm78_in_conv[nr]) / 100000)
 
-#define FAN_TO_REG(val) (((val)==0)?255:((1350000+(val))/((val)*2)))
+#define FAN_TO_REG(val) ((((val)==0)?255:((1350000+(val))/((val)*2))) & 0xff)
 #define FAN_FROM_REG(val) (((val)==0)?-1:\
                            ((val)==255)?0:(1350000 + (val))/((val)*2))
 
-#define TEMP_TO_REG(val) ((val)<0?(val)&0xff:(val))
-#define TEMP_FROM_REG(val) ((val)>0x80?(val)-0x100:(val));
-
-#define VID_FROM_REG(val) ((val) == 0x0f?0:350-(val)*10)
-
+#define TEMP_TO_REG(val) (((val)<0?(val/10)&0xff:(val/10)) & 0xff)
+#define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*10)
+
+#define VID_FROM_REG(val) ((val)==0x1f?0:(val)>=0x10?510-(val)*10:\
+                           (val)>=0x06?0:205-(val)*5)
 #define ALARMS_FROM_REG(val) (val)
 
 #define DIV_FROM_REG(val) (1 >> (val))
-#define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?1:2)
+#define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?0:1)
 
 /* Initial limits */
-#define LM78_INIT_IN_0 280
-#define LM78_INIT_IN_1 280
+#define LM78_INIT_IN_0 (vid==350?280:vid)
+#define LM78_INIT_IN_1 (vid==350?280:vid)
 #define LM78_INIT_IN_2 330
 #define LM78_INIT_IN_3 500
@@ -127 +129 @@
 #define LM78_INIT_FAN_MIN_3 3000
 
-#define LM78_INIT_TEMP_OVER 60
-#define LM78_INIT_TEMP_HYST 50
+#define LM78_INIT_TEMP_OVER 600
+#define LM78_INIT_TEMP_HYST 500
 
 #ifdef MODULE
@@ -150 +152 @@
    some corners. */
 
+/* Types of chips supported */
+enum lm78_type { lm78, lm78j, lm79 };
+
 /* For each registered LM78, we need to keep some data in memory. That
    data is pointed to by lm78_list[NR]->data. The structure itself is
@@ -157 +162 @@
          struct semaphore lock;
          int sysctl_id;
+         enum lm78_type type;
 
          struct semaphore update_lock;
@@ -297 +303 @@
   int address,err;
   struct isa_client *new_client;
+  enum lm78_type type;
+  const char *type_name;
+  const char *client_name;
 
   /* OK, this is no detection. I know. It will do for now, though.  */
@@ -303 +312 @@
   for (address = 0x290; (! err) && (address <= 0x290); address += 0x08) {
     if (check_region(address, LM78_EXTENT))
+      continue;
+
+    /* Awful, but true: unused port addresses should return 0xff */
+    if ((inb_p(address + 1) != 0xff) || (inb_p(address + 2) != 0xff) ||
+       (inb_p(address + 3) != 0xff) || (inb_p(address + 7) != 0xff))
       continue;
     
@@ -312 +326 @@
     
     /* Real detection code goes here */
-   
-    request_region(address, LM78_EXTENT, "lm78");
+
+    /* Determine exact type */
+    outb_p(LM78_REG_CHIPID,address + LM78_ADDR_REG_OFFSET);
+    err = inb_p(address + LM78_DATA_REG_OFFSET);
+    if (err == 0x00) {
+      type = lm78;
+      type_name = "lm78";
+      client_name = "LM78 chip";
+    } else if (err == 0x40) {
+      type = lm78j;
+      type_name = "lm78-j";
+      client_name = "LM78-J chip";
+    } else if (err == 0x80) {
+      type = lm79;
+      type_name = "lm79";
+      client_name = "LM79 chip";
+    }
+    else
+      continue;
+      
+
+    request_region(address, LM78_EXTENT, type_name);
 
     /* Allocate space for a new client structure */
@@ -327 +361 @@
     new_client->data = (struct lm78_data *) (new_client + 1);
     new_client->addr = 0;
+    strcpy(new_client->name,client_name);
+    ((struct lm78_data *) (new_client->data))->type = type;
     new_client->isa_addr = address;
     if ((err = lm78_new_client((struct i2c_adapter *) adapter,
@@ -337 +373 @@
     
     /* Register a new directory entry with module sensors */
-    if ((err = sensors_register_entry((struct i2c_client *) new_client,"lm78",
+    if ((err = sensors_register_entry((struct i2c_client *) new_client,
+                                      type_name,
                                       lm78_dir_table_template)) < 0)
       goto ERROR4;
@@ -390 +427 @@
   int address,err;
   struct i2c_client *new_client;
+  enum lm78_type type;
+  const char *type_name,*client_name;
 
   /* OK, this is no detection. I know. It will do for now, though.  */
@@ -402 +441 @@
 
     /* Real detection code goes here */
+
+    /* Determine exact type */
+    err = smbus_read_byte_data(adapter,address,LM78_REG_CHIPID);
+    if (err == 0x00) {
+      type = lm78;
+      type_name = "lm78";
+      client_name = "LM78 chip";
+    } else if (err == 0x40) {
+      type = lm78j;
+      type_name = "lm78-j";
+      client_name = "LM78-J chip";
+    } else if (err == 0x80) {
+      type = lm79;
+      type_name = "lm79";
+      client_name = "LM79 chip";
+    } else
+      continue;
+
 
     /* Allocate space for a new client structure */
@@ -414 +471 @@
     new_client->data = (struct lm78_data *) (new_client + 1);
     new_client->addr = address;
+    strcpy(new_client->name,client_name);
+    ((struct lm78_data *) (new_client->data))->type = type;
     if ((err = lm78_new_client(adapter,new_client)))
       goto ERROR2;
@@ -422 +481 @@
 
     /* Register a new directory entry with module sensors */
-    if ((err = sensors_register_entry(new_client,"lm78",
+    if ((err = sensors_register_entry(new_client,type_name,
                                       lm78_dir_table_template)) < 0)
       goto ERROR4;
@@ -484 +543 @@
   
   lm78_list[i] = new_client;
-  strcpy(new_client->name,"LM78 chip");
   new_client->id = i;
   new_client->adapter = adapter;
@@ -561 +619 @@
 void lm78_init_client(struct i2c_client *client)
 {
+  int vid;
+
   /* Reset all except Watchdog values and last conversion values
      This sets fan-divs to 2, among others */
   lm78_write_value(client,LM78_REG_CONFIG,0x80);
+
+  vid = lm78_read_value(client,LM78_REG_VID_FANDIV) & 0x0f;
+  if (((struct lm78_data *) (client->data))->type == lm79)
+    vid |= (lm78_read_value(client,LM78_REG_CHIPID) & 0x01) >> 4;
+  else
+    vid |= 0x10;
+  vid = VID_FROM_REG(vid);
 
   lm78_write_value(client,LM78_REG_IN_MIN(0),IN_TO_REG(LM78_INIT_IN_MIN_0,0));
@@ -618 +685 @@
     i = lm78_read_value(client,LM78_REG_VID_FANDIV);
     data->vid = i & 0x0f;
+    if (data->type == lm79)
+      data->vid |= (lm78_read_value(client,LM78_REG_CHIPID) & 0x01) >> 4;
+    else
+      data->vid |= 0x10;
     data->fan_div[0] = (i >> 4) & 0x03;
     data->fan_div[1] = i >> 6;
@@ -656 +727 @@
     case LM78_SYSCTL_TEMP:
       nrels=3;
+      mag=1;
+      break;
+    case LM78_SYSCTL_FAN_DIV:
+      nrels=3;
       mag=0;
       break;
     case LM78_SYSCTL_FAN1: case LM78_SYSCTL_FAN2: case LM78_SYSCTL_FAN3:
-    case LM78_SYSCTL_FAN_DIV:
       nrels=2;
       mag=0;
@@ -742 +816 @@
     case LM78_SYSCTL_IN3: case LM78_SYSCTL_IN4: case LM78_SYSCTL_IN5: 
     case LM78_SYSCTL_IN6: case LM78_SYSCTL_TEMP: 
+    case LM78_SYSCTL_FAN_DIV:
       nrels=3;
       break;
     case LM78_SYSCTL_FAN1: case LM78_SYSCTL_FAN2: case LM78_SYSCTL_FAN3:
-    case LM78_SYSCTL_FAN_DIV:
       nrels=2;
       break;
@@ -859 +933 @@
   }
   if (nrels >= 2) {
-    data->temp_hyst = TEMP_TO_REG(results[0]);
+    data->temp_hyst = TEMP_TO_REG(results[1]);
     lm78_write_value(client,LM78_REG_TEMP_HYST,data->temp_hyst);
   }
@@ -889 +963 @@
   results[0] = DIV_FROM_REG(data->fan_div[0]);
   results[1] = DIV_FROM_REG(data->fan_div[1]);
+  results[2] = 2;
 }
  

lm-sensors/trunk/src/sensors.h

@@ -47 +47 @@
 #endif /* def DEV_HWMON */
 
-#define LM78_SYSCTL_IN0 1000
+#define LM78_SYSCTL_IN0 1000  /* Volts * 100 */
 #define LM78_SYSCTL_IN1 1001
 #define LM78_SYSCTL_IN2 1002
@@ -54 +54 @@
 #define LM78_SYSCTL_IN5 1005
 #define LM78_SYSCTL_IN6 1006
-#define LM78_SYSCTL_FAN1 1101
+#define LM78_SYSCTL_FAN1 1101 /* Rotations/min */
 #define LM78_SYSCTL_FAN2 1102
 #define LM78_SYSCTL_FAN3 1103
-#define LM78_SYSCTL_TEMP 1200
-#define LM78_SYSCTL_VID 1300
-#define LM78_SYSCTL_FAN_DIV 2000
-#define LM78_SYSCTL_ALARMS 2001
+#define LM78_SYSCTL_TEMP 1200 /* Degrees Celcius * 10 */
+#define LM78_SYSCTL_VID 1300 /* Volts * 100 */
+#define LM78_SYSCTL_FAN_DIV 2000 /* 1, 2, 4 or 8 */
+#define LM78_SYSCTL_ALARMS 2001 /* bitvector */
 
 #endif /* def SENSORS_SENSORS_H */