Changeset 943

Timestamp:

12/14/00 01:26:13 (12 years ago)

Author:

mds

Message:

(mds) Check for uninitialized base addresses. Check for unenabled sensors.

On sis5595, refuse to load if chip not found.

Location:

lm-sensors/trunk

Files:

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

lm-sensors/trunk/CHANGES

@@ -32 +32 @@
   Module mtp008: new
   Module pcf8574: change update time to 5 seconds
+  Modules sis5595, i2c-sis5595: Check for uninitialized base addresses
   Module w83781d: fix beep setting via /proc
   Program mkpatch.pl: more fixes

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

@@ -163 +163 @@
 /* Determine the address of the SMBus areas */
         pci_read_config_word(SIS5595_dev, ACPI_BASE, &sis5595_base);
+        if(sis5595_base == 0) {
+                printk("i2c-sis5595.o: ACPI base address uninitialized - upgrade BIOS?\n");
+                error_return = -ENODEV;
+                goto END;
+        }
+
 #ifdef DEBUG
         printk("ACPI Base address: %04x\n", sis5595_base);
@@ -170 +176 @@
         if (check_region(sis5595_base + SMB_INDEX, 2)) {
                 printk
-                    ("i2c-sis5595.o: SMBus registers 0x%4x-0x%4x already in use!\n",
+                    ("i2c-sis5595.o: SMBus registers 0x%04x-0x%04x already in use!\n",
                      sis5595_base + SMB_INDEX,
                      sis5595_base + SMB_INDEX + 1);
@@ -374 +380 @@
 {
         int res;
-        printk("sis5595.o version %s (%s)\n", LM_VERSION, LM_DATE);
+        printk("i2c-sis5595.o version %s (%s)\n", LM_VERSION, LM_DATE);
 #ifdef DEBUG
 /* PE- It might be good to make this a permanent part of the code! */

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

@@ -68 +68 @@
 #define SIS5595_EXTENT 8
 #define SIS5595_BASE_REG 0x68
+#define SIS5595_ENABLE_REG 0x7B
 
 /* Where are the ISA address/data registers relative to the base address */
@@ -278 +279 @@
         struct pci_dev *s_bridge;
         u16 val;
+        char c;
 
         if (!pci_present())
                 return -ENODEV;
 
-        if (!
-            (s_bridge =
-             pci_find_device(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503,
+        if (!(s_bridge =
+              pci_find_device(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503,
                              NULL)))
-
                 return -ENODEV;
 
@@ -295 +295 @@
 
         *address = (val & 0xfff8);
+        if(*address == 0) {
+                printk("sis5595.o: Sensor base address uninitialized - upgrade BIOS?\n");
+                return -ENODEV;
+        }
+
+        if (PCIBIOS_SUCCESSFUL !=
+            pci_read_config_byte(s_bridge, SIS5595_ENABLE_REG, &c))
+                return -ENODEV;
+        if((c & 0x80) == 0) {
+                printk("sis5595.o: Sensors not enabled - upgrade BIOS?\n");
+                return -ENODEV;
+        }
         return 0;
 }
@@ -470 +482 @@
 
 
-/* The SMBus locks itself, but ISA access must be locked explicitely! 
-   There are some ugly typecasts here, but the good new is - they should
+/* The SMBus locks itself, but ISA access must be locked explicitly! 
+   There are some ugly typecasts here, but the good news is - they should
    nowhere else be necessary! */
 int sis5595_read_value(struct i2c_client *client, u8 reg)
@@ -484 +496 @@
 }
 
-/* The SMBus locks itself, but ISA access muse be locked explicitely! 
-   There are some ugly typecasts here, but the good new is - they should
-   nowhere else be necessary! */
 int sis5595_write_value(struct i2c_client *client, u8 reg, u8 value)
 {
@@ -731 +740 @@
 
         if (sis5595_find_sis(&addr)) {
-                normal_isa[0] = SENSORS_ISA_END;
-                printk
-                    ("sis5595.o: Warning: No SIS5595 southbridge found!\n");
-        } else
-                normal_isa[0] = addr;
+                printk("sis5595.o: SIS5595 not detected, module not inserted.\n");
+                return -ENODEV;
+        }
+        normal_isa[0] = addr;
 
         if ((res = i2c_add_driver(&sis5595_driver))) {