Changeset 4434

Timestamp:

06/08/07 16:39:06 (6 years ago)

Author:

khali

Message:

Replace all references to bmcsensors and i2c-ipmi for kernel 2.6 with
ipmisensors and ipmi-si in sensors-detect. Original patch from Juerg
Haefliger.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

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

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

@@ -34 +34 @@
                           Add Maxim MAX6680/MAX6681 detection
                           Add IT8726F detection
+                          Fix IPMI support for 2.6 kernels
 
 

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

@@ -1514 +1514 @@
      },
      {
-       name => "IPMI BMC KCS",
-       driver => "bmcsensors",
-       isa_addrs => [ 0x0ca0 ],
-       isa_detect => sub { ipmi_kcs_detect(@_); },
-     },
-     {
-       name => "IPMI BMC SMIC",
-       driver => "bmcsensors",
-       isa_addrs => [ 0x0ca8 ],
-       isa_detect => sub { ipmi_smic_detect(@_); },
-     },
-     {
        name => "Smart Battery Charger",
        driver => "to-be-written",
@@ -1547 +1535 @@
 # Special case chip information goes here and would be included in
 # the chip_special_cases routine below
-use vars qw($chip_kern24_w83791d $chip_kern26_w83791d);
-$chip_kern24_w83791d = {
-        name => "Winbond W83791D",
-        driver => "w83781d",
-        i2c_addrs => [0x2c..0x2f],
-        i2c_detect => sub { w83781d_detect(7, @_); },
-};
-
-$chip_kern26_w83791d = {
-        name => "Winbond W83791D",
-        driver => "w83791d",
-        i2c_addrs => [0x2c..0x2f],
-        i2c_detect => sub { w83781d_detect(7, @_); },
-};
+use vars qw(@chip_kern24_ids @chip_kern26_ids);
+@chip_kern24_ids = (
+     {
+       name => "Winbond W83791D",
+       driver => "w83781d",
+       i2c_addrs => [0x2c..0x2f],
+       i2c_detect => sub { w83781d_detect(7, @_); },
+     },
+     {
+       name => "IPMI BMC KCS",
+       driver => "bmcsensors",
+       isa_addrs => [0x0ca0],
+       isa_detect => sub { ipmi_kcs_detect(@_); },
+     },
+     {
+       name => "IPMI BMC SMIC",
+       driver => "bmcsensors",
+       isa_addrs => [0x0ca8],
+       isa_detect => sub { ipmi_smic_detect(@_); },
+     },
+);
+
+@chip_kern26_ids = (
+     {
+       name => "Winbond W83791D",
+       driver => "w83791d",
+       i2c_addrs => [0x2c..0x2f],
+       i2c_detect => sub { w83781d_detect(7, @_); },
+     },
+     {
+       name => "IPMI BMC KCS",
+       driver => "ipmisensors",
+       isa_addrs => [0x0ca0],
+       isa_detect => sub { ipmi_kcs_detect(@_); },
+     },
+     {
+       name => "IPMI BMC SMIC",
+       driver => "ipmisensors",
+       isa_addrs => [0x0ca8],
+       isa_detect => sub { ipmi_smic_detect(@_); },
+     },
+);
 
 # This is a list of all recognized superio chips. 
@@ -3258 +3274 @@
         # chip_ids detection list
         if (kernel_version_at_least(2, 6, 0)) {
-                push @chip_ids, $chip_kern26_w83791d;
+                push @chip_ids, @chip_kern26_ids;
         } else {
-                push @chip_ids, $chip_kern24_w83791d;
+                push @chip_ids, @chip_kern24_ids;
         }
 }
@@ -5410 +5426 @@
 
   my ($chip,$detection,$nr,$i,@optionlist,@probelist,$driver,$isa,$adap);
-  my $bmcsensors = 0;
+  my $ipmi = 0;
   my @adapters;
   my $modprobes = "";
@@ -5450 +5466 @@
            $isa=1;
       }
-      if ($chip->{driver} eq "bmcsensors") {
-           $bmcsensors=1;
+      if ($chip->{driver} eq "bmcsensors" || 
+          $chip->{driver} eq "ipmisensors") {
+           $ipmi = 1;
       }
     }
@@ -5476 +5493 @@
   # and will soon be gone.
   $modprobes .= "modprobe i2c-isa\n" if ($isa && !kernel_version_at_least(2, 6, 18));
-  if ($bmcsensors) {
+  if ($ipmi) {
     $modprobes .= "# You must also install and load the IPMI modules\n";
-    $modprobes .= "modprobe i2c-ipmi\n";
+    if (kernel_version_at_least(2, 6, 0)) {
+      $modprobes .= "modprobe ipmi-si\n";
+    } else {
+      $modprobes .= "modprobe i2c-ipmi\n";
+    }
   }