Changeset 4324

Timestamp:

02/15/07 11:42:43 (6 years ago)

Author:

khali

Message:

i2c-ali1563: Fix device initialization (backported from Linux 2.6)

The i2c-ali1563 initialization looks quite broken to me:
* If the I/O space isn't enabled, we forcibly set 3 bits in

the PCI configuration space instead of just the one enabling
the I/O space.

* After that we pretend to check if the write worked, but we

don't actually read the new value from the register.

* It's probably not a good idea to enable the I/O space if no

base address has been set.

So I propose the following changes to that part of the driver:
* Merge ali1563_enable() into ali1563_setup().
* Check the base address before the I/O space enabled bit.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/busses/i2c-ali1563.c (modified) (2 diffs)

lm-sensors/trunk/CHANGES

@@ -6 +6 @@
   Module bmcsensors: Fix debugging messages
   Module i2c-ali1563: Improve the status messages (2.6 backport)
+                      Fix device initialization (2.6 backport)
   Module i2c-amd8111: Cleanups (2.6 backport)
                       Fix initialization race (2.6 backport)

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

@@ -327 +327 @@
 
 
-static void ali1563_enable(struct pci_dev * dev)
+static int __devinit ali1563_setup(struct pci_dev * dev)
 {
         u16 ctrl;
 
         pci_read_config_word(dev,ALI1563_SMBBA,&ctrl);
-        ctrl |= 0x7;
-        pci_write_config_word(dev,ALI1563_SMBBA,ctrl);
-}
-
-static int __devinit ali1563_setup(struct pci_dev * dev)
-{
-        u16 ctrl;
-
-        pci_read_config_word(dev,ALI1563_SMBBA,&ctrl);
-
-        /* Check if device is even enabled first */
-        if (!(ctrl & ALI1563_SMB_IOEN)) {
-                printk(KERN_WARNING "ali1563: I/O space not enabled, trying manually\n");
-                ali1563_enable(dev);
-        }
-        if (!(ctrl & ALI1563_SMB_IOEN)) {
-                printk(KERN_WARNING "ali1563: I/O space still not enabled, giving up\n");
-                goto Err;
-        }
-        if (!(ctrl & ALI1563_SMB_HOSTEN)) {
-                printk(KERN_WARNING "ali1563: Host Controller not enabled\n");
-                goto Err;
-        }
 
         /* SMB I/O Base in high 12 bits and must be aligned with the
@@ -363 +340 @@
                 goto Err;
         }
+
+        /* Check if device is enabled */
+        if (!(ctrl & ALI1563_SMB_HOSTEN)) {
+                printk(KERN_WARNING "ali1563: Host Controller not enabled\n");
+                goto Err;
+        }
+        if (!(ctrl & ALI1563_SMB_IOEN)) {
+                printk(KERN_WARNING "I/O space not enabled, trying manually\n");
+                pci_write_config_word(dev, ALI1563_SMBBA,
+                                      ctrl | ALI1563_SMB_IOEN);
+                pci_read_config_word(dev, ALI1563_SMBBA, &ctrl);
+                if (!(ctrl & ALI1563_SMB_IOEN)) {
+                        printk(KERN_WARNING "I/O space still not enabled, "
+                               "giving up\n");
+                        goto Err;
+                }
+        }
+
         if (!request_region(ali1563_smba, ALI1563_SMB_IOSIZE,
                             ali1563_pci_driver.name)) {