Changeset 5521

Timestamp:

12/05/08 10:36:13 (4 years ago)

Author:

khali

Message:

Move IPMI interface detection to its own section. IPMI is really different
from legacy ISA monitoring chips.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

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

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -43 +43 @@
                   Gather DMI data and print it at start-up
                   Always probe the SMBus on Asus and Tyan boards
+                  Move IPMI interface detection to its own section
   sensors-detect-stat.pl: Delete (functionality merged into sensors-detect)
 

lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect

@@ -40 +40 @@
 
 use constant NO_CACHE => 1;
-use vars qw(@pci_adapters @chip_ids @non_hwmon_chip_ids $i2c_addresses_to_scan
-            $revision @i2c_byte_cache);
+use vars qw(@pci_adapters @chip_ids @ipmi_ifs @non_hwmon_chip_ids
+            $i2c_addresses_to_scan $revision @i2c_byte_cache);
 
 $revision = '$Revision$ ($Date$)';
@@ -1071 +1071 @@
                 i2c_addrs => [0x0b],
                 i2c_detect => sub { smartbatt_detect(@_); },
-        }, {
+        }
+);
+
+# IPMI interfaces have their own array now
+@ipmi_ifs = (
+        {
                 name => "IPMI BMC KCS",
                 driver => "ipmisensors",
@@ -2979 +2984 @@
 sub scan_isa_bus
 {
-        my $ipmi_only = shift;
+        my $chip_list_ref = shift;
         my ($chip, $addr, $conf);
 
         $| = 1;
-        foreach $chip (@chip_ids) {
+        foreach $chip (@{$chip_list_ref}) {
                 next if not exists $chip->{isa_addrs} or not exists $chip->{isa_detect};
-                next if $ipmi_only && $chip->{name} !~ m/\bIPMI\b/;
                 foreach $addr (@{$chip->{isa_addrs}}) {
                         printf("\%-60s", sprintf("Probing for `\%s'\ at 0x\%x... ",
@@ -5170 +5174 @@
                 print "\n";
 
+                print "Some systems (mainly servers) implement IPMI, a set of common interfaces\n".
+                      "through which system health data may be retrieved, amongst other things.\n".
+                      "We have to read from arbitrary I/O ports to probe for such interfaces.\n".
+                      "This is normally safe. Do you want to scan for IPMI interfaces?\n".
+                      "(YES/no): ";
+                unless (<STDIN> =~ /^\s*n/i) {
+                        initialize_ioports();
+                        scan_isa_bus(\@ipmi_ifs);
+                        close_ioports();
+                }
+                print "\n";
+
                 printf "Some hardware monitoring chips are accessible through the ISA I/O ports.\n".
                        "We have to write to arbitrary I/O ports to probe them. This is usually\n".
                        "safe though. Yes, you do have ISA I/O ports even if you do not have any\n".
                        "ISA slots! Do you want to scan the ISA I/O ports? (\%s): ",
-                       $superio_features ? "yes/no/IPMI ONLY" : "YES/no/ipmi only";
+                       $superio_features ? "yes/NO" : "YES/no";
                 $input = <STDIN>;
-                unless ($input =~ /^\s*n/i) {
-                        my $ipmi_only = ($superio_features && $input !~ /^\s*y/i)
-                                     || (!$superio_features && $input =~ /^\s*i/i);
+                unless ($input =~ /^\s*n/i
+                     || ($superio_features && $input !~ /^\s*y/i)) {
                         initialize_ioports();
-                        scan_isa_bus($ipmi_only);
+                        scan_isa_bus(\@chip_ids);
                         close_ioports();
                 }