Changeset 5681

Timestamp:

03/12/09 17:44:27 (4 years ago)

Author:

khali

Message:

Use dmidecode to find IPMI interfaces if available. This is required
if non-standard address or register width are used. And anyway it is
always better to avoid access to random I/O ports.

Location:

lm-sensors/trunk

Files:

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

lm-sensors/trunk/CHANGES

@@ -6 +6 @@
                   Display Super-I/O address even if LD is disabled
                   Differentiate between PC8374L and WPCD377I
+                  Use dmidecode to find IPMI interfaces if available
 
 3.1.0 "Happy Birthday Lina" (2009-02-28)

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

@@ -5002 +5002 @@
 
         return 8;
+}
+
+########
+# IPMI #
+########
+
+# Returns: number of IPMI interfaces found
+sub ipmi_from_smbios
+{
+        my ($version, $if, @ipmi_if);
+
+        if (open(local *DMIDECODE, "dmidecode --version 2>/dev/null |")) {
+                $version = <DMIDECODE>;
+                close(DMIDECODE);
+                chomp $version if defined $version;
+        }
+
+        if (!defined $version
+         || !($version =~ m/^(\d+).(\d+)$/)
+         || !(($1 == 2 && $2 >= 7) || $1 > 2)) {
+                print "# DMI data unavailable, please consider installing dmidecode 2.7\n".
+                      "# or later for better results.\n";
+                return;
+        }
+
+        # Parse the output of dmidecode into an array of IPMI interfaces.
+        # Each entry is a hash with the following keys: type and addr.
+        $if = -1;
+        open(local *DMIDECODE, "dmidecode -t 38 2>/dev/null |") or return 0;
+        while (<DMIDECODE>) {
+                if (m/^IPMI Device Information/) {
+                        $if++;
+                        next;
+                }
+                next unless $if >= 0;
+
+                if (m/^\tInterface Type: (.*)$/) {
+                        $ipmi_if[$if]->{type} = "IPMI BMC $1";
+                        $ipmi_if[$if]->{type} =~ s/ \(.*//;
+                        next;
+                }
+                if (m/^\tBase Address: (0x[0-9A-Fa-f]+) \(I\/O\)$/) {
+                        $ipmi_if[$if]->{addr} = oct($1);
+                        next;
+                }
+        }
+        close(DMIDECODE);
+
+        foreach $if (@ipmi_if) {
+                if (exists $if->{addr}) {
+                        printf("\%-60s", sprintf("Found `\%s' at 0x\%x... ",
+                                                 $if->{type}, $if->{addr}));
+                } else {
+                        printf("\%-60s", sprintf("Found `\%s'... ",
+                                                 $if->{type}));
+                }
+                print "Success!\n".
+                      "    (confidence 8, driver `ipmisensors')\n";
+                my $new_hash = {
+                        conf => 8,
+                        isa_addr => $if->{addr} || 0,
+                        chipname => $if->{type},
+                };
+                add_isa_to_chips_detected("ipmisensors", $new_hash);
+        }
+
+        return scalar @ipmi_if;
 }
 
@@ -5462 +5529 @@
                         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): ";
+                              "We first try to get the information from SMBIOS. If we don't find it\n".
+                              "there, we have to read from arbitrary I/O ports to probe for such\n".
+                              "interfaces. This is normally safe. Do you want to scan for IPMI\n".
+                              "interfaces? (YES/no): ";
                         unless (<STDIN> =~ /^\s*n/i) {
-                                initialize_ioports();
-                                scan_isa_bus(\@ipmi_ifs);
-                                close_ioports();
+                                if (!ipmi_from_smbios()) {
+                                        initialize_ioports();
+                                        scan_isa_bus(\@ipmi_ifs);
+                                        close_ioports();
+                                }
                         }
                         print "\n";