sensors-detect: Add detection of MCP98244

Signed-off-by Guenter Roeck <[email protected]>

---
 CHANGES                    |    1 +
 prog/detect/sensors-detect |   24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

CHANGES +1 -0

index 51ac3c8..ba6409f 100644
@@ -12,6 +12,7 @@ SVN HEAD
                   Add detection of IT8752F
                   Add detection of MCP98244
                   Add detection of LM95234
+                  Add detection of TMP431/TMP432
 
 3.3.3 "Happy Birthday Sophie" (2012-11-06)
   documentation: Update fan-divisors, fan divisors are optional

prog/detect/sensors-detect +16 -1

index f238802..00e3904 100755
@@ -1023,6 +1023,16 @@ use vars qw(@i2c_adapter_names);
 		i2c_addrs => [0x4c, 0x4d],
 		i2c_detect => sub { tmp42x_detect(@_, 2); },
 	}, {
+		name => "Texas Instruments TMP431",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 16); },
+	}, {
+		name => "Texas Instruments TMP432",
+		driver => "to-be-written",		# tmp401
+		i2c_addrs => [0x4c, 0x4d],
+		i2c_detect => sub { lm90_detect(@_, 17); },
+	}, {
 		name => "Texas Instruments AMC6821",
 		driver => "amc6821",
 		i2c_addrs => [0x18..0x1a, 0x2c..0x2e, 0x4c..0x4e],

@@ -4537,7 +4547,7 @@ sub max6680_95_detect
 #		  8 = W83L771W/G, 9 = TMP401, 10 = TMP411,
 #		  11 = W83L771AWG/ASG, 12 = MAX6690,
 #		  13 = ADT7461A/NCT1008, 14 = SA56004,
-#		  15 = G781
+#		  15 = G781, 16 = TMP431, 17 = TMP432
 # Registers used:
 #   0x03: Configuration
 #   0x04: Conversion rate

@@ -4655,6 +4665,18 @@ sub lm90_detect
 		return if $mid != 0x47;		# GMT
 		return 8 if $cid = 0x01;	# G781
 	}
+	if ($chip = 16) {
+		return if ($conf & 0x1B) != 0;
+		return if $rate > 0x0F;
+		return if $mid != 0x55;		# Texas Instruments
+		return 6 if ($cid = 0x31);	# TMP431A/B/C/D

Signed-off-by Guenter Roeck <[email protected]>

---
 CHANGES                    |  1 +
 prog/detect/sensors-detect | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

Signed-off-by Guenter Roeck <[email protected]>

---
 CHANGES                    |  1 +
 prog/detect/sensors-detect | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

CHANGES +1 -0

index 3390942..a16e7be 100644
@@ -13,6 +13,7 @@ SVN HEAD
                   Add detection of ITE IT8620E and IT8623E
                   Add detection of TMP441, TMP442, LM95233, LM95234,
                   and LM95235
+                  Add detection of NCT7802Y
 
 3.3.5 "Happy Birthday Beddy" (2014-01-22)
   libsensors: Improve documentation of two functions

prog/detect/sensors-detect +33 -0

index df9a408..159d2cb 100755
@@ -733,6 +733,11 @@ use vars qw(@i2c_adapter_names);
 		i2c_addrs => [0x2c..0x2f],
 		i2c_detect => sub { w83795_detect(@_); },
 	}, {
+		name => "Nuvoton NCT7802Y",
+		driver => "to-be-written",
+		i2c_addrs => [0x28..0x2f],
+		i2c_detect => sub { nct7802_detect(@_); },
+	}, {
 		name => "Winbond W83627HF",
 		driver => "use-isa-instead",
 		i2c_addrs => [0x28..0x2f],

@@ -5483,6 +5488,69 @@ sub w83795_detect
 }
 
 # Registers used:
