Changeset 2603

Timestamp:

06/19/04 23:54:08 (9 years ago)

Author:

khali

Message:

Add VID support to the pc87360 driver.

Location:

lm-sensors/trunk

Files:

• doc/chips/pc87360 (modified) (1 diff)
• etc/sensors.conf.eg (modified) (1 diff)
• kernel/chips/pc87360.c (modified) (12 diffs)
• lib/chips.c (modified) (1 diff)
• lib/chips.h (modified) (1 diff)

lm-sensors/trunk/doc/chips/pc87360

@@ -152 +152 @@
 triggers an alarm when crossed.
 
+When available, VID inputs are used to provide the nominal CPU Core voltage.
+The driver will default to VRM 9.0, but this can be changed from user-space.
+The chipsets can handle two sets of VID inputs (on dual-CPU systems), but
+the driver will only export one for now. This may change later if there is
+a need.
+
 
 General Remarks

lm-sensors/trunk/etc/sensors.conf.eg

@@ -2070 +2070 @@
 # Voltage inputs
 
+# Set VRM version (default 9.0)
+#   set vrm     9.0
+
    label in7   "Vsb"
    label in8   "Vdd"

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

@@ -42 +42 @@
 #include <asm/io.h>
 #include "version.h"
+#include "sensors_vid.h"
 
 static unsigned short normal_i2c[] = { SENSORS_I2C_END };
@@ -50 +51 @@
 static u8 devid;
 static unsigned int extra_isa[] = { 0x0000, 0x0000, 0x0000 };
-static u8 confreg[3];
+static u8 confreg[4];
 
 enum chips { any_chip, pc87360, pc87363, pc87364, pc87365, pc87366 };
@@ -169 +170 @@
 #define PC87365_REG_IN_ALARMS1          0x00
 #define PC87365_REG_IN_ALARMS2          0x01
+#define PC87365_REG_VID                 0x06
 
 #define IN_FROM_REG(val,ref)            (((val) * (ref) + 128) / 256)
@@ -216 +218 @@
         u8 in_status[14];       /* Register value */
         u16 in_alarms;          /* Register values, combined, masked */
+        u8 vid_conf;            /* Configuration register value */
+        u8 vrm;
+        u8 vid;                 /* Register value */
 
         u8 temp[3];             /* Register value */
@@ -256 +261 @@
 void pc87365_in_status(struct i2c_client *client, int operation, int ctl_name,
                        int *nrels_mag, long *results);
+void pc87365_vid(struct i2c_client *client, int operation, int ctl_name,
+                 int *nrels_mag, long *results);
+void pc87365_vrm(struct i2c_client *client, int operation, int ctl_name,
+                 int *nrels_mag, long *results);
 
 void pc87365_temp(struct i2c_client *client, int operation, int ctl_name,
@@ -319 +328 @@
 #define PC87365_SYSCTL_TEMP5_STATUS     2312 /* not for PC87365 */
 #define PC87365_SYSCTL_TEMP6_STATUS     2313 /* not for PC87365 */
+
+#define PC87365_SYSCTL_VID              2400
+#define PC87365_SYSCTL_VRM              2401
 
 #define PC87365_STATUS_IN_MIN           0x02
@@ -452 +464 @@
         {PC87365_SYSCTL_TEMP6_STATUS, "temp6_status", NULL, 0, 0444, NULL,
          &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in_status},
+        {PC87365_SYSCTL_VID, "vid", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_vid},
+        {PC87365_SYSCTL_VRM, "vrm", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_vrm},
         {0}
 };
@@ -526 +542 @@
                         /* Are we using thermistors? */
                         if (*devid == 0xE9) { /* PC87366 */
-                                /* This register is not logical-device
-                                   specific, just that we won't need it if we
-                                   don't use the VLM device */
+                                /* These registers are not logical-device
+                                   specific, just that we won't need them if
+                                   we don't use the VLM device */
                                 confreg[2] = superio_inb(0x2B);
+                                confreg[3] = superio_inb(0x25);
 
                                 if (confreg[2] & 0x40) {
@@ -536 +553 @@
                                                "monitoring\n");
                                 }
+
+#ifdef DEBUG
+                                if (confreg[3] & 0xE0) {
+                                        printk(KERN_INFO "pc87360.o: VID "
+                                               "inputs routed (mode %d)\n",
+                                                confreg[3] & 0xE0);
+                                }
+#endif
                         }
                 }
@@ -645 +670 @@
                        (i&0x02) ? "external" : "internal");
 #endif
+
+                data->vid_conf = confreg[3];
+                data->vrm = 90;
         }
 
@@ -961 +989 @@
                                             NO_BANK, PC87365_REG_IN_ALARMS2)
                                             & 0x07) << 8);
+                        data->vid = (data->vid_conf & 0xE0) ?
+                                    pc87360_read_value(data, LD_IN,
+                                    NO_BANK, PC87365_REG_VID) : 0x1F;
                 }
 
@@ -1182 +1213 @@
 }
 
+void pc87365_vid(struct i2c_client *client, int operation, int ctl_name,
+                 int *nrels_mag, long *results)
+{
+        struct pc87360_data *data = client->data;
+        if (operation == SENSORS_PROC_REAL_INFO)
+                *nrels_mag = 3;
+        else if (operation == SENSORS_PROC_REAL_READ) {
+                pc87360_update_client(client);
+                results[0] = vid_from_reg(data->vid & 0x1f, data->vrm);
+                *nrels_mag = 1;
+        }
+}
+
+void pc87365_vrm(struct i2c_client *client, int operation, int ctl_name,
+                 int *nrels_mag, long *results)
+{
+        struct pc87360_data *data = client->data;
+        if (operation == SENSORS_PROC_REAL_INFO)
+                *nrels_mag = 1;
+        else if (operation == SENSORS_PROC_REAL_READ) {
+                results[0] = data->vrm;
+                *nrels_mag = 1;
+        } else if (operation == SENSORS_PROC_REAL_WRITE) {
+                if (*nrels_mag >= 1)
+                        data->vrm = results[0];
+        }
+}
+
 void pc87365_temp(struct i2c_client *client, int operation, int ctl_name,
                   int *nrels_mag, long *results)

lm-sensors/trunk/lib/chips.c

@@ -4618 +4618 @@
     { SENSORS_PC87360_TEMP6_STATUS, "temp6_status", SENSORS_PC87360_TEMP6,
                 NOMAP, R, PC87365_SYSCTL_TEMP6_STATUS, VALUE(1), 0 },
+    { SENSORS_PC87360_VID, "vid", NOMAP, NOMAP, 
+                R, PC87365_SYSCTL_VID, VALUE(1), 3 },
+    { SENSORS_PC87360_VRM, "vrm", NOMAP, NOMAP, 
+                RW, PC87365_SYSCTL_VRM, VALUE(1), 1 },
     { 0 }
   };

lm-sensors/trunk/lib/chips.h

@@ -1750 +1750 @@
 #define SENSORS_PC87360_TEMP6_STATUS    216     /* R */
 
+#define SENSORS_PC87360_VID             240     /* R */
+#define SENSORS_PC87360_VRM             241     /* RW */
+
 #define SENSORS_LM92_PREFIX "lm92"