Changeset 5905 for lm-sensors/trunk/prog/detect

Timestamp:

01/19/11 10:56:53 (16 months ago)

Author:

khali

Message:

Implement universal detection for Intel digital thermal sensors. This
relies on a flag returned by the cpuid instruction, as the coretemp
driver itself does since kernel 2.6.35.

Files:

• lm-sensors/trunk/prog/detect/sensors-detect (modified) (7 diffs)

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

@@ -24 +24 @@
 
 use strict;
-use Fcntl;
+use Fcntl qw(:DEFAULT :seek);
 use File::Basename;
 
@@ -2047 +2047 @@
                 detect => \&fam11h_pci_detect,
         }, {
-                name => "Intel Core family thermal sensor",
+                name => "Intel digital thermal sensor",
                 driver => "coretemp",
-                detect => sub { coretemp_detect(0); },
-        }, {
-                name => "Intel Atom thermal sensor",
-                driver => "coretemp",
-                detect => sub { coretemp_detect(1); },
+                detect => \&coretemp_detect,
         }, {
                 name => "Intel AMB FB-DIMM thermal sensor",
@@ -2315 +2311 @@
                 if (m/^processor\s*:\s*(\d+)/) {
                         push @cpu, $entry if scalar keys(%{$entry}); # Previous entry
-                        $entry = {}; # New entry
+                        $entry = { nr => $1 }; # New entry
                         next;
                 }
-                if (m/^(vendor_id|cpu family|model|model name|stepping)\s*:\s*(.+)$/) {
+                if (m/^(vendor_id|cpu family|model|model name|stepping|cpuid level)\s*:\s*(.+)$/) {
                         my $k = $1;
                         my $v = $2;
@@ -2485 +2481 @@
         $normalized =~ tr/-/_/;
         $modules_list{$normalized} = 1;
+}
+
+# udev may take some time to create device nodes when loading modules
+sub udev_settle
+{
+        if (!(-x "/sbin/udevadm" && system("/sbin/udevadm settle") == 0)
+         && !(-x "/sbin/udevsettle" && system("/sbin/udevsettle") == 0)) {
+                sleep(1);
+        }
 }
 
@@ -5834 +5839 @@
 }
 
+sub cpuid
+{
+        my ($cpu_nr, $eax) = @_;
+
+        sysopen(CPUID, "/dev/cpu/$cpu_nr/cpuid", O_RDONLY) or return;
+        binmode CPUID;
+        sysseek(CPUID, $eax, SEEK_SET)
+                or die "Cannot seek /dev/cpu/$cpu_nr/cpuid";
+        sysread(CPUID, my $data, 16)
+                or die "Cannot read /dev/cpu/$cpu_nr/cpuid";
+        close CPUID;
+
+        return unpack("L4", $data);
+}
+
 sub coretemp_detect
 {
-        my $chip = shift;
         my $probecpu;
 
         foreach $probecpu (@cpu) {
                 next unless $probecpu->{vendor_id} eq 'GenuineIntel' &&
-                            $probecpu->{'cpu family'} == 6;
-                return 9 if $chip == 0 &&
-                        ($probecpu->{model} == 14 ||    # Pentium M DC
-                         $probecpu->{model} == 15 ||    # Core 2 DC 65nm
-                         $probecpu->{model} == 0x16 ||  # Core 2 SC 65nm
-                         $probecpu->{model} == 0x17 ||  # Penryn 45nm
-                         $probecpu->{model} == 0x1a ||  # Nehalem
-                         $probecpu->{model} == 0x1e);   # Lynnfield
-                return 9 if $chip == 1 &&
-                        ($probecpu->{model} == 0x1c);   # Atom
+                            $probecpu->{'cpuid level'} >= 6;
+
+                # Now we check for the DTS flag
+                my @regs = cpuid($probecpu->{nr}, 6);
+                return unless @regs == 4;
+                return 9 if ($regs[0] & (1 << 0));      # eax, bit 0
         }
         return;
@@ -6204 +6219 @@
               "Do you want to scan for them? This is totally safe. (YES/no): ";
         unless (<STDIN> =~ /^\s*n/i) {
+                # Load the cpuid driver if needed
+                unless (-e "/dev/cpu/$cpu[0]->{nr}/cpuid") {
+                        load_module("cpuid");
+                        udev_settle();
+                }
+
                 $| = 1;
                 foreach my $entry (@cpu_ids) {
@@ -6279 +6300 @@
                                              'supermicro');
 
-                # udev may take some time to create the device node
-                if (!(-x "/sbin/udevadm" && system("/sbin/udevadm settle") == 0)
-                 && !(-x "/sbin/udevsettle" && system("/sbin/udevsettle") == 0)) {
-                        sleep(1);
-                }
-
+                udev_settle();
                 for (my $dev_nr = 0; $dev_nr < @i2c_adapters; $dev_nr++) {
                         next unless exists $i2c_adapters[$dev_nr];