Changeset 1112

Timestamp:

06/03/01 23:58:26 (8 years ago)

Author:

mds

Message:

Initial checkin of it87 driver from

Christophe Gauthron <chrisg@0-in.com>

Files:

• lm-sensors/trunk/CHANGES (modified) (4 diffs)
• lm-sensors/trunk/CONTRIBUTORS (modified) (1 diff)
• lm-sensors/trunk/README (modified) (1 diff)
• lm-sensors/trunk/doc/chips/it87 (added)
• lm-sensors/trunk/etc/sensors.conf.eg (modified) (5 diffs)
• lm-sensors/trunk/kernel/chips/Module.mk (modified) (2 diffs)
• lm-sensors/trunk/kernel/chips/it87.c (added)
• lm-sensors/trunk/kernel/sensors.c (modified) (3 diffs)
• lm-sensors/trunk/prog/detect/sensors-detect (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/main.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -22 +22 @@
-        If your make fails because it can't find <linux/i2c-proc.h>, you
-        forgot this step!!!
-
+, many
-  File doc/busses/i2c-sis5595: new
+  File doc/busses/i2c-tsunami: new
-  File doc/chips/via686a: Claim support for 686b.
-  File README.thinkpad: new
@@ -46 +47 @@
-  Module i2c-tsunami: New
-  Module i2c-via: Ensure i2c bus is tristated correctly.
+  Module it87: new driver for IT8705, IT8712, Sis950 chips
-  Module lm78: Recognize chipid=0x20
-  Module lm87: Fix in0, in1 (2.5V and Vccp1) calculations
@@ -63 +65 @@
-  Program mkpatch.pl: Fix adm9240 typos; Add more chips to Configure.help;
-                      Remove ltc1710; Fix i2c_sis5595 typo;
-
+
+
-  Program sens_update_rrd: new
-  Program sensord: Add -d (debug) and -p (pid-file) options
@@ -69 +72 @@
-                   Fix swapped limit and hysteresis on 9240, 5595, 686a;
-                   Change mtp008 temps from max/min to limit/hyst;
- and adm1024
+, adm1024, it87xx
-  Program sensors-detect: Recognize lm78 with chipid=0x20;
-                          Recognize SMSC Victory66 South Bridge;
-                          Add devfs /dev/i2c/x support;
-
+, it87xx
-  Program tellerstats: new
-

lm-sensors/trunk/CONTRIBUTORS

@@ -61 +61 @@
-* Oleg I. Vdovikin <vdovikin@jscc.ru>
-  Author of the DEC Tsunami bus driver.
+* Christophe Gauthron <chrisg@0-in.com>
+  Author of the IT87 driver.

lm-sensors/trunk/README

@@ -53 +53 @@
-  Genesys Logic GL518SM (rev 00, 80), GL520SM, GL523SM
-  Intel Xeon processor embedded sensors
+  ITE IT8705F, IT8712F embedded sensors
-  Maxim MAX1617 and MAX1617A
-  Myson MTP008
-
-
-
+n
+ 
+, 950
-  TelCom TCN75
-  TI THMC10 and THMC50

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

@@ -208 +208 @@
-
-
- "sis5595-*"
+
-
-# These are as advised in the LM78 and LM79 data sheets, and used on almost
@@ -273 +273 @@
-    set in6_max -5 * 1.05
-
-
-
+
-#    set temp_over 40   
-#    set temp_hyst 37   
@@ -286 +285 @@
-#    set temp3_hyst 47  
-
+
+chip "sis5595-*"
+
+    label in0 "VCore 1"
+    label in1 "VCore 2"
+    label in2 "+3.3V"
+    label in3 "+5V"
+    label in4 "+12V"
+
+    compute in3 ((6.8/10)+1)*@ ,  @/((6.8/10)+1)
+    compute in4 ((28/10)+1)*@  ,  @/((28/10)+1)
+
+    set in0_min 2.0 * 0.95
+    set in0_max 2.0 * 1.05
+    set in1_min 2.0 * 0.95
+    set in1_max 2.0 * 1.05
+    set in2_min 3.3 * 0.95
+    set in2_max 3.3 * 1.05
+    set in3_min 5.0 * 0.95
+    set in3_max 5.0 * 1.05
+    set in4_min 12 * 0.95
+    set in4_max 12 * 1.05
+
+#
+# SiS5595 temperature calculation
+# The driver does NOT include a calculation due to the wide
+# variation in thermistor types on SiS5595 motherboards.
+# Look in your 'Vendor.ini' file to see which one is present
+# on your motherboard. Look for the line like:
+#       [Temp1]
+#            ThermistorType     = NTC-10KC15-1608-1P
+# Uncomment the correct 'compute' line below to match your
+# thermistor type.
+#            ThermistorType     = NTC-10KC15-1608-1P (10K at 25C; Beta = 3435)
+#            ThermistorType     = NTC-103KC15-1608-1P
+#            ThermistorType     = NTC-103AT-2 (10K at 25C; Beta = 3435)
+#            ThermistorType     = NTC-103JT   (10K at 25C; Beta = 3435)
+
+# examples for sis5595 temperature limits;
+# for sis5595, temp_hist is really the low limit, not a hysteresis value
+#    set temp_over 40   
+#    set temp_hyst 37   
-
-chip "w83782d-*" "w83783s-*" "w83627hf-*"
@@ -874 +915 @@
-chip "adm9240-*" "ds1780-*" "lm81-*"
-#
-is chip has
+ese chips have
-# the feature names are quite different from other chips.
-is chip
+ese chips
-# This is great if it's correct but makes it a little more
-# difficult if you want to change it.
@@ -938 +979 @@
-    ignore "Vccp1"
-    ignore "Vccp2"
+
+
+chip "it87-*"
+
+# The values below have been tested on Asus CUSI, CUM motherboards.
+
+# Voltage monitors as advised in the It8705 data sheet
+
+    label in0 "VCore 1"
+    label in1 "VCore 2"
+    label in2 "+3.3V"
+    label in3 "+5V"
+    label in4 "+12V"
+    label in5 "-12V"
+    label in6 "-5V"
+    label in7 "Stdby"
+
+    set in0_min 1.5 * 0.95
+    set in0_max 1.5 * 1.05
+    set in1_min 2.4
+    set in1_max 2.6
+    set in2_min 3.3 * 0.95
+    set in2_max 3.3 * 1.05
+    set in3_min 5.0 * 0.95
+    set in3_max 5.0 * 1.05
+    set in4_min 12 * 0.95
+    set in4_max 12 * 1.05
+    set in5_min -12 * 0.95
+    set in5_max -12 * 1.05
+    set in6_min -5 * 0.95
+    set in6_max -5 * 1.05
+    set in6_min -5 * 0.95
+    set in6_max -5 * 1.05
+
+    # vid not monitored by IT8705F
+    ignore  vid
+
+    compute in2 (1 + 1)*@ ,       @/(1 + 1)
+    compute in3 ((6.8/10)+1)*@ ,  @/((6.8/10)+1)
+    compute in4 ((30/10) +1)*@  , @/((30/10) +1)
+    compute in5 -(72/10)*@  ,     -@/(72/10)
+    compute in6 -(56/10)*@ ,      -@/(56/10)
+    compute in7 ((6.8/10)+1)*@ ,  @/((6.8/10)+1)
+
+# Temperature
+
+    label temp1       "Temp1/MB"
+    set   temp1_over  40
+    set   temp1_hyst  20
+
+    label temp2       "Temp2/CPU"
+    set   temp2_over  45
+    set   temp2_hyst  25
+
+    ignore temp3
+
+# Fans
+
+    set fan1_min 0
+    set fan2_min 3000
+    ignore fan3
+

lm-sensors/trunk/kernel/chips/Module.mk

@@ -26 +26 @@
-# These targets are NOT included in 'mkpatch' ...
-KERNELCHIPSTARGETS :=  \
+                      $(MODULE_DIR)/adm1024.o \
+                      $(MODULE_DIR)/it87.o \
-                      $(MODULE_DIR)/maxilife.o \
-                      $(MODULE_DIR)/adm1024.o \
-                      $(MODULE_DIR)/mtp008.o
-
@@ -58 +59 @@
-ifneq ($(shell if grep -q '^CONFIG_SENSORS_GL520SM=y' $(LINUX)/.config; then echo 1; fi),1)
-KERNELCHIPSTARGETS += $(MODULE_DIR)/gl520sm.o
+endif
+ifneq ($(shell if grep -q '^CONFIG_SENSORS_IT87=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELCHIPSTARGETS += $(MODULE_DIR)/it87.o
-endif
-ifneq ($(shell if grep -q '^CONFIG_SENSORS_LM75=y' $(LINUX)/.config; then echo 1; fi),1)

lm-sensors/trunk/kernel/sensors.c

@@ -18 +18 @@
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+
-
-#include <linux/init.h>
@@ -98 +99 @@
-extern int sensors_ltc1710_init(void);
-#endif
+#ifdef CONFIG_SENSORS_IT87
+extern int sensors_it87_init(void);
+#endif
-
-int __init sensors_init_all(void)
@@ -159 +163 @@
-        sensors_ltc1710_init();
-#endif
+#ifdef CONFIG_SENSORS_IT87
+        sensors_it87_init();
+#endif
-        return 0;
-}

lm-sensors/trunk/prog/detect/sensors-detect

@@ -629 +629 @@
-     {
-       name => "ITE IT8705F / IT8712F / SiS 950",
-
-
-
-
+
-       isa_addrs => [0x290],
-       isa_detect => sub { ite_isa_detect 0, @_ },
-       alias_detect => sub { ite_alias_detect 0, @_ },
-     } ,
-     {

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

@@ -2427 +2427 @@
-}
-
+
+void print_it87(const sensors_chip_name *name)
+{
+  char *label = NULL;
+  double cur, min, max, fdiv;
+  int alarms_fan, alarms_vin, alarms_temp, valid;
+
+  if (!sensors_get_feature(*name,SENSORS_IT87_ALARMS_FAN, &cur)) {
+    alarms_fan = cur + 0.5;
+  }
+  else {
+    printf("ERROR: Can't get fan alarm data!\n");
+    alarms_fan = 0;
+  }
+
+  if (!sensors_get_feature(*name,SENSORS_IT87_ALARMS_VIN, &cur)) {
+    alarms_vin = cur + 0.5;
+  }
+  else {
+    printf("ERROR: Can't get vin alarm data!\n");
+    alarms_vin = 0;
+  }
+
+  if (!sensors_get_feature(*name,SENSORS_IT87_ALARMS_TEMP, &cur)) {
+    alarms_temp = cur + 0.5;
+  }
+  else {
+    printf("ERROR: Can't get temp alarm data!\n");
+    alarms_temp = 0;
+  }
+
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_IN0,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN0,&cur) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN0_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN0_MAX,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+             cur,min,max,alarms_vin&IT87_ALARM_IN0?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN0 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_IN1,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN1,&cur) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN1_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN1_MAX,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+             cur,min,max,alarms_vin&IT87_ALARM_IN1?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN1 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_IN2,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN2,&cur) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN2_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN2_MAX,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+             cur,min,max,alarms_vin&IT87_ALARM_IN2?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN2 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_IN3,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN3,&cur) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN3_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN3_MAX,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+             cur,min,max,alarms_vin&IT87_ALARM_IN3?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN3 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_IN4,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN4,&cur) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN4_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN4_MAX,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+             cur,min,max,alarms_vin&IT87_ALARM_IN4?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN4 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_IN5,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN5,&cur) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN5_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN5_MAX,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+             cur,min,max,alarms_vin&IT87_ALARM_IN5?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN5 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_IN6,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN6,&cur) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN6_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN6_MAX,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+             cur,min,max,alarms_vin&IT87_ALARM_IN6?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN6 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_IN7,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN7,&cur) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN7_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_IT87_IN7_MAX,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+             cur,min,max,alarms_vin&IT87_ALARM_IN7?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN7 data!\n");
+  free_the_label(&label);
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_FAN1,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_FAN1,&cur) &&
+      !sensors_get_feature(*name,SENSORS_IT87_FAN1_DIV,&fdiv) &&
+      !sensors_get_feature(*name,SENSORS_IT87_FAN1_MIN,&min)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%4.0f RPM  (min = %4.0f RPM, div = %1.0f)          %s\n",
+             cur,min,fdiv, alarms_fan&IT87_ALARM_FAN1?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get FAN1 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_FAN2,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_FAN2,&cur) &&
+      !sensors_get_feature(*name,SENSORS_IT87_FAN2_DIV,&fdiv) &&
+      !sensors_get_feature(*name,SENSORS_IT87_FAN2_MIN,&min)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%4.0f RPM  (min = %4.0f RPM, div = %1.0f)          %s\n",
+             cur,min,fdiv, alarms_fan&IT87_ALARM_FAN2?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get FAN2 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_FAN3,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_FAN3,&cur) &&
+      !sensors_get_feature(*name,SENSORS_IT87_FAN3_DIV,&fdiv) &&
+      !sensors_get_feature(*name,SENSORS_IT87_FAN3_MIN,&min)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%4.0f RPM  (min = %4.0f RPM, div = %1.0f)          %s\n",
+             cur,min,fdiv, alarms_fan&IT87_ALARM_FAN3?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get FAN3 data!\n");
+  free_the_label(&label);
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_TEMP1,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_TEMP1,&cur) &&
+      !sensors_get_feature(*name,SENSORS_IT87_TEMP1_LOW,&min) &&
+      !sensors_get_feature(*name,SENSORS_IT87_TEMP1_HIGH,&max)) {
+    if (valid) {
+      print_label(label,10);
+      print_temp_info( cur, max, min, MINMAX );
+      printf( " %s\n", alarms_temp & IT87_ALARM_TEMP1 ? "ALARM" : "" );
+    }
+  } else
+    printf("ERROR: Can't get TEMP1 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_TEMP2,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_TEMP2,&cur) &&
+      !sensors_get_feature(*name,SENSORS_IT87_TEMP2_LOW,&min) &&
+      !sensors_get_feature(*name,SENSORS_IT87_TEMP2_HIGH,&max)) {
+    if (valid) {
+      print_label(label,10);
+      print_temp_info( cur, max, min, MINMAX );
+      printf( " %s\n", alarms_temp & IT87_ALARM_TEMP2 ? "ALARM" : "" );
+    }
+  } else
+    printf("ERROR: Can't get TEMP2 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_TEMP3,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_TEMP3,&cur) &&
+      !sensors_get_feature(*name,SENSORS_IT87_TEMP3_LOW,&min) &&
+      !sensors_get_feature(*name,SENSORS_IT87_TEMP3_HIGH,&max)) {
+    if (valid) {
+      print_label(label,10);
+      print_temp_info( cur, max, min, MINMAX );
+      printf( " %s\n", alarms_temp & IT87_ALARM_TEMP3 ? "ALARM" : "" );
+    }
+  } else
+    printf("ERROR: Can't get TEMP3 data!\n");
+  free_the_label(&label);
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_VID,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_IT87_VID,&cur)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+5.2f V\n",cur);
+    }
+  }
+  free_the_label(&label);
+}
+
+
-void print_unknown_chip(const sensors_chip_name *name)
-{

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

@@ -42 +42 @@
-extern void print_eeprom(const sensors_chip_name *name);
-extern void print_lm87(const sensors_chip_name *name);
+extern void print_it87(const sensors_chip_name *name);
-
-#endif /* def PROG_SENSORS_CHIPS_H */

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

@@ -325 +325 @@
-  else if (!strcmp(name.prefix,"eeprom"))
-    print_eeprom(&name);
+  else if (!strcmp(name.prefix,"it87"))
+    print_it87(&name);
-  else
-    print_unknown_chip(&name);