Changeset 2395

Timestamp:

03/27/04 17:12:20 (9 years ago)

Author:

khali

Message:

Backport misdetection prevention patch from 2.6:

* Use unused bits of two more registers (configuration and conversion
rate) to reduce misdetections.

* Return with -ENODEV if the detection fails.

* Change the order in which we try to identify the chips. We better
finish with the LM84 and the MAX1617, in this order, because they are
harder to identify and are more likely to result in false positives.

* Refine LM84 detection. The LM84 has less features than the other chips
(chip cannot be stopped, conversion rate cannot be set, no low limits)
so it has extra unused bits.

* Do not intialize the chip if it was detected as an LM84. This one
cannot be stopped so why would we try to start it again? And as said
right before, conversion rate isn't changeable either.

Files:

• lm-sensors/trunk/kernel/chips/adm1021.c (modified) (5 diffs)

lm-sensors/trunk/kernel/chips/adm1021.c

@@ -229 +229 @@
 
         if (kind < 0) {
-                if (
-                    (adm1021_read_value(new_client, ADM1021_REG_STATUS) &
-                     0x03) != 0x00)
-                        goto error1;
+                if ((adm1021_read_value(new_client, ADM1021_REG_STATUS) & 0x03) != 0x00
+                 || (adm1021_read_value(new_client, ADM1021_REG_CONFIG_R) & 0x3F) != 0x00
+                 || (adm1021_read_value(new_client, ADM1021_REG_CONV_RATE_R) & 0xF8) != 0x00) {
+                        err = -ENODEV;
+                        goto error1;
+                }
         }
 
@@ -240 +242 @@
                 i = adm1021_read_value(new_client, ADM1021_REG_MAN_ID);
                 if (i == 0x41)
-                  if ((adm1021_read_value (new_client, ADM1021_REG_DEV_ID) & 0x0F0) == 0x030)
+                  if ((adm1021_read_value (new_client, ADM1021_REG_DEV_ID) & 0xF0) == 0x30)
                         kind = adm1023;
                   else
@@ -252 +254 @@
                           (new_client, ADM1021_REG_DEV_ID) == 0x01))
                         kind = max1617a;
-                /* LM84 Mfr ID in a different place */
-                else
-                    if (adm1021_read_value
-                        (new_client, ADM1021_REG_CONV_RATE_R) == 0x00)
-                        kind = lm84;
                 else if (i == 0x54)
                         kind = mc1066;
+                /* LM84 Mfr ID in a different place, and it has more unused bits */
+                else if (adm1021_read_value(new_client, ADM1021_REG_CONV_RATE_R) == 0x00
+                      && (kind == 0 /* skip extra detection */
+                       || ((adm1021_read_value(new_client, ADM1021_REG_CONFIG_R) & 0x7F) == 0x00
+                        && (adm1021_read_value(new_client, ADM1021_REG_STATUS) & 0xAB) == 0x00)))
+                        kind = lm84;
                 else
                         kind = max1617;
@@ -287 +290 @@
                 type_name = "mc1066";
                 client_name = "MC1066 chip";
-        } else {
-#ifdef DEBUG
-                printk("adm1021.o: Internal error: unknown kind (%d)?!?",
-                       kind);
-#endif
-                goto error1;
         }
 
@@ -317 +314 @@
 
         /* Initialize the ADM1021 chip */
-        adm1021_init_client(new_client);
+        if (kind != lm84)
+                adm1021_init_client(new_client);
         return 0;