Changeset 790

Timestamp:

04/15/00 19:21:12 (9 years ago)

Author:

mds

Message:

(mds) maxilife 99 support from Fons R.

Files:

• lm-sensors/trunk/etc/sensors.conf.eg (modified) (4 diffs)
• lm-sensors/trunk/kernel/chips/maxilife.c (modified) (30 diffs)
• lm-sensors/trunk/kernel/include/sensors.h (modified) (3 diffs)

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

@@ -426 +426 @@
-    set in6_max -5 * 0.95
-
-
-chip "maxilife-cg-*" "maxilife-co-*" "maxilife-as-*"
-
@@ -432 +431 @@
-   label fan2  "PCI Fan"
-   label fan3  "CPU Fan"
+   ignore fan4
-   
-   label temp2 "PCI Temp"
-   label temp4 "HDD Temp"
-   label temp5 "CPU Temp"
+   ignore temp6
-
-   label vid1  "V+12"
+   ignore vid5
-
-# vid1 need to be scaled by 6.337 other voltages 
@@ -444 +446 @@
-   compute vid1 6.337*@ , @/6.337
-
-
-chip "maxilife-cg-*"
-
-#   invalid
+   ignore
-   label temp3  "BX Temp"
-   
-   label vid2   "Vcpu1"
-   label vid3   "Vcpu2"
-
-
+
-
-chip "maxilife-co-*"
@@ -464 +464 @@
-   label vid4   "VcacheL2"
-
-
-chip "maxilife-as-*"
-
-#   invalid
-#   invalid
+   ignore
+   ignore
-
-   label vid2   "Vcpu"
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-chip "via686a-*"

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