+#   0x00: bank selection (Bank 0, 1)
+#   0x40, 0x80, 0xc0: bank selection (Bank 1)
+#   0x01, 0x41, 0x81, 0xc1: PECI control register 1 (Bank 1)
+#   0x02, 0x42, 0x82, 0xc2: PECI control register 2 (Bank 1)
+#   0x03, 0x43, 0x83, 0xc3: PECI control register 3 (Bank 1)
+#   0xfd: Vendor ID (Bank 0)
+#   0xfe: Device ID (Bank 0)
+#   0xff: Device Revision (Bank 0)
+sub nct7802_detect
+{
+	my ($bank, $reg, $pc1, $pc2, $pc3);
+	my ($file, $addr) = @_;
+
+	$bank = i2c_smbus_read_byte_data($file, 0x00);
+	return unless ($bank = 0x00 or $bank = 0x01);
+
+	# we can not do much if bank 1 is selected
+	if ($bank = 0x01) {
+		# We can not use bit masks since all bits
+		# (including reserved bits) can be set.
+		$pc1 = i2c_smbus_read_byte_data($file, 0x01);
+		$pc2 = i2c_smbus_read_byte_data($file, 0x02);
+		$pc3 = i2c_smbus_read_byte_data($file, 0x03);
+
+		# Register values repeat every 64 registers on bank 1.
+		# Check the first four registers of each group.
+		for (my $i = 0x40; $i <= 0xc0; $i += 0x40) {
+			$reg = i2c_smbus_read_byte_data($file, $i);

prog/detect/sensors-detect +5 -0

+
+	$reg = i2c_smbus_read_byte_data($file, 0xfe);
+	return unless $reg = 0xc3;
+
+	$reg = i2c_smbus_read_byte_data($file, 0xff);

prog/detect/sensors-detect +5 -0

+
+	return 8;
+}
+
+# Registers used:
 #   0x48: Full I2C Address
 #   0x4e: Vendor ID byte selection
 #   0x4f: Vendor ID

Hi Guenter,

Quoted 66 lines · Guenter Roeck

Signed-off-by Guenter Roeck <[email protected]>

---
  CHANGES                    |  1 +
  prog/detect/sensors-detect | 68 ++++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 69 insertions(+)

CHANGES +1 -0

index 3390942..a16e7be 100644
@@ -13,6 +13,7 @@ SVN HEAD
                    Add detection of ITE IT8620E and IT8623E
                    Add detection of TMP441, TMP442, LM95233, LM95234,
                    and LM95235
+                  Add detection of NCT7802Y
 
  3.3.5 "Happy Birthday Beddy" (2014-01-22)
    libsensors: Improve documentation of two functions

prog/detect/sensors-detect +33 -0

index df9a408..159d2cb 100755
@@ -733,6 +733,11 @@ use vars qw(@i2c_adapter_names);
  		i2c_addrs => [0x2c..0x2f],
  		i2c_detect => sub { w83795_detect(@_); },
  	}, {
+		name => "Nuvoton NCT7802Y",
+		driver => "to-be-written",
+		i2c_addrs => [0x28..0x2f],
+		i2c_detect => sub { nct7802_detect(@_); },
+	}, {
  		name => "Winbond W83627HF",
  		driver => "use-isa-instead",
  		i2c_addrs => [0x28..0x2f],

@@ -5483,6 +5488,69 @@ sub w83795_detect
  }
 
  # Registers used:
+#   0x00: bank selection (Bank 0, 1)
+#   0x40, 0x80, 0xc0: bank selection (Bank 1)
+#   0x01, 0x41, 0x81, 0xc1: PECI control register 1 (Bank 1)
+#   0x02, 0x42, 0x82, 0xc2: PECI control register 2 (Bank 1)
+#   0x03, 0x43, 0x83, 0xc3: PECI control register 3 (Bank 1)
+#   0xfd: Vendor ID (Bank 0)
+#   0xfe: Device ID (Bank 0)
+#   0xff: Device Revision (Bank 0)
+sub nct7802_detect
+{
+	my ($bank, $reg, $pc1, $pc2, $pc3);
+	my ($file, $addr) = @_;
+
+	$bank = i2c_smbus_read_byte_data($file, 0x00);
+	return unless ($bank = 0x00 or $bank = 0x01);
+
+	# we can not do much if bank 1 is selected
+	if ($bank = 0x01) {
+		# We can not use bit masks since all bits
+		# (including reserved bits) can be set.
+		$pc1 = i2c_smbus_read_byte_data($file, 0x01);
+		$pc2 = i2c_smbus_read_byte_data($file, 0x02);
+		$pc3 = i2c_smbus_read_byte_data($file, 0x03);
+
+		# Register values repeat every 64 registers on bank 1.
+		# Check the first four registers of each group.
+		for (my $i = 0x40; $i <= 0xc0; $i += 0x40) {
+			$reg = i2c_smbus_read_byte_data($file, $i);

prog/detect/sensors-detect sub w83795_detect · line 5528

Quoted 10 lines

prog/detect/sensors-detect +10 -0

+			return if $reg != 0x01;
+			$reg = i2c_smbus_read_byte_data($file, $i + 1);
+			return if $reg != $pc1;
+			$reg = i2c_smbus_read_byte_data($file, $i + 2);
+			return if $reg != $pc2;
+			$reg = i2c_smbus_read_byte_data($file, $i + 3);
+			return if $reg != $pc3;
+		}
+		return 3;
+	}

Bah. I discussed the need to have the identification registers in non-banked registers with Winbond/Nuvoton engineers years ago, and it looked like they did listen to me with the W83795G/ADG, but now they are doing it all wrong again :-(

The above is simply too weak, I'm afraid. Chips cycling over 8, 16, 32 or 64 register addresses are legions. Just from my register dump collection, the LM80 and the VIA 686A chips would both be detected by the loop above. There may be more, in particular if Nuvoton keeps using the same strategy for future chips.

So I would say, just skip the detection if the chip is in bank 1. Let's hope the BIOS will leave the chip in bank 0. When we have a driver for that chip, we'll make sure to leave the chip in bank 0 too.

prog/detect/sensors-detect sub w83795_detect · line 5533

Quoted 5 lines

prog/detect/sensors-detect +5 -0

+
+	# bank 0, can support real chip detection
+
+	$reg = i2c_smbus_read_byte_data($file, 0xfd);
+	return unless ($reg = 0x50);

Unneeded parentheses.

Quoted 12 lines

prog/detect/sensors-detect +12 -0

+
+	$reg = i2c_smbus_read_byte_data($file, 0xfe);
+	return unless $reg = 0xc3;
+
+	$reg = i2c_smbus_read_byte_data($file, 0xff);
+	return unless ($reg & 0xf0) = 0x20;
+
+	$reg = i2c_smbus_read_byte_data($file, 0x05);
+	return unless ($reg & 0x1f) = 0x00;
+
+	$reg = i2c_smbus_read_byte_data($file, 0x08);
+	return unless ($reg & 0x3f) = 0x00;

prog/detect/sensors-detect sub w83795_detect · line 5548

Quoted 3 lines

prog/detect/sensors-detect +3 -0

+
+	$reg = i2c_smbus_read_byte_data($file, 0x0f);
+	return unless ($reg & 0x3f) = 0x00;

You did not say above, what these last 3 registers were. Also I am surprised because checking these is in contradiction with your statement above that "we can not use bit masks since all bits (including reserved bits) can be set."