Changeset 4456

Timestamp:

06/18/07 17:17:43 (6 years ago)

Author:

khali

Message:

Add support for the w83627ehf thermal sensor types. I made them read-only,
as the BIOS is supposed to set them up properly. This information makes it
easier to find out which temperature channel corresponds to the CPU.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (2 diffs)
• kernel/chips/w83627ehf.c (modified) (6 diffs)
• lib/chips.c (modified) (1 diff)
• lib/chips.h (modified) (1 diff)
• prog/sensors/chips.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -11 +11 @@
            Add w83627ehf support (for Linux 2.4)
            Add support for the w83627ehf VID function
+           Add support for the w83627ehf thermal sensor types
   Man page sensors.conf.5: Update the chip statement section
   Module i2c-nforce2: Add nForce MCP61, MCP65 support (2.6 backport)
@@ -37 +38 @@
                    Add w83627ehf support (for Linux 2.4)
                    Add support for the w83627ehf VID function
+                   Add support for the w83627ehf thermal sensor types
   Program sensors-detect: Stop Super-I/O probe after first family success
                           Fix SMSC DME1737 detection

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

@@ -210 +210 @@
         u8 fan_div[5];
         u8 has_fan;             /* some fan inputs can be disabled */
+        u8 sensor[3];
         u16 temp[3];
         u16 temp_max[3];
@@ -243 +244 @@
 #define W83627EHF_SYSCTL_TEMP2          1202
 #define W83627EHF_SYSCTL_TEMP3          1203
+#define W83627EHF_SYSCTL_SENSOR1        1211
+#define W83627EHF_SYSCTL_SENSOR2        1212
+#define W83627EHF_SYSCTL_SENSOR3        1213
 #define W83627EHF_SYSCTL_VID            1300    /* Volts * 1000 */
 #define W83627EHF_SYSCTL_VRM            1301
@@ -806 +810 @@
 }
 
+static void w83627ehf_sensor(struct i2c_client *client, int operation,
+                             int ctl_name, int *nrels_mag, long *results)
+{
+        struct w83627ehf_data *data = client->data;
+        int nr = ctl_name - W83627EHF_SYSCTL_SENSOR1;
+
+        if (operation == SENSORS_PROC_REAL_INFO)
+                *nrels_mag = 0;
+        else if (operation == SENSORS_PROC_REAL_READ) {
+                w83627ehf_update_client(client);
+                results[0] = data->sensor[nr];
+                *nrels_mag = 1;
+        }
+}
+
 static ctl_table w83627ehf_dir_table_template[] = {
         {W83627EHF_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &i2c_proc_real,
@@ -865 +884 @@
         {W83627EHF_SYSCTL_VRM, "vrm", NULL, 0, 0644, NULL, &i2c_proc_real,
          &i2c_sysctl_real, NULL, &w83627ehf_vrm},
+
+        {W83627EHF_SYSCTL_SENSOR1, "sensor1", NULL, 0, 0444, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83627ehf_sensor},
+        {W83627EHF_SYSCTL_SENSOR2, "sensor2", NULL, 0, 0444, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83627ehf_sensor},
+        {W83627EHF_SYSCTL_SENSOR3, "sensor3", NULL, 0, 0444, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &w83627ehf_sensor},
         {0}
 };
@@ -876 +902 @@
 static void w83627ehf_init_client(struct i2c_client *client)
 {
+        struct w83627ehf_data *data = client->data;
         int i;
-        u8 tmp;
+        u8 tmp, diode;
 
         /* Start monitoring if needed */
@@ -900 +927 @@
                 printk(KERN_INFO "w83627ehf: Enabling VBAT monitoring\n");
                 w83627ehf_write_value(client, W83627EHF_REG_VBAT, tmp | 0x01);
+        }
+
+        /* Get thermal sensor types */
+        diode = w83627ehf_read_value(client, W83627EHF_REG_DIODE);
+        for (i = 0; i < 3; i++) {
+                if ((tmp & (0x02 << i)))
+                        data->sensor[i] = (diode & (0x10 << i)) ? 1 : 2;
+                else
+                        data->sensor[i] = 4; /* thermistor */
         }
 }

lm-sensors/trunk/lib/chips.c

@@ -2148 +2148 @@
                                       SENSORS_W83627EHF_TEMP3, RW }, 
                                       W83627EHF_SYSCTL_TEMP3, VALUE(2), 1 },
+    { { SENSORS_W83627EHF_TEMP1_TYPE, "sensor1", SENSORS_W83627EHF_TEMP1, 
+                                      NOMAP, R }, 
+                                      W83627EHF_SYSCTL_SENSOR1, VALUE(1), 0 },
+    { { SENSORS_W83627EHF_TEMP2_TYPE, "sensor2", SENSORS_W83627EHF_TEMP2, 
+                                      NOMAP, R }, 
+                                      W83627EHF_SYSCTL_SENSOR2, VALUE(1), 0 },
+    { { SENSORS_W83627EHF_TEMP3_TYPE, "sensor3", SENSORS_W83627EHF_TEMP3, 
+                                      NOMAP, R }, 
+                                      W83627EHF_SYSCTL_SENSOR3, VALUE(1), 0 },
     { { SENSORS_W83627EHF_VID, "vid", NOMAP, NOMAP, R },
                                       W83627EHF_SYSCTL_VID, VALUE(1), 3 },

lm-sensors/trunk/lib/chips.h

@@ -972 +972 @@
 #define SENSORS_W83627EHF_TEMP2_HYST    82 /* RW */
 #define SENSORS_W83627EHF_TEMP3_HYST    83 /* RW */
+#define SENSORS_W83627EHF_TEMP1_TYPE    91 /* R  */
+#define SENSORS_W83627EHF_TEMP2_TYPE    92 /* R  */
+#define SENSORS_W83627EHF_TEMP3_TYPE    93 /* R  */
 #define SENSORS_W83627EHF_VID           245 /* R  */
 #define SENSORS_W83627EHF_VRM           249 /* R  */

lm-sensors/trunk/prog/sensors/chips.c

@@ -2999 +2999 @@
         print_label(label,10);
         print_temp_info(cur, over, hyst, HYST, i ? 1 : 0, i ? 1 : 0);
+        if (!sensors_get_feature(*name, SENSORS_W83627EHF_TEMP1_TYPE+i, &cur)) {
+          int sensor = cur + 0.5;
+          printf("[%-10s]", sensor == 1 ? "CPU diode" :
+                            sensor == 2 ? "transistor" : "thermistor");
+        }
         if (sensors_get_feature(*name, SENSORS_W83627EHF_TEMP1_ALARM+i, &alarm))
           alarm = temp_alarms & (1 << i);