Changeset 1179

Timestamp:

09/18/01 17:20:15 (7 years ago)

Author:

mds

Message:

Fujitsu Poseidon support from Hermann Jung <hej@odn.de>

Files:

• lm-sensors/trunk/CONTRIBUTORS (modified) (1 diff)
• lm-sensors/trunk/README (modified) (1 diff)
• lm-sensors/trunk/doc/chips/fscpos (added)
• lm-sensors/trunk/etc/sensors.conf.eg (modified) (1 diff)
• lm-sensors/trunk/kernel/chips/Module.mk (modified) (1 diff)
• lm-sensors/trunk/kernel/chips/fscpos.c (added)
• lm-sensors/trunk/kernel/include/sensors.h (modified) (1 diff)
• lm-sensors/trunk/lib/chips.c (modified) (2 diffs)
• lm-sensors/trunk/lib/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/detect/sensors-detect (modified) (3 diffs)
• 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/CONTRIBUTORS

@@ -63 +63 @@
-* Christophe Gauthron <chrisg@0-in.com>
-  Author of the IT87 driver.
+* Hermann Jung <hej@odn.de>
+  Author of the fscpos driver.

lm-sensors/trunk/README

@@ -51 +51 @@
-  Dallas Semiconductor DS75, DS1621, DS1625, DS1775, and DS1780
-  Hewlett Packard Maxilife (several revisions including '99 NBA)
+  Fujitsu Siemens Poseidon Chip
-  Genesys Logic GL518SM (rev 00, 80), GL520SM, GL523SM
-  Intel Xeon processor embedded sensors

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

@@ -1118 +1118 @@
-#    ignore fan2
-#    ignore fan3
+
+#
+#    values for the fujitsu siemens poseidon chip
+#
+# Temperature
+
+    label temp1       "Temp1/CPU"
+    label temp2       "Temp2/MB"
+    label temp3       "Temp2/AUX"
+
+# Fans
+
+    label  fan1       "Fan1"
+    ignore  fan2     
+    ignore  fan3    
+
+# Voltage
+ 
+    label volt12      "12 V"
+    label volt5       " 5 V"
+    label voltbatt    " 3.3 V"

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

@@ -27 +27 @@
-KERNELCHIPSTARGETS :=  \
-                      $(MODULE_DIR)/adm1024.o \
+                      $(MODULE_DIR)/fscpos.o \
-                      $(MODULE_DIR)/it87.o \
-                      $(MODULE_DIR)/maxilife.o \

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

@@ -507 +507 @@
-#define IT87_ALARM_TEMP3 0x0004
-
+#define FSCPOS_SYSCTL_VOLT0    1000       /* 12 volt supply */
+#define FSCPOS_SYSCTL_VOLT1    1001       /* 5 volt supply */
+#define FSCPOS_SYSCTL_VOLT2    1002       /* batterie voltage*/
+#define FSCPOS_SYSCTL_FAN0     1101       /* state, min, ripple, actual value fan 0 */
+#define FSCPOS_SYSCTL_FAN1     1102       /* state, min, ripple, actual value fan 1 */
+#define FSCPOS_SYSCTL_FAN2     1103       /* state, min, ripple, actual value fan 2 */
+#define FSCPOS_SYSCTL_TEMP0    1201       /* state and value of sensor 0, cpu die */
+#define FSCPOS_SYSCTL_TEMP1    1202       /* state and value of sensor 1, motherboard */
+#define FSCPOS_SYSCTL_TEMP2    1203       /* state and value of sensor 2, chassis */
+#define FSCPOS_SYSCTL_REV     2000        /* Revision */
+#define FSCPOS_SYSCTL_EVENT   2001        /* global event status */
+#define FSCPOS_SYSCTL_CONTROL 2002        /* global control byte */
+#define FSCPOS_SYSCTL_WDOG     2003       /* state, min, ripple, actual value fan 2 */
+
-#endif                          /* def SENSORS_SENSORS_H */

lm-sensors/trunk/lib/chips.c

@@ -2237 +2237 @@
-  };
-
+static sensors_chip_feature fscpos_features[] =
+  {
+    { SENSORS_FSCPOS_REV, "rev", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, FSCPOS_SYSCTL_REV, VALUE(1), 0 },
+    { SENSORS_FSCPOS_EVENT, "event", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, FSCPOS_SYSCTL_EVENT, VALUE(1), 0 },
+    { SENSORS_FSCPOS_CONTROL, "control", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_RW, FSCPOS_SYSCTL_CONTROL, VALUE(1), 0 },
+    { SENSORS_FSCPOS_VOLTAGE1, "volt12", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, FSCPOS_SYSCTL_VOLT0, VALUE(1), 2 },
+    { SENSORS_FSCPOS_VOLTAGE2, "volt5", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, FSCPOS_SYSCTL_VOLT1, VALUE(1), 2 },
+    { SENSORS_FSCPOS_VOLTAGE3, "voltbatt", SENSORS_NO_MAPPING,
+                        SENSORS_NO_MAPPING, SENSORS_MODE_R, 
+                        FSCPOS_SYSCTL_VOLT2, VALUE(1), 2 },
+    { SENSORS_FSCPOS_TEMP1, "temp1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, FSCPOS_SYSCTL_TEMP0, VALUE(2), 0 },
+    { SENSORS_FSCPOS_TEMP2, "temp2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, FSCPOS_SYSCTL_TEMP1, VALUE(2), 0 },
+    { SENSORS_FSCPOS_TEMP3, "temp3", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, FSCPOS_SYSCTL_TEMP2, VALUE(2), 0 },
+    { SENSORS_FSCPOS_TEMP1_STATE, "temp1_state", SENSORS_FSCPOS_TEMP1,
+                        SENSORS_FSCPOS_TEMP1, SENSORS_MODE_RW, 
+                        FSCPOS_SYSCTL_TEMP0, VALUE(1), 0 },
+    { SENSORS_FSCPOS_TEMP2_STATE, "temp2_state", SENSORS_FSCPOS_TEMP2, 
+                        SENSORS_FSCPOS_TEMP2, SENSORS_MODE_RW, 
+                        FSCPOS_SYSCTL_TEMP1, VALUE(1), 0 },
+    { SENSORS_FSCPOS_TEMP3_STATE, "temp3_state", SENSORS_FSCPOS_TEMP3, 
+                        SENSORS_FSCPOS_TEMP3, SENSORS_MODE_RW, 
+                        FSCPOS_SYSCTL_TEMP2, VALUE(1), 0 },
+    { SENSORS_FSCPOS_FAN1, "fan1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, FSCPOS_SYSCTL_FAN0, VALUE(4), 0 },
+    { SENSORS_FSCPOS_FAN2, "fan2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, FSCPOS_SYSCTL_FAN1, VALUE(4), 0 },
+    { SENSORS_FSCPOS_FAN3, "fan3", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                        SENSORS_MODE_R, FSCPOS_SYSCTL_FAN2, VALUE(4), 0 },
+    { SENSORS_FSCPOS_FAN1_MIN, "fan1_min", SENSORS_FSCPOS_FAN1, 
+                        SENSORS_FSCPOS_FAN1, SENSORS_MODE_RW, 
+                        FSCPOS_SYSCTL_FAN0, VALUE(2), 0 },
+    { SENSORS_FSCPOS_FAN2_MIN, "fan2_min", SENSORS_FSCPOS_FAN2, 
+                        SENSORS_FSCPOS_FAN2, SENSORS_MODE_RW, 
+                        FSCPOS_SYSCTL_FAN1, VALUE(2), 0 },
+    { SENSORS_FSCPOS_FAN1_STATE, "fan1_state", SENSORS_FSCPOS_FAN1, 
+                        SENSORS_FSCPOS_FAN1, SENSORS_MODE_RW, 
+                        FSCPOS_SYSCTL_FAN0, VALUE(1), 0 },
+    { SENSORS_FSCPOS_FAN2_STATE, "fan2_state", SENSORS_FSCPOS_FAN2, 
+                        SENSORS_FSCPOS_FAN2, SENSORS_MODE_RW, 
+                        FSCPOS_SYSCTL_FAN1, VALUE(1), 0 },
+    { SENSORS_FSCPOS_FAN3_STATE, "fan3_state", SENSORS_FSCPOS_FAN3, 
+                        SENSORS_FSCPOS_FAN3, SENSORS_MODE_RW, 
+                        FSCPOS_SYSCTL_FAN2, VALUE(1), 0 },
+    { SENSORS_FSCPOS_FAN1_RIPPLE, "fan1_ripple", SENSORS_FSCPOS_FAN1, 
+                        SENSORS_FSCPOS_FAN1, SENSORS_MODE_RW, 
+                        FSCPOS_SYSCTL_FAN0, VALUE(3), 0 },
+    { SENSORS_FSCPOS_FAN2_RIPPLE, "fan2_ripple", SENSORS_FSCPOS_FAN2, 
+                        SENSORS_FSCPOS_FAN2, SENSORS_MODE_RW, 
+                        FSCPOS_SYSCTL_FAN1, VALUE(3), 0 },
+    { SENSORS_FSCPOS_FAN3_RIPPLE, "fan3_ripple", SENSORS_FSCPOS_FAN3, 
+                        SENSORS_FSCPOS_FAN3, SENSORS_MODE_RW, 
+                        FSCPOS_SYSCTL_FAN2, VALUE(3), 0 },
+    { SENSORS_FSCPOS_WDOG_PRESET, "wdog_preset", SENSORS_NO_MAPPING, 
+                        SENSORS_NO_MAPPING, SENSORS_MODE_RW, 
+                        FSCPOS_SYSCTL_WDOG, VALUE(1), 0 },
+    { SENSORS_FSCPOS_WDOG_STATE, "wdog_state", SENSORS_FSCPOS_WDOG_PRESET, 
+                        SENSORS_FSCPOS_WDOG_PRESET, SENSORS_MODE_RW, 
+                        FSCPOS_SYSCTL_WDOG, VALUE(2), 0 },
+    { SENSORS_FSCPOS_WDOG_CONTROL, "wdog_control", SENSORS_FSCPOS_WDOG_PRESET, 
+                        SENSORS_FSCPOS_WDOG_PRESET, SENSORS_MODE_RW, 
+                        FSCPOS_SYSCTL_WDOG, VALUE(3), 0 },
+    { 0 }
+  };
-
-
@@ -2286 +2357 @@
- { SENSORS_ADM1024_PREFIX, adm1024_features },
- { SENSORS_IT87_PREFIX, it87_features },
+ { SENSORS_FSCPOS_PREFIX, fscpos_features },
- { 0 }
-};

lm-sensors/trunk/lib/chips.h

@@ -1022 +1022 @@
-#define SENSORS_IT87_ALARMS_TEMP 83 /* R */
-
+
+/* fsc poseidon chip */
+
+#define SENSORS_FSCPOS_PREFIX "fscpos"
+
+#define SENSORS_FSCPOS_REV 1 /* R */
+#define SENSORS_FSCPOS_EVENT 2 /* R */
+#define SENSORS_FSCPOS_CONTROL 3 /* RW */
+#define SENSORS_FSCPOS_FAN1 4 /* R */
+#define SENSORS_FSCPOS_FAN2 5 /* R */
+#define SENSORS_FSCPOS_FAN3 6 /* R */
+#define SENSORS_FSCPOS_FAN1_MIN 7 /* RW */
+#define SENSORS_FSCPOS_FAN2_MIN 8 /* RW */
+#define SENSORS_FSCPOS_FAN3_MIN 9 /* RW */
+#define SENSORS_FSCPOS_FAN1_STATE 10 /* RW */
+#define SENSORS_FSCPOS_FAN2_STATE 11 /* RW */
+#define SENSORS_FSCPOS_FAN3_STATE 12 /* RW */
+#define SENSORS_FSCPOS_FAN1_RIPPLE 13 /* RW */
+#define SENSORS_FSCPOS_FAN2_RIPPLE 14 /* RW */
+#define SENSORS_FSCPOS_FAN3_RIPPLE 15 /* RW */
+#define SENSORS_FSCPOS_TEMP1 16 /* R */
+#define SENSORS_FSCPOS_TEMP2 17 /* R */
+#define SENSORS_FSCPOS_TEMP3 18 /* R */
+#define SENSORS_FSCPOS_TEMP1_STATE 19 /* RW */
+#define SENSORS_FSCPOS_TEMP2_STATE 20 /* RW */
+#define SENSORS_FSCPOS_TEMP3_STATE 21 /* RW */
+#define SENSORS_FSCPOS_VOLTAGE1 22 /* R */
+#define SENSORS_FSCPOS_VOLTAGE2 23 /* R */
+#define SENSORS_FSCPOS_VOLTAGE3 24 /* R */
+#define SENSORS_FSCPOS_WDOG_PRESET 25/* RW */
+#define SENSORS_FSCPOS_WDOG_STATE 26/* RW */
+#define SENSORS_FSCPOS_WDOG_CONTROL 27/* RW */
+
+
+
-#endif /* def LIB_SENSORS_CHIPS_H */

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

@@ -446 +446 @@
-            via686a_isa_detect adm1022_detect ltc1710_detect gl525sm_detect
-            lm87_detect ite_detect ite_isa_detect ite_alias_detect
-
+ fscpos_detect
-
-# This is a list of all recognized chips. 
@@ -719 +719 @@
-       i2c_addrs => [0x50],
-       i2c_detect => sub { ddcmonitor_detect @_ },
+     },
+     {
+       name => "FSC poseidon chip",
+       driver => "fscpos",
+       i2c_addrs => [0x73],
+       i2c_detect => sub { fscpos_detect @_ },
-     },
-);
@@ -2198 +2204 @@
-}
-
+# $_[0]: A reference to the file descriptor to access this chip.
+#        We may assume an i2c_set_slave_addr was already done.
+# $_[1]: Address
+# Returns: undef if not detected, (2) if detected.
+# Registers used:
+#   0x00-0x02: Identification
+sub fscpos_detect
+{
+  my ($file,$addr) = @_;
+  # check the first 3 registers
+  if (i2c_smbus_read_byte_data($file,0x00) != 0x50) {
+        return (0);
+  }
+  if (i2c_smbus_read_byte_data($file,0x01) != 0x45) {
+        return (0);
+  }
+  if (i2c_smbus_read_byte_data($file,0x02) != 0x47) {
+        return (0);
+  }
+  # no poseidon chip
+  return (1);
+}
+
-################
-# MAIN PROGRAM #

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

