Changeset 742

Timestamp:

03/04/00 17:14:08 (13 years ago)

Author:

mds

Message:

(mds) Add via686a integrated sensors support. Untested.

Location:

lm-sensors/trunk

Files:

• kernel/chips/Module.mk (modified) (1 diff)
• kernel/chips/via686a.c (added)
• kernel/include/sensors.h (modified) (2 diffs)
• lib/chips.c (modified) (2 diffs)
• lib/chips.h (modified) (1 diff)
• prog/sensors/chips.c (modified) (1 diff)
• prog/sensors/chips.h (modified) (1 diff)
• prog/sensors/main.c (modified) (1 diff)

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

@@ -27 +27 @@
                       $(MODULE_DIR)/matorb.o $(MODULE_DIR)/maxilife.o \
                       $(MODULE_DIR)/thmc50.o \
+                      $(MODULE_DIR)/via686a.o \
                       $(MODULE_DIR)/ddcmon.o
 ifneq ($(shell if grep -q '^CONFIG_SENSORS_ADM1021=y' $(LINUX)/.config; then echo 1; fi),1)

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

@@ -375 +375 @@
 #define I2C_DRIVERID_THMC50 1017
 #define I2C_DRIVERID_DDCMON 1018
+#define I2C_DRIVERID_VIA686A 1019
 
 /* Sysctl IDs */
@@ -640 +641 @@
 #define SIS5595_ALARM_FAN2 0x80
 
+#define VIA686A_SYSCTL_IN0 1000
+#define VIA686A_SYSCTL_IN1 1001
+#define VIA686A_SYSCTL_IN2 1002
+#define VIA686A_SYSCTL_IN3 1003
+#define VIA686A_SYSCTL_IN4 1004
+#define VIA686A_SYSCTL_FAN1 1101
+#define VIA686A_SYSCTL_FAN2 1102
+#define VIA686A_SYSCTL_TEMP 1200
+#define VIA686A_SYSCTL_TEMP2 1201
+#define VIA686A_SYSCTL_TEMP3 1202
+#define VIA686A_SYSCTL_FAN_DIV 2000
+#define VIA686A_SYSCTL_ALARMS 2001
+
+#define VIA686A_ALARM_IN0 0x01
+#define VIA686A_ALARM_IN1 0x02
+#define VIA686A_ALARM_IN2 0x04
+#define VIA686A_ALARM_IN3 0x08
+#define VIA686A_ALARM_TEMP 0x10
+#define VIA686A_ALARM_FAN1 0x40
+#define VIA686A_ALARM_FAN2 0x80
+#define VIA686A_ALARM_IN4 0x100
+#define VIA686A_ALARM_TEMP2 0x400
+#define VIA686A_ALARM_CHAS 0x1000
+#define VIA686A_ALARM_TEMP3 0x8000
+
 #define ICSPLL_SYSCTL1 1000
 

lm-sensors/trunk/lib/chips.c

@@ -1560 +1560 @@
   };
 
