Changeset 4144

Timestamp:

09/05/06 14:09:30 (7 years ago)

Author:

khali

Message:

sensors-detect: Add generic Super-I/O logical device detection.
For families where it makes sense (ITE, Winbond, Fintek), when we have
an unknown Super-I/O, we scan all logical devices in search of one
with the typical address for hardware monitoring (0x290). If we find
it, we let the user know there are probably sensors in the chip.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/detect/sensors-detect (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -84 +84 @@
                           Use sysfs for PCI device enumeration
                           Add generic PCI SMBus adapter detection
+                          Add generic Super-I/O logical device detection
 
 

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

@@ -1472 +1472 @@
 #      capabilities (listing such chips here removes the need of manual
 #      lookup when people report them).
-#  enter: The password sequence to write to the address register
 #  devid: The device ID(s) we have to match (base device)
 #  devid_mask (optional): Bitmask to apply before checking the device ID
 #  logdev: The logical device containing the sensors
-#  exit (optional): Sequence to write to the address register to exit config
-#      mode. If not provided, a default reset operation is performed.
 #  alias_detect (optional): For chips which can be both on the ISA and the
 #      I2C bus, a function which detectes whether two entries are the same.
 #      The function should take three parameters: The ISA address, the
 #      I2C bus number, and the I2C address.
+# Entries are grouped by family. Each family entry has the following fields:
+#  family: The family name
+#  guess (optional): Typical logical device address. This lets us do
+#      generic probing if we fail to recognize the chip.
+#  enter: The password sequence to write to the address register
+#  chips: Array of chips
 @superio_ids = (
   {
     family => "ITE",
+    guess => 0x290,
     enter =>
     {
@@ -1717 +1721 @@
   {
     family => "VIA/Winbond/Fintek",
+    guess => 0x290,
     enter =>
     {
@@ -2832 +2837 @@
 }
 
+# Guess if an unknown Super-I/O chip has sensors
+sub guess_superio_ld($$$)
+{
+  my ($addrreg, $datareg, $typical_addr) = @_;
+  my ($oldldn, $ldn, $addr);
+
+  # Save logical device number
+  outb($addrreg, $superio{logdevreg});
+  $oldldn = inb($datareg);
+
+  for ($ldn = 0; $ldn < 16; $ldn++) {
+    # Select logical device
+    outb($addrreg, $superio{logdevreg});
+    outb($datareg, $ldn);
+
+    # Read base I/O address
+    outb($addrreg, $superio{basereg});
+    $addr = inb($datareg) << 8;
+    outb($addrreg, $superio{basereg} + 1);
+    $addr |= inb($datareg);
+    next unless ($addr & 0xfff8) == $typical_addr;
+
+    printf "    (logical device \%X has address 0x\%x, could be sensors)\n",
+           $ldn, $addr;
+    last;
+  }
+
+  # Be nice, restore original logical device
+  outb($addrreg, $superio{logdevreg});
+  outb($datareg, $oldldn);
+}
+
 sub probe_superio($$$)
 {
@@ -2921 +2958 @@
     }
 
-    printf("  Found unknown chip with ID 0x%04x\n", $val)
-        unless $found;
+    if (!$found) {
+      printf("Found unknown chip with ID 0x%04x\n", $val);
+      # Guess if a logical device could correspond to sensors
+      guess_superio_ld($addrreg, $datareg, $family->{guess})
+        if defined $family->{guess};
+    }
+
     exit_superio($addrreg, $datareg);
   }