Changeset 1150

Timestamp:

07/30/01 00:48:15 (12 years ago)

Author:

mds

Message:

Add a "blacklist" to the 5595 drivers so that they refuse to load

when encountering a long list of unsupported chips.
All these chips have the same 1039/0008 ID as the 5595 but are
incompatible.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/busses/i2c-sis5595.c (modified) (4 diffs)
• kernel/chips/sis5595.c (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -26 +26 @@
   Module i2c-ali15x3: Allow force_addr=0xaddr; enable if not enabled.
   Module i2c-i801: Fix 82801BA detection broken by kernel 2.4.6
+  Module i2c-sis5595: Recognize unsupported chips and refuse to load
   Module adm1025: Fixed temp2 min/max writes
   Module ds1621: Add 12-bit precision mode
   Module it87: Enable all alarms, add in8 support, add sensor type selection
+  Module sis5595: Recognize unsupported chips and refuse to load
   Module w83781d: Fix fan speed for as99127f (broken by 2.6.0)
   Program sensors: it87 updates

lm-sensors/trunk/kernel/busses/i2c-sis5595.c

@@ -21 +21 @@
 
 /* Note: we assume there can only be one SIS5595 with one SMBus interface */
+
+/*
+   Note: all have mfr. ID 0x1039.
+   SUPPORTED            PCI ID          
+        5595            0008
+
+   Note: these chips contain a 0008 device which is incompatible with the
+         5595. We recognize these by the presence of the listed
+         "blacklist" PCI ID and refuse to load.
+
+   NOT SUPPORTED        PCI ID          BLACKLIST PCI ID        
+         540            0008            0540
+         550            0008            0550
+        5513            0008            5511
+        5581            0008            5597
+        5582            0008            5597
+        5597            0008            5597
+        5598            0008            5597/5598
+         630            0008            0630
+         730            0008            0730
+*/
 
 /* TO DO: 
@@ -39 +60 @@
 
 #include <linux/init.h>
+
+#ifndef PCI_DEVICE_ID_SI_540
+#define PCI_DEVICE_ID_SI_540            0x0540
+#endif
+#ifndef PCI_DEVICE_ID_SI_550
+#define PCI_DEVICE_ID_SI_550            0x0550
+#endif
+#ifndef PCI_DEVICE_ID_SI_630
+#define PCI_DEVICE_ID_SI_630            0x0630
+#endif
+#ifndef PCI_DEVICE_ID_SI_730
+#define PCI_DEVICE_ID_SI_730            0x0730
+#endif
+#ifndef PCI_DEVICE_ID_SI_5598
+#define PCI_DEVICE_ID_SI_5598           0x5598
+#endif
+
+static int blacklist[] = {
+                        PCI_DEVICE_ID_SI_540,
+                        PCI_DEVICE_ID_SI_550,
+                        PCI_DEVICE_ID_SI_630,
+                        PCI_DEVICE_ID_SI_730,
+                        PCI_DEVICE_ID_SI_5511, /* 5513 chip has the 0008 device but
+                                                  that ID shows up in other chips so we
+                                                  use the 5511 ID for recognition */
+                        PCI_DEVICE_ID_SI_5597,
+                        PCI_DEVICE_ID_SI_5598,
+                          0 };
 
 /* Length of ISA address segment */
@@ -153 +202 @@
         u8 val;
         struct pci_dev *SIS5595_dev;
+        int *i;
 
         /* First check whether we can access PCI at all */
@@ -167 +217 @@
                 printk("i2c-sis5595.o: Error: Can't detect SIS5595!\n");
                 return -ENODEV;
+        }
+
+        /* Look for imposters */
+        for(i = blacklist; *i != 0; i++) {
+                if (pci_find_device(PCI_VENDOR_ID_SI, *i, NULL)) {
+                        printk("i2c-sis5595.o: Error: Looked for SIS5595 but found unsupported device %.4X\n", *i);
+                        return -ENODEV;
+                }
         }
 

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

@@ -27 +27 @@
         1               1039/0008       01
         2               1039/0008       C0
+
+   Note: these chips contain a 0008 device which is incompatible with the
+         5595. We recognize these by the presence of the listed
+         "blacklist" PCI ID and refuse to load.
+
+   NOT SUPPORTED        PCI ID          BLACKLIST PCI ID        
+         540            0008            0540
+         550            0008            0550
+        5513            0008            5511
+        5581            0008            5597
+        5582            0008            5597
+        5597            0008            5597
+        5598            0008            5597/5598
+         630            0008            0630
+         730            0008            0730
 */
 
@@ -72 +87 @@
 SENSORS_INSMOD_1(sis5595);
 
+#ifndef PCI_DEVICE_ID_SI_540
+#define PCI_DEVICE_ID_SI_540            0x0540
+#endif
+#ifndef PCI_DEVICE_ID_SI_550
+#define PCI_DEVICE_ID_SI_550            0x0550
+#endif
+#ifndef PCI_DEVICE_ID_SI_630
+#define PCI_DEVICE_ID_SI_630            0x0630
+#endif
+#ifndef PCI_DEVICE_ID_SI_730
+#define PCI_DEVICE_ID_SI_730            0x0730
+#endif
+#ifndef PCI_DEVICE_ID_SI_5598
+#define PCI_DEVICE_ID_SI_5598           0x5598
+#endif
+
+static int blacklist[] = {
+                        PCI_DEVICE_ID_SI_540,
+                        PCI_DEVICE_ID_SI_550,
+                        PCI_DEVICE_ID_SI_630,
+                        PCI_DEVICE_ID_SI_730,
+                        PCI_DEVICE_ID_SI_5511, /* 5513 chip has the 0008 device but
+                                                  that ID shows up in other chips so we
+                                                  use the 5511 ID for recognition */
+                        PCI_DEVICE_ID_SI_5597,
+                        PCI_DEVICE_ID_SI_5598,
+                          0 };
 /*
    SiS southbridge has a LM78-like chip integrated on the same IC.
@@ -312 +354 @@
 {
         u16 val;
+        int *i;
 
         if (!pci_present())
@@ -321 +364 @@
                 return -ENODEV;
 
+        /* Look for imposters */
+        for(i = blacklist; *i != 0; i++) {
+                if (pci_find_device(PCI_VENDOR_ID_SI, *i, NULL)) {
+                        printk("sis5595.o: Error: Looked for SIS5595 but found unsupported device %.4X\n", *i);
+                        return -ENODEV;
+                }
+        }
 
         if (PCIBIOS_SUCCESSFUL !=