@@ -2648 +2648 @@
-}
-
+void print_fscpos(const sensors_chip_name *name)
+{
+  char *label = NULL;
+  double voltage, temp,state,fan,min_rpm;
+ int valid;
+
+  printf("Chip: fujitsu siemens poseidon\n");
+  if (!sensors_get_label_and_valid(*name,SENSORS_FSCPOS_TEMP1,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_TEMP1,&temp) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_TEMP1_STATE,&state)) { 
+    if (valid) {
+      print_label(label,10);
+        if((int) state & 0x01)
+              printf("\t%+6.2f C \n",temp);
+        else
+                printf("\tfailed\n");
+    }
+  }
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_FSCPOS_TEMP2,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_TEMP2,&temp) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_TEMP2_STATE,&state)) { 
+    if (valid) {
+      print_label(label,10);
+        if((int) state & 0x01)
+              printf("\t%+6.2f C \n",temp);
+        else
+                printf("\tfailed\n");
+    }
+  }
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_FSCPOS_TEMP3,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_TEMP3,&temp) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_TEMP3_STATE,&state)) { 
+    if (valid) {
+      print_label(label,10);
+        if((int) state & 0x01)
+              printf("\t%+6.2f C \n",temp);
+        else
+                printf("\tfailed\n");
+    }
+  }
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_FSCPOS_FAN1,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_FAN1,&fan) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_FAN1_MIN,&min_rpm) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_FAN1_STATE,&state)) { 
+    if (valid) {
+      print_label(label,10);
+        if((int) state & 0x02)
+                printf("\tfaulty\n");
+        else if (fan < min_rpm)
+                printf("\t%6.0f RPM (not present or faulty)\n",fan);
+        else
+              printf("\t%+6.0f RPM \n",fan);
+    }
+  }
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_FSCPOS_FAN2,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_FAN2,&fan) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_FAN2_MIN,&min_rpm) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_FAN2_STATE,&state)) { 
+    if (valid) {
+      print_label(label,10);
+        if((int) state & 0x02)
+                printf("\tfaulty\n");
+        else if (fan < min_rpm)
+                printf("\t%6.0f RPM (not present or faulty)\n",fan);
+        else
+              printf("\t%+6.0f RPM \n",fan);
+    }
+  }
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_FSCPOS_FAN3,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_FAN3,&fan) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_FAN3_STATE,&state)) { 
+    if (valid) {
+      print_label(label,10);
+        if((int) state & 0x02)
+                printf("\tfaulty\n");
+        else
+              printf("\t%+6.0f RPM \n",fan);
+    }
+  }
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_FSCPOS_VOLTAGE1,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_VOLTAGE1,&voltage)) {
+    if (valid) {
+      print_label(label,10);
+      printf("\t%+6.2f V\n",voltage);
+    }
+  }
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_FSCPOS_VOLTAGE2,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_VOLTAGE2,&voltage)) {
+    if (valid) {
+      print_label(label,10);
+      printf("\t%+6.2f V\n",voltage);
+    }
+  }
+  free_the_label(&label);
+  if (!sensors_get_label_and_valid(*name,SENSORS_FSCPOS_VOLTAGE3,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_FSCPOS_VOLTAGE3,&voltage)) {
+    if (valid) {
+      print_label(label,10);
+      printf("\t%+6.2f V\n",voltage);
+    }
+  }
+  free_the_label(&label);
+}
-
-void print_unknown_chip(const sensors_chip_name *name)

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

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

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

@@ -334 +334 @@
-  else if (!strcmp(name.prefix,"eeprom"))
-    print_eeprom(&name);
+  else if (!strcmp(name.prefix,"fscpos"))
+    print_fscpos(&name);
-  else
-    print_unknown_chip(&name);