+static sensors_chip_feature via686a_features[] =
+  { 
+    { SENSORS_VIA686A_IN0, "2.0V", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, 
+                        SENSORS_MODE_R, VIA686A_SYSCTL_IN0, VALUE(3), 2 },
+    { SENSORS_VIA686A_IN1, "2.5V", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, VIA686A_SYSCTL_IN1, VALUE(3), 2 },
+    { SENSORS_VIA686A_IN2, "3.3V", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, VIA686A_SYSCTL_IN2, VALUE(3), 2 },
+    { SENSORS_VIA686A_IN3, "5.0V", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, VIA686A_SYSCTL_IN3, VALUE(3), 2 },
+    { SENSORS_VIA686A_IN4, "12V", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, VIA686A_SYSCTL_IN4, VALUE(3), 2 },
+    { SENSORS_VIA686A_IN0_MIN, "in0_min", SENSORS_VIA686A_IN0, SENSORS_VIA686A_IN0,
+                            SENSORS_MODE_RW, VIA686A_SYSCTL_IN0, VALUE(1), 2 },
+    { SENSORS_VIA686A_IN1_MIN, "in1_min", SENSORS_VIA686A_IN1, SENSORS_VIA686A_IN1,
+                            SENSORS_MODE_RW, VIA686A_SYSCTL_IN1, VALUE(1), 2 },
+    { SENSORS_VIA686A_IN2_MIN, "in2_min", SENSORS_VIA686A_IN2, SENSORS_VIA686A_IN2,
+                            SENSORS_MODE_RW, VIA686A_SYSCTL_IN2, VALUE(1), 2 },
+    { SENSORS_VIA686A_IN3_MIN, "in3_min", SENSORS_VIA686A_IN3, SENSORS_VIA686A_IN3,
+                            SENSORS_MODE_RW, VIA686A_SYSCTL_IN3, VALUE(1), 2 },
+    { SENSORS_VIA686A_IN3_MIN, "in4_min", SENSORS_VIA686A_IN4, SENSORS_VIA686A_IN4,
+                            SENSORS_MODE_RW, VIA686A_SYSCTL_IN4, VALUE(1), 2 },
+    { SENSORS_VIA686A_IN0_MAX, "in0_max", SENSORS_VIA686A_IN0, SENSORS_VIA686A_IN0,
+                            SENSORS_MODE_RW, VIA686A_SYSCTL_IN0, VALUE(2), 2 },
+    { SENSORS_VIA686A_IN1_MAX, "in1_max", SENSORS_VIA686A_IN1, SENSORS_VIA686A_IN1,
+                            SENSORS_MODE_RW, VIA686A_SYSCTL_IN1, VALUE(2), 2 },
+    { SENSORS_VIA686A_IN2_MAX, "in2_max", SENSORS_VIA686A_IN2, SENSORS_VIA686A_IN2,
+                            SENSORS_MODE_RW, VIA686A_SYSCTL_IN2, VALUE(2), 2 },
+    { SENSORS_VIA686A_IN3_MAX, "in3_max", SENSORS_VIA686A_IN3, SENSORS_VIA686A_IN3,
+                            SENSORS_MODE_RW, VIA686A_SYSCTL_IN3, VALUE(2), 2 },
+    { SENSORS_VIA686A_IN3_MAX, "in4_max", SENSORS_VIA686A_IN4, SENSORS_VIA686A_IN4,
+                            SENSORS_MODE_RW, VIA686A_SYSCTL_IN4, VALUE(2), 2 },
+    { SENSORS_VIA686A_FAN1, "fan1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                         SENSORS_MODE_R, VIA686A_SYSCTL_FAN1, VALUE(2), 0 },
+    { SENSORS_VIA686A_FAN2, "fan2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                         SENSORS_MODE_R, VIA686A_SYSCTL_FAN2, VALUE(2), 0 },
+    { SENSORS_VIA686A_FAN1_MIN, "fan1_min", SENSORS_VIA686A_FAN1, SENSORS_VIA686A_FAN1,
+                             SENSORS_MODE_RW, VIA686A_SYSCTL_FAN1, VALUE(1), 0 },
+    { SENSORS_VIA686A_FAN2_MIN, "fan2_min", SENSORS_VIA686A_FAN2, SENSORS_VIA686A_FAN2,
+                             SENSORS_MODE_RW, VIA686A_SYSCTL_FAN2, VALUE(1), 0 },
+    { SENSORS_VIA686A_TEMP, "temp1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                         SENSORS_MODE_R, VIA686A_SYSCTL_TEMP, VALUE(3), 1 },
+    { SENSORS_VIA686A_TEMP_HYST, "temp1_hyst", SENSORS_VIA686A_TEMP,
+                              SENSORS_VIA686A_TEMP, SENSORS_MODE_RW, 
+                              VIA686A_SYSCTL_TEMP, VALUE(2), 1 },
+    { SENSORS_VIA686A_TEMP_OVER, "temp1_over", SENSORS_VIA686A_TEMP,
+                              SENSORS_VIA686A_TEMP, SENSORS_MODE_RW, 
+                              VIA686A_SYSCTL_TEMP, VALUE(1), 1 },
+    { SENSORS_VIA686A_TEMP, "temp2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                         SENSORS_MODE_R, VIA686A_SYSCTL_TEMP, VALUE(3), 1 },
+    { SENSORS_VIA686A_TEMP_HYST, "temp2_hyst", SENSORS_VIA686A_TEMP2,
+                              SENSORS_VIA686A_TEMP2, SENSORS_MODE_RW, 
+                              VIA686A_SYSCTL_TEMP, VALUE(2), 1 },
+    { SENSORS_VIA686A_TEMP_OVER, "temp2_over", SENSORS_VIA686A_TEMP2,
+                              SENSORS_VIA686A_TEMP2, SENSORS_MODE_RW, 
+                              VIA686A_SYSCTL_TEMP, VALUE(1), 1 },
+    { SENSORS_VIA686A_TEMP, "temp3", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                         SENSORS_MODE_R, VIA686A_SYSCTL_TEMP, VALUE(3), 1 },
+    { SENSORS_VIA686A_TEMP_HYST, "temp3_hyst", SENSORS_VIA686A_TEMP3,
+                              SENSORS_VIA686A_TEMP3, SENSORS_MODE_RW, 
+                              VIA686A_SYSCTL_TEMP, VALUE(2), 1 },
+    { SENSORS_VIA686A_TEMP_OVER, "temp3_over", SENSORS_VIA686A_TEMP3,
+                              SENSORS_VIA686A_TEMP3, SENSORS_MODE_RW, 
+                              VIA686A_SYSCTL_TEMP, VALUE(1), 1 },
+    { SENSORS_VIA686A_FAN1_DIV, "fan1_div", SENSORS_VIA686A_FAN1, SENSORS_NO_MAPPING,
+                             SENSORS_MODE_RW, VIA686A_SYSCTL_FAN_DIV, VALUE(1), 
+                             0 },
+    { SENSORS_VIA686A_FAN2_DIV, "fan2_div", SENSORS_VIA686A_FAN2, SENSORS_NO_MAPPING,
+                             SENSORS_MODE_RW, VIA686A_SYSCTL_FAN_DIV, VALUE(2), 
+                             0 },
+    { SENSORS_VIA686A_ALARMS, "alarms", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, 
+                           SENSORS_MODE_R, VIA686A_SYSCTL_ALARMS, VALUE(1), 0 },
+    { 0 }
+  };
+
 static sensors_chip_feature ddcmon_features[] =
   {
@@ -1645 +1720 @@
                 /* Cheat on ADM1022 for now - no separate #defines */
  { SENSORS_ADM1022_PREFIX, thmc50_features },
+ { SENSORS_VIA686A_PREFIX, via686a_features },
  { SENSORS_DDCMON_PREFIX, ddcmon_features },
  { SENSORS_EEPROM_PREFIX, eeprom_features },

lm-sensors/trunk/lib/chips.h

@@ -725 +725 @@
 #define SENSORS_THMC50_DIE_CODE 90 /* R */
 
+/* SiS southbridge with integrated lm78 */
+
+#define SENSORS_VIA686A_PREFIX "via686a"
+
+#define SENSORS_VIA686A_IN0 1 /* R */
+#define SENSORS_VIA686A_IN1 2 /* R */
+#define SENSORS_VIA686A_IN2 3 /* R */
+#define SENSORS_VIA686A_IN3 4 /* R */
+#define SENSORS_VIA686A_IN4 5 /* R */
+#define SENSORS_VIA686A_IN0_MIN 11 /* RW */
+#define SENSORS_VIA686A_IN1_MIN 12 /* RW */
+#define SENSORS_VIA686A_IN2_MIN 13 /* RW */
+#define SENSORS_VIA686A_IN3_MIN 14 /* RW */
+#define SENSORS_VIA686A_IN4_MIN 15 /* RW */
+#define SENSORS_VIA686A_IN0_MAX 21 /* RW */
+#define SENSORS_VIA686A_IN1_MAX 22 /* RW */
+#define SENSORS_VIA686A_IN2_MAX 23 /* RW */
+#define SENSORS_VIA686A_IN3_MAX 24 /* RW */
+#define SENSORS_VIA686A_IN4_MAX 25 /* RW */
+#define SENSORS_VIA686A_FAN1 31 /* R */
+#define SENSORS_VIA686A_FAN2 32 /* R */
+#define SENSORS_VIA686A_FAN1_MIN 41 /* RW */
+#define SENSORS_VIA686A_FAN2_MIN 42 /* RW */
+#define SENSORS_VIA686A_TEMP 51 /* R */
+#define SENSORS_VIA686A_TEMP_HYST 52 /* RW */
+#define SENSORS_VIA686A_TEMP_OVER 53 /* RW */
+#define SENSORS_VIA686A_TEMP2 54 /* R */
+#define SENSORS_VIA686A_TEMP2_HYST 55 /* RW */
+#define SENSORS_VIA686A_TEMP2_OVER 56 /* RW */
+#define SENSORS_VIA686A_TEMP3 57 /* R */
+#define SENSORS_VIA686A_TEMP3_HYST 58 /* RW */
+#define SENSORS_VIA686A_TEMP3_OVER 59 /* RW */
+#define SENSORS_VIA686A_FAN1_DIV 71 /* RW */
+#define SENSORS_VIA686A_FAN2_DIV 72 /* RW */
+#define SENSORS_VIA686A_ALARMS 81 /* R */
+
+
 /* DDC Monitor */
 

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

@@ -419 +419 @@
     print_label(label,10);
     printf("Board temperature input (usually LM75 chips) %s\n",
-           alarms & SIS5595_ALARM_BTI?"ALARM":"     ");
-  }
-  free_the_label(&label);
+           alarms & SIS5595_ALARM_BTI ?"ALARM":"     ");
+  }
+  free_the_label(&label);
+
+}
+
+void print_via686a(const sensors_chip_name *name)
+{
+  char *label = NULL;
+  double cur,min,max,fdiv;
+  int alarms,valid;
+
+  if (!sensors_get_feature(*name,SENSORS_VIA686A_ALARMS,&cur)) 
+    alarms = cur + 0.5;
+  else {
+    printf("ERROR: Can't get alarm data!\n");
+    alarms = 0;
+  }
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_VIA686A_IN0,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_IN0,&cur) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_IN0_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_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&VIA686A_ALARM_IN0?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN0 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_VIA686A_IN1,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_IN1,&cur) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_IN1_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_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&VIA686A_ALARM_IN1?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN1 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_VIA686A_IN2,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_IN2,&cur) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_IN2_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_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&VIA686A_ALARM_IN2?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN2 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_VIA686A_IN3,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_IN3,&cur) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_IN3_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_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&VIA686A_ALARM_IN3?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN3 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_VIA686A_IN4,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_IN4,&cur) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_IN4_MIN,&min) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_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&VIA686A_ALARM_IN4?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get IN4 data!\n");
+  free_the_label(&label);
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_VIA686A_FAN1,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_FAN1,&cur) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_FAN1_DIV,&fdiv) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_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&VIA686A_ALARM_FAN1?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get FAN1 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_VIA686A_FAN2,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_FAN2,&cur) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_FAN2_DIV,&fdiv) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_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&VIA686A_ALARM_FAN2?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get FAN2 data!\n");
+  free_the_label(&label);
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_VIA686A_TEMP,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_TEMP,&cur) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_TEMP_HYST,&min) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_TEMP_OVER,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+3.0f C     (limit = %+3.0f C,  hysteresis = %+3.0f C) %s\n",
+             cur,max,min, alarms&VIA686A_ALARM_TEMP?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get TEMP data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_VIA686A_TEMP2,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_TEMP2,&cur) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_TEMP2_HYST,&min) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_TEMP2_OVER,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+3.0f C     (limit = %+3.0f C,  hysteresis = %+3.0f C) %s\n",
+             cur,max,min, alarms&VIA686A_ALARM_TEMP2?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get TEMP2 data!\n");
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_VIA686A_TEMP3,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_TEMP3,&cur) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_TEMP3_HYST,&min) &&
+      !sensors_get_feature(*name,SENSORS_VIA686A_TEMP3_OVER,&max)) {
+    if (valid) {
+      print_label(label,10);
+      printf("%+3.0f C     (limit = %+3.0f C,  hysteresis = %+3.0f C) %s\n",
+             cur,max,min, alarms&VIA686A_ALARM_TEMP3?"ALARM":"");
+    }
+  } else
+    printf("ERROR: Can't get TEMP3 data!\n");
+  free_the_label(&label);
+
 }
 

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

@@ -30 +30 @@
 extern void print_lm78(const sensors_chip_name *name);
 extern void print_sis5595(const sensors_chip_name *name);
+extern void print_via686a(const sensors_chip_name *name);
 extern void print_gl518(const sensors_chip_name *name);
 extern void print_lm80(const sensors_chip_name *name);

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

@@ -263 +263 @@
   else if (!strcmp(name.prefix,"sis5595"))
     print_sis5595(&name);
+  else if (!strcmp(name.prefix,"via686a"))
+    print_via686a(&name);
   else if (!strcmp(name.prefix,"lm80"))
     print_lm80(&name);