@@ -2 +2 @@
-    maxilife.c - Part of lm_sensors, Linux kernel modules for hardware
-                 monitoring
- 
+-2000
-
-    This program is free software; you can redistribute it and/or modify
@@ -34 +34 @@
-   
-   maxi_version=0 is the default
+   
+   This version of MaxiLife is called MaxiLife'98 and has been
+   succeeded by MaxiLife'99, see below.
+   
+   The new version of the driver also supports MaxiLife NBA (New BIOS
+   Architecture). This new MaxiLife controller provides a much cleaner
+   machine independent abstraction layer to the MaxiLife controller.
+   Instead of accessing directly registers (different for each revision)
+   one now accesses the sensors via unique mailbox tokens that do not
+   change between revisions. Also the quantities are already in physical
+   units (degrees, rpms, voltages, etc.) and don't need special conversion
+   formulas. This new MaxiLife is available on the new 2000 machines,
+   like the Kayak XU800 and XM600. This hardware is also autodetected.
-*/
-
-1.00 25/2/99
+2.00 29/2/2000
-
-
@@ -65 +78 @@
-
-#undef AUTODETECT               /* try to autodetect MaxiLife version */
+/*#define AUTODETECT*/
-#define NOWRITE                 /* don't allow writing to MaxiLife registers */
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#define MAXI_REG_TEMP(nr)      (0x60 + (nr))
-
@@ -89 +120 @@
-
-#define MAXI_REG_BIOS_CTRL     0x2a
-#define MAXI_REG_LED_STATE     0x96
-
-/* Conversions. Rounding and limit checking is only done on the TO_REG
@@ -98 +128 @@
-                               /* 0xfe: fan off, 0xff: stopped (alarm) */
-                               /* 19531 / val * 60 == 1171860 / val */
--1 : (val)==0xff ? 0
+0 : (val)==0xff ? -1
-                                (val)==0x00 ? -1 : (1171860 / (val)))
-
@@ -119 +149 @@
-#define ALARMS_FROM_REG(val)   (val)
-
+/*----------------- MaxiLife'99 mailbox and token definitions ----------------*/
+/* MaxiLife mailbox data register map */
+#define MAXI_REG_MBX_STATUS    0x5a
+#define MAXI_REG_MBX_CMD       0x5b
+#define MAXI_REG_MBX_TOKEN_H   0x5c
+#define MAXI_REG_MBX_TOKEN_L   0x5d
+#define MAXI_REG_MBX_DATA      0x60
+
+/* Mailbox status register definition */
+#define MAXI_STAT_IDLE         0xff
+#define MAXI_STAT_OK           0x00
+#define MAXI_STAT_BUSY         0x0b
+/* other values not used */
+
+/* Mailbox command register opcodes */
+#define MAXI_CMD_READ          0x02
+#define MAXI_CMD_WRITE         0x03
+/* other values not used */
+
+/* MaxiLife NBA Hardware monitoring tokens */
+
+/* Alarm tokens (0x1xxx) */
+#define MAXI_TOK_ALARM(nr)    (0x1000 + (nr))
+#define MAXI_TOK_ALARM_EVENT   0x1000
+#define MAXI_TOK_ALARM_FAN     0x1001
+#define MAXI_TOK_ALARM_TEMP    0x1002
+#define MAXI_TOK_ALARM_VID     0x1003   /* voltages */
+#define MAXI_TOK_ALARM_AVID    0x1004   /* additional voltages */
+#define MAXI_TOK_ALARM_PWR     0x1101   /* power supply glitch */
+
+/* Fan status tokens (0x20xx) */
+#define MAXI_TOK_FAN(nr)      (0x2000 + (nr))
+#define MAXI_TOK_FAN_CPU       0x2000
+#define MAXI_TOK_FAN_PCI       0x2001
+#define MAXI_TOK_FAN_HDD       0x2002   /* hard disk bay fan */
+#define MAXI_TOK_FAN_SINK      0x2003   /* heatsink */
+
+/* Temperature status tokens (0x21xx) */
+#define MAXI_TOK_TEMP(nr)     (0x2100 + (nr))
+#define MAXI_TOK_TEMP_CPU1     0x2100
+#define MAXI_TOK_TEMP_CPU2     0x2101
+#define MAXI_TOK_TEMP_PCI      0x2102   /* PCI/ambient temp */
+#define MAXI_TOK_TEMP_HDD      0x2103   /* hard disk bay temp */
+#define MAXI_TOK_TEMP_MEM      0x2104   /* mother board temp */
+#define MAXI_TOK_TEMP_CPU      0x2105   /* CPU reference temp */
+
+/* Voltage status tokens (0x22xx) */
+#define MAXI_TOK_VID(nr)      (0x2200 + (nr))
+#define MAXI_TOK_VID_12        0x2200   /* +12 volt */
+#define MAXI_TOK_VID_CPU1      0x2201   /* cpu 1 voltage */
+#define MAXI_TOK_VID_CPU2      0x2202   /* cpu 2 voltage */
+#define MAXI_TOK_VID_L2        0x2203   /* level 2 cache voltage */
+#define MAXI_TOK_VID_M12       0x2204   /* -12 volt */
+
+/* Additive voltage status tokens (0x23xx) */
+#define MAXI_TOK_AVID(nr)     (0x2300 + (nr))
+#define MAXI_TOK_AVID_15       0x2300   /* 1.5 volt */
+#define MAXI_TOK_AVID_18       0x2301   /* 1.8 volt */
+#define MAXI_TOK_AVID_25       0x2302   /* 2.5 volt */
+#define MAXI_TOK_AVID_33       0x2303   /* 3.3 volt */
+#define MAXI_TOK_AVID_5        0x2304   /* 5 volt */
+#define MAXI_TOK_AVID_M5       0x2305   /* -5 volt */
+#define MAXI_TOK_AVID_BAT      0x2306   /* battery voltage */
+
+/* Threshold tokens (0x3xxx) */
+#define MAXI_TOK_MIN(token)    ((token) + 0x1000)
+#define MAXI_TOK_MAX(token)    ((token) + 0x1800)
+
+/* LCD Panel (0x4xxx) */
+#define MAXI_TOK_LCD(nr)      (0x4000 + (nr))
+#define MAXI_TOK_LCD_LINE1     0x4000
+#define MAXI_TOK_LCD_LINE2     0x4001
+#define MAXI_TOK_LCD_LINE3     0x4002
+#define MAXI_TOK_LCD_LINE4     0x4003
+
+                               /* 0xfe: fan off, 0xff: stopped (alarm) */
+                               /* or not available */
+#define FAN99_FROM_REG(val)    ((val)==0xfe ? 0 : (val)==0xff ? -1 : ((val)*39))
+
+                               /* when no CPU2 temp is 127 (0x7f) */
+#define TEMP99_FROM_REG(val)   ((val)==0x7f ? -1 : (val)==0xff ? -1 : (val))
+
+#define VID99_FROM_REG(nr,val) ((val)==0xff ? 0 : \
+                                (nr)==1 ? ((val) * 608) : \
+                                (nr)==2 ? ((val) * 160) : \
+                                (nr)==3 ? ((val) * 160) : \
+                                (nr)==4 ? (val) /* no formula spcified */ : \
+                                (nr)==5 ? ((val) * 823 - 149140) : 0)
+
+
-#ifdef MODULE
-extern int init_module(void);
@@ -128 +248 @@
-                       (Dual Pentium II Slot 1, Deschutes/Klamath)
-     Cognac: HP KAYAK XU (Dual Xeon [Slot 2] 400/450 Mhz)
-
-
-
+
+
+
+
+
-
-/* For each registered MaxiLife controller, we need to keep some data in
@@ -146 +268 @@
-        unsigned long last_updated;     /* In jiffies */
-
-3
-3
-3
-3
-5
-5
-5
+4
+4
+4
+4
+6
+6
+6
-        u8 pll;                 /* Register value */
-        u8 pll_min;             /* Register value */
-        u8 pll_max;             /* register value */
-
-
-
+
+
+
+
-        u16 alarms;             /* Register encoding, combined */
-};
@@ -172 +295 @@
-
-static int maxi_attach_adapter(struct i2c_adapter *adapter);
-
+
+
-static int maxi_detach_client(struct i2c_client *client);
-static int maxi_detach_smbus(struct i2c_client *client);
-static int maxi_new_client(struct i2c_adapter *adapter,
-                           struct i2c_client *new_client);
-static void maxi_remove_client(struct i2c_client *client);
-static int maxi_command(struct i2c_client *client, unsigned int cmd,
-                        void *arg);
@@ -184 +304 @@
-
-static int maxi_read_value(struct i2c_client *client, u8 register);
-
+
-static int maxi_write_value(struct i2c_client *client, u8 register,
-                            u8 value);
-
+
+
+
-static void maxi_update_client(struct i2c_client *client);
+static void maxi99_update_client(struct i2c_client *client,
+                                 enum sensor_type sensor, int which);
-static void maxi_init_client(struct i2c_client *client);
-
-static void maxi_fan(struct i2c_client *client, int operation,
-                     int ctl_name, int *nrels_mag, long *results);
+static void maxi99_fan(struct i2c_client *client, int operation,
+                       int ctl_name, int *nrels_mag, long *results);
-static void maxi_temp(struct i2c_client *client, int operation,
-                      int ctl_name, int *nrels_mag, long *results);
+static void maxi99_temp(struct i2c_client *client, int operation,
+                        int ctl_name, int *nrels_mag, long *results);
-static void maxi_pll(struct i2c_client *client, int operation,
-                     int ctl_name, int *nrels_mag, long *results);
-static void maxi_vid(struct i2c_client *client, int operation,
-                     int ctl_name, int *nrels_mag, long *results);
+static void maxi99_vid(struct i2c_client *client, int operation,
+                       int ctl_name, int *nrels_mag, long *results);
+static void maxi_lcd(struct i2c_client *client, int operation,
+                     int ctl_name, int *nrels_mag, long *results);
-static void maxi_alarms(struct i2c_client *client, int operation,
-                        int ctl_name, int *nrels_mag, long *results);
-
-
-static int maxi_id = 0;
-
-/* The driver. I choose to use type i2c_driver, as at is identical to
@@ -220 +349 @@
-/* Used by maxi_init/cleanup */
-static int __initdata maxi_initialized = 0;
+
+static int maxi_id = 0;
-
-/* Default firmware version. Use module option "maxi_version"
@@ -238 +369 @@
-        {MAXI_SYSCTL_FAN3, "fan3", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &maxi_fan},
+        {MAXI_SYSCTL_FAN4, "fan4", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &maxi_fan},
-        {MAXI_SYSCTL_TEMP1, "temp1", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &maxi_temp},
@@ -247 +380 @@
-         &sensors_sysctl_real, NULL, &maxi_temp},
-        {MAXI_SYSCTL_TEMP5, "temp5", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &maxi_temp},
+        {MAXI_SYSCTL_TEMP6, "temp6", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &maxi_temp},
-        {MAXI_SYSCTL_PLL, "pll", NULL, 0, 0644, NULL, &sensors_proc_real,
@@ -258 +393 @@
-        {MAXI_SYSCTL_VID4, "vid4", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &maxi_vid},
+        {MAXI_SYSCTL_VID5, "vid5", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &maxi_vid},
+        {MAXI_SYSCTL_LCD1, "lcd1", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &maxi_lcd},
+        {MAXI_SYSCTL_LCD2, "lcd2", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &maxi_lcd},
+        {MAXI_SYSCTL_LCD3, "lcd3", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &maxi_lcd},
+        {MAXI_SYSCTL_LCD4, "lcd4", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &maxi_lcd},
-        {MAXI_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &maxi_alarms},
@@ -269 +414 @@
-int maxi_attach_adapter(struct i2c_adapter *adapter)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        struct i2c_client *new_client;
+        struct maxi_data *data;
-        enum maxi_type type;
+        int i, j, err = 0;
-        const char *type_name, *client_name;
-
-        /* OK, this is no detection. I know. It will do for now, though. */
-        err = 0;
-
-        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-                goto ERROR0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if (i2c_smbus_read_byte_data
-LED_STATE
+MBX_STATUS
-                        goto ERROR2;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#ifdef AUTODETECT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#endif
-
@@ -358 +570 @@
-                        printk
-                            ("maxilife: HP KAYAK XA (Pentium II Slot 1, monoprocessor)\n");
+                } else if (maxi_version == nba) {
+                        type = nba;
+                        type_name = "maxilife-nba";
+                        client_name = "HP MaxiLife NBA";
+                        printk("maxilife: HP KAYAK XU800/XM600\n");
-                } else {
-
+def
-                        printk
-                            ("maxilife: Warning: probed non-maxilife chip?!? (%x)\n",
@@ -370 +587 @@
-                        goto ERROR2;
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      ERROR0:
-        return err;
-}
-
-
+
+
+
+
+
-{
-        int err;
@@ -417 +646 @@
-                return err;
-        }
-        maxi_remove_client(client);
-        kfree(client);
-        return 0;
-}
-
-/* Find a free slot, and initialize most of the fields */
-int maxi_new_client(struct i2c_adapter *adapter,
-                    struct i2c_client *new_client)
-{
-        struct maxi_data *data;
-
-        new_client->id = maxi_id++;
-        new_client->adapter = adapter;
-        new_client->driver = &maxi_driver;
-        data = new_client->data;
-        data->valid = 0;
-        init_MUTEX(&data->lock);
-        init_MUTEX(&data->update_lock);
-        return 0;
-}
-
-/* Inverse of maxi_new_client */
-void maxi_remove_client(struct i2c_client *client)
-{
-}
-
-/* No commands defined yet */
-int maxi_command(struct i2c_client *client, unsigned int cmd, void *arg)
@@ -466 +673 @@
-
-
-
+ (-1 in case of error, value otherwise)
-int maxi_read_value(struct i2c_client *client, u8 reg)
-{
@@ -472 +679 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-int maxi_write_value(struct i2c_client *client, u8 reg, u8 value)
-{
-        return i2c_smbus_write_byte_data(client, reg, value);
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/* Called when we have found a new MaxiLife. It should set limits, etc. */
-void maxi_init_client(struct i2c_client *client)
-{
-
+
+
+
+
+
+
+
+
-}
-
@@ -490 +833 @@
-        struct maxi_data *data = client->data;
-        int i;
+
+        if (data->type == nba) {
+                printk
+                    ("maxi_update_client should never be called by nba\n");
+                return;
+        }
-
-        down(&data->update_lock);
@@ -548 +897 @@
-                        printk("maxilife: Unknown MaxiLife chip\n");
-                }
+                data->temp[5] = 0;      /* only used by MaxiLife'99 */
+                data->temp_max[5] = 0;
+                data->temp_hyst[5] = 0;
-
-                for (i = 0; i < 3; i++) {
@@ -564 +916 @@
-                                                    MAXI_REG_FAN_MIN(i));
-                }
+                data->fan[3] = 0xff;    /* only used by MaxiLife'99 */
+                data->fan_speed[3] = 0;
+                data->fan_div[3] = 4;   /* avoid possible /0 */
+                data->fan_min[3] = 0;
-
-                data->pll = maxi_read_value(client, MAXI_REG_PLL);