Changeset 5503

Timestamp:

12/02/08 22:42:35 (4 years ago)

Author:

khali

Message:

Skip ISA detection by default if a Super I/O was found. In general,
systems have a Super-I/O chip or an ISA chip, not both.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

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

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

@@ -36 +36 @@
                   Probe chip types from safest to more risky (#2322)
                   Add an option to skip ISA probes except IPMI
+                  Skip ISA detection by default if a Super I/O was found (#2322)
 
 3.0.3 (2008-09-28)

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

@@ -2865 +2865 @@
 }
 
+# Returns: 1 if device added to chips_detected, undef if not
 sub probe_superio
 {
@@ -2915 +2916 @@
         };
         add_isa_to_chips_detected($chip->{driver}, $new_hash);
+        return 1;
 }
 
@@ -2945 +2947 @@
 }
 
+# Returns: number of device added to chips_detected (0 or 1)
 sub scan_superio
 {
         my ($addrreg, $datareg) = @_;
         my ($val, $found);
+        my $added = 0;
 
         printf("Probing for Super-I/O at 0x\%x/0x\%x\n", $addrreg, $datareg);
@@ -2986 +2990 @@
                          || ($chip->{devid} <= 0xff &&
                              ($val >> 8) == $chip->{devid})) {
-                                probe_superio($addrreg, $datareg, $chip);
+                                $added = 1 if probe_superio($addrreg, $datareg, $chip);
                                 $found++;
                         }
@@ -3002 +3006 @@
         }
         $| = 0;
+        return $added;
 }
 
@@ -4870 +4875 @@
 sub main
 {
-        my ($input);
+        my ($input, $superio_found);
 
         # We won't go very far if not root
@@ -4918 +4923 @@
                 unless (<STDIN> =~ /^\s*n/i) {
                         initialize_ioports();
-                        scan_superio(0x2e, 0x2f);
-                        scan_superio(0x4e, 0x4f);
+                        $superio_found += scan_superio(0x2e, 0x2f);
+                        $superio_found += scan_superio(0x4e, 0x4f);
                         close_ioports();
                 }
                 print "\n";
 
-                print "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? (YES/no/ipmi only): ";
+                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_found ? "yes/no/IPMI ONLY" : "YES/no/ipmi only";
                 $input = <STDIN>;
                 unless ($input =~ /^\s*n/i) {
+                        my $ipmi_only = ($superio_found && $input !~ /^\s*y/i)
+                                     || (!$superio_found && $input =~ /^\s*i/i);
                         initialize_ioports();
-                        scan_isa_bus($input =~ /^\s*i/i);
+                        scan_isa_bus($ipmi_only);
                         close_ioports();
                 }