Changeset 1756

Timestamp:

06/04/03 04:41:15 (10 years ago)

Author:

mds

Message:

backport from kernel 2.5.69. tested OK.

Files:

• lm-sensors/trunk/kernel/busses/i2c-ali15x3.c (modified) (22 diffs)

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

@@ -61 +61 @@
 /* Note: we assume there can only be one ALI15X3, with one SMBus interface */
 
+/* #define DEBUG 1 */
+
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -70 +72 @@
 #include <linux/init.h>
 #include <asm/io.h>
-#include "version.h"
+#include "sensors_compat.h"
 
 /* ALI15X3 SMBus address offsets */
-#define SMBHSTSTS (0 + ali15x3_smba)
-#define SMBHSTCNT (1 + ali15x3_smba)
-#define SMBHSTSTART (2 + ali15x3_smba)
-#define SMBHSTCMD (7 + ali15x3_smba)
-#define SMBHSTADD (3 + ali15x3_smba)
-#define SMBHSTDAT0 (4 + ali15x3_smba)
-#define SMBHSTDAT1 (5 + ali15x3_smba)
-#define SMBBLKDAT (6 + ali15x3_smba)
+#define SMBHSTSTS       (0 + ali15x3_smba)
+#define SMBHSTCNT       (1 + ali15x3_smba)
+#define SMBHSTSTART     (2 + ali15x3_smba)
+#define SMBHSTCMD       (7 + ali15x3_smba)
+#define SMBHSTADD       (3 + ali15x3_smba)
+#define SMBHSTDAT0      (4 + ali15x3_smba)
+#define SMBHSTDAT1      (5 + ali15x3_smba)
+#define SMBBLKDAT       (6 + ali15x3_smba)
 
 /* PCI Address Constants */
-#define SMBCOM    0x004
-#define SMBBA     0x014
-#define SMBATPC   0x05B         /* used to unlock xxxBA registers */
-#define SMBHSTCFG 0x0E0
-#define SMBSLVC   0x0E1
-#define SMBCLK    0x0E2
-#define SMBREV    0x008
+#define SMBCOM          0x004
+#define SMBBA           0x014
+#define SMBATPC         0x05B   /* used to unlock xxxBA registers */
+#define SMBHSTCFG       0x0E0
+#define SMBSLVC         0x0E1
+#define SMBCLK          0x0E2
+#define SMBREV          0x008
 
 /* Other settings */
-#define MAX_TIMEOUT 200         /* times 1/100 sec */
-#define ALI15X3_SMB_IOSIZE 32
+#define MAX_TIMEOUT             200     /* times 1/100 sec */
+#define ALI15X3_SMB_IOSIZE      32
 
 /* this is what the Award 1004 BIOS sets them to on a ASUS P5A MB.
@@ -99 +101 @@
    tell user to upgrade BIOS and we fail.
 */
-#define ALI15X3_SMB_DEFAULTBASE 0xE800
+#define ALI15X3_SMB_DEFAULTBASE 0xE800
 
 /* ALI15X3 address lock bits */
-#define ALI15X3_LOCK    0x06
+#define ALI15X3_LOCK            0x06
 
 /* ALI15X3 command constants */
-#define ALI15X3_ABORT      0x02
-#define ALI15X3_T_OUT      0x04
-#define ALI15X3_QUICK      0x00
-#define ALI15X3_BYTE       0x10
-#define ALI15X3_BYTE_DATA  0x20
-#define ALI15X3_WORD_DATA  0x30
-#define ALI15X3_BLOCK_DATA 0x40
-#define ALI15X3_BLOCK_CLR  0x80
+#define ALI15X3_ABORT           0x02
+#define ALI15X3_T_OUT           0x04
+#define ALI15X3_QUICK           0x00
+#define ALI15X3_BYTE            0x10
+#define ALI15X3_BYTE_DATA       0x20
+#define ALI15X3_WORD_DATA       0x30
+#define ALI15X3_BLOCK_DATA      0x40
+#define ALI15X3_BLOCK_CLR       0x80
 
 /* ALI15X3 status register bits */
@@ -131 +133 @@
                  "Initialize the base address of the i2c controller");
 
-
-static void ali15x3_do_pause(unsigned int amount);
-static int ali15x3_transaction(void);
-
 static unsigned short ali15x3_smba = 0;
-static int locked=0;
-
-/* Detect whether a ALI15X3 can be found, and initialize it, where necessary.
-   Note the differences between kernels with the old PCI BIOS interface and
-   newer kernels with the real PCI interface. In compat.h some things are
-   defined to make the transition easier. */
-int ali15x3_setup(void)
+
+static int ali15x3_setup(struct pci_dev *ALI15X3_dev)
 {
         u16 a;
         unsigned char temp;
 
-        struct pci_dev *ALI15X3_dev;
-
-        /* First check whether we can access PCI at all */
-        if (pci_present() == 0) {
-                printk("i2c-ali15x3.o: Error: No PCI-bus found!\n");
-                return -ENODEV;
-        }
-
-        /* Look for the ALI15X3, M7101 device */
-        ALI15X3_dev = NULL;
-        ALI15X3_dev = pci_find_device(PCI_VENDOR_ID_AL,
-                                      PCI_DEVICE_ID_AL_M7101, ALI15X3_dev);
-        if (ALI15X3_dev == NULL) {
-                printk("i2c-ali15x3.o: Error: Can't detect ali15x3!\n");
-                return -ENODEV;
-        }
-
-/* Check the following things:
-        - SMB I/O address is initialized
-        - Device is enabled
-        - We can use the addresses
-*/
-
-/* Unlock the register.
-   The data sheet says that the address registers are read-only
-   if the lock bits are 1, but in fact the address registers
-   are zero unless you clear the lock bits.
-*/
+        /* Check the following things:
+                - SMB I/O address is initialized
+                - Device is enabled
+                - We can use the addresses
+        */
+
+        /* Unlock the register.
+           The data sheet says that the address registers are read-only
+           if the lock bits are 1, but in fact the address registers
+           are zero unless you clear the lock bits.
+        */
         pci_read_config_byte(ALI15X3_dev, SMBATPC, &temp);
         if (temp & ALI15X3_LOCK) {
@@ -181 +157 @@
         }
 
-/* Determine the address of the SMBus area */
+        /* Determine the address of the SMBus area */
         pci_read_config_word(ALI15X3_dev, SMBBA, &ali15x3_smba);
         ali15x3_smba &= (0xffff & ~(ALI15X3_SMB_IOSIZE - 1));
         if (ali15x3_smba == 0 && force_addr == 0) {
-                printk
-                    ("i2c-ali15x3.o: ALI15X3_smb region uninitialized - upgrade BIOS or use force_addr=0xaddr\n");
+                dev_err(ALI15X3_dev, "ALI15X3_smb region uninitialized "
+                        "- upgrade BIOS or use force_addr=0xaddr\n");
                 return -ENODEV;
         }
@@ -193 +169 @@
                 ali15x3_smba = force_addr & ~(ALI15X3_SMB_IOSIZE - 1);
 
-        if (check_region(ali15x3_smba, ALI15X3_SMB_IOSIZE)) {
-                printk
-                    ("i2c-ali15x3.o: ALI15X3_smb region 0x%x already in use!\n",
-                     ali15x3_smba);
+        if (!request_region(ali15x3_smba, ALI15X3_SMB_IOSIZE, "ali15x3-smb")) {
+                dev_err(ALI15X3_dev,
+                        "ALI15X3_smb region 0x%x already in use!\n",
+                        ali15x3_smba);
                 return -ENODEV;
         }
 
         if(force_addr) {
-                printk("i2c-ali15x3.o: forcing ISA address 0x%04X\n", ali15x3_smba);
+                dev_info(ALI15X3_dev, "forcing ISA address 0x%04X\n",
+                        ali15x3_smba);
                 if (PCIBIOS_SUCCESSFUL !=
                     pci_write_config_word(ALI15X3_dev, SMBBA, ali15x3_smba))
@@ -210 +187 @@
                 if ((a & ~(ALI15X3_SMB_IOSIZE - 1)) != ali15x3_smba) {
                         /* make sure it works */
-                        printk("i2c-ali15x3.o: force address failed - not supported?\n");
+                        dev_err(ALI15X3_dev,
+                                "force address failed - not supported?\n");
                         return -ENODEV;
                 }
         }
-/* check if whole device is enabled */
+        /* check if whole device is enabled */
         pci_read_config_byte(ALI15X3_dev, SMBCOM, &temp);
         if ((temp & 1) == 0) {
-                printk("i2c-ali15x3: enabling SMBus device\n");
+                dev_info(ALI15X3_dev, "enabling SMBus device\n");
                 pci_write_config_byte(ALI15X3_dev, SMBCOM, temp | 0x01);
         }
 
-/* Is SMB Host controller enabled? */
+        /* Is SMB Host controller enabled? */
         pci_read_config_byte(ALI15X3_dev, SMBHSTCFG, &temp);
         if ((temp & 1) == 0) {
-                printk("i2c-ali15x3: enabling SMBus controller\n");
+                dev_info(ALI15X3_dev, "enabling SMBus controller\n");
                 pci_write_config_byte(ALI15X3_dev, SMBHSTCFG, temp | 0x01);
         }
 
-/* set SMB clock to 74KHz as recommended in data sheet */
+        /* set SMB clock to 74KHz as recommended in data sheet */
         pci_write_config_byte(ALI15X3_dev, SMBCLK, 0x20);
 
-        /* Everything is happy, let's grab the memory and set things up. */
-        request_region(ali15x3_smba, ALI15X3_SMB_IOSIZE, "ali15x3-smb");
-
-#ifdef DEBUG
-/*
-  The interrupt routing for SMB is set up in register 0x77 in the
-  1533 ISA Bridge device, NOT in the 7101 device.
-  Don't bother with finding the 1533 device and reading the register.
-  if ((....... & 0x0F) == 1)
-     printk("i2c-ali15x3.o: ALI15X3 using Interrupt 9 for SMBus.\n");
-*/
+        /*
+          The interrupt routing for SMB is set up in register 0x77 in the
+          1533 ISA Bridge device, NOT in the 7101 device.
+          Don't bother with finding the 1533 device and reading the register.
+        if ((....... & 0x0F) == 1)
+                dev_dbg(&ALI15X3_dev, "ALI15X3 using Interrupt 9 for SMBus.\n");
+        */
         pci_read_config_byte(ALI15X3_dev, SMBREV, &temp);
-        printk("i2c-ali15x3.o: SMBREV = 0x%X\n", temp);
-        printk("i2c-ali15x3.o: ALI15X3_smba = 0x%X\n", ali15x3_smba);
-#endif                          /* DEBUG */
+        dev_dbg(&ALI15X3_dev, "SMBREV = 0x%X\n", temp);
+        dev_dbg(&ALI15X3_dev, "iALI15X3_smba = 0x%X\n", ali15x3_smba);
 
         return 0;
 }
 
-
 /* Internally used pause function */
-void ali15x3_do_pause(unsigned int amount)
+static void ali15x3_do_pause(unsigned int amount)
 {
         current->state = TASK_INTERRUPTIBLE;
@@ -259 +231 @@
 
 /* Another internally used function */
-int ali15x3_transaction(void)
+static int ali15x3_transaction(struct i2c_adapter *adap)
 {
         int temp;
@@ -265 +237 @@
         int timeout = 0;
 
-#ifdef DEBUG
-        printk
-            ("i2c-ali15x3.o: Transaction (pre): STS=%02x, CNT=%02x, CMD=%02x, ADD=%02x, DAT0=%02x, "
-             "DAT1=%02x\n", inb_p(SMBHSTSTS), inb_p(SMBHSTCNT),
-             inb_p(SMBHSTCMD), inb_p(SMBHSTADD), inb_p(SMBHSTDAT0),
-             inb_p(SMBHSTDAT1));
-#endif
+        dev_dbg(&adap, "Transaction (pre): STS=%02x, CNT=%02x, CMD=%02x, "
+                "ADD=%02x, DAT0=%02x, DAT1=%02x\n", inb_p(SMBHSTSTS),
+                inb_p(SMBHSTCNT), inb_p(SMBHSTCMD), inb_p(SMBHSTADD),
+                inb_p(SMBHSTDAT0), inb_p(SMBHSTDAT1));
 
         /* get status */
@@ -279 +248 @@
         /* Check the busy bit first */
         if (temp & ALI15X3_STS_BUSY) {
-/*
-   If the host controller is still busy, it may have timed out in the previous transaction,
-   resulting in a "SMBus Timeout" printk.
-   I've tried the following to reset a stuck busy bit.
-        1. Reset the controller with an ABORT command.
-           (this doesn't seem to clear the controller if an external device is hung)
-        2. Reset the controller and the other SMBus devices with a T_OUT command.
-           (this clears the host busy bit if an external device is hung,
-           but it comes back upon a new access to a device)
-        3. Disable and reenable the controller in SMBHSTCFG
-   Worst case, nothing seems to work except power reset.
-*/
-/* Abort - reset the host controller */
-/*
-#ifdef DEBUG
-    printk("i2c-ali15x3.o: Resetting host controller to clear busy condition\n",temp);
-#endif
-    outb_p(ALI15X3_ABORT, SMBHSTCNT);
-    temp = inb_p(SMBHSTSTS);
-    if (temp & ALI15X3_STS_BUSY) {
-*/
-
-/*
-   Try resetting entire SMB bus, including other devices -
-   This may not work either - it clears the BUSY bit but
-   then the BUSY bit may come back on when you try and use the chip again.
-   If that's the case you are stuck.
-*/
-                printk
-                    ("i2c-ali15x3.o: Resetting entire SMB Bus to clear busy condition (%02x)\n",
-                     temp);
+        /*
+           If the host controller is still busy, it may have timed out in the
+           previous transaction, resulting in a "SMBus Timeout" Dev.
+           I've tried the following to reset a stuck busy bit.
+                1. Reset the controller with an ABORT command.
+                   (this doesn't seem to clear the controller if an external
+                   device is hung)
+                2. Reset the controller and the other SMBus devices with a
+                   T_OUT command.  (this clears the host busy bit if an
+                   external device is hung, but it comes back upon a new access
+                   to a device)
+                3. Disable and reenable the controller in SMBHSTCFG
+           Worst case, nothing seems to work except power reset.
+        */
+        /* Abort - reset the host controller */
+        /*
+           Try resetting entire SMB bus, including other devices -
+           This may not work either - it clears the BUSY bit but
+           then the BUSY bit may come back on when you try and use the chip again.
+           If that's the case you are stuck.
+        */
+                dev_info(adap, "Resetting entire SMB Bus to "
+                        "clear busy condition (%02x)\n", temp);
                 outb_p(ALI15X3_T_OUT, SMBHSTCNT);
                 temp = inb_p(SMBHSTSTS);
         }
-/*
-  }
-*/
 
         /* now check the error bits and the busy bit */
@@ -326 +284 @@
                            as one of the bits now appears to be stuck */
                         /* This may be a bus or device with electrical problems. */
-                        printk
-                            ("i2c-ali15x3.o: SMBus reset failed! (0x%02x) - controller or device on bus is probably hung\n",
-                             temp);
+                        dev_err(adap, "SMBus reset failed! (0x%02x) - "
+                                "controller or device on bus is probably hung\n",
+                                temp);
                         return -1;
                 }
@@ -352 +310 @@
         if (timeout >= MAX_TIMEOUT) {
                 result = -1;
-                printk("i2c-ali15x3.o: SMBus Timeout!\n");
+                dev_err(adap, "SMBus Timeout!\n");
         }
 
         if (temp & ALI15X3_STS_TERM) {
                 result = -1;
-#ifdef DEBUG
-                printk("i2c-ali15x3.o: Error: Failed bus transaction\n");
-#endif
-        }
-
-/*
-  Unfortunately the ALI SMB controller maps "no response" and "bus collision"
-  into a single bit. No reponse is the usual case so don't
-  do a printk.
-  This means that bus collisions go unreported.
-*/
+                dev_dbg(&adap, "Error: Failed bus transaction\n");
+        }
+
+        /*
+          Unfortunately the ALI SMB controller maps "no response" and "bus
+          collision" into a single bit. No reponse is the usual case so don't
+          do a printk.
+          This means that bus collisions go unreported.
+        */
         if (temp & ALI15X3_STS_COLL) {
                 result = -1;
-#ifdef DEBUG
-                printk
-                    ("i2c-ali15x3.o: Error: no response or bus collision ADD=%02x\n",
-                     inb_p(SMBHSTADD));
-#endif
-        }
-
-/* haven't ever seen this */
+                dev_dbg(&adap,
+                        "Error: no response or bus collision ADD=%02x\n",
+                        inb_p(SMBHSTADD));
+        }
+
+        /* haven't ever seen this */
         if (temp & ALI15X3_STS_DEV) {
                 result = -1;
-                printk("i2c-ali15x3.o: Error: device error\n");
-        }
-#ifdef DEBUG
-        printk
-            ("i2c-ali15x3.o: Transaction (post): STS=%02x, CNT=%02x, CMD=%02x, ADD=%02x, "
-             "DAT0=%02x, DAT1=%02x\n", inb_p(SMBHSTSTS), inb_p(SMBHSTCNT),
-             inb_p(SMBHSTCMD), inb_p(SMBHSTADD), inb_p(SMBHSTDAT0),
-             inb_p(SMBHSTDAT1));
-#endif
+                dev_err(adap, "Error: device error\n");
+        }
+        dev_dbg(&adap, "Transaction (post): STS=%02x, CNT=%02x, CMD=%02x, "
+                "ADD=%02x, DAT0=%02x, DAT1=%02x\n", inb_p(SMBHSTSTS),
+                inb_p(SMBHSTCNT), inb_p(SMBHSTCMD), inb_p(SMBHSTADD),
+                inb_p(SMBHSTDAT0), inb_p(SMBHSTDAT1));
         return result;
 }
 
 /* Return -1 on error. */
-s32 ali15x3_access(struct i2c_adapter * adap, u16 addr,
+static s32 ali15x3_access(struct i2c_adapter * adap, u16 addr,
                    unsigned short flags, char read_write, u8 command,
                    int size, union i2c_smbus_data * data)
@@ -401 +352 @@
         int timeout;
 
-/* clear all the bits (clear-on-write) */
+        /* clear all the bits (clear-on-write) */
         outb_p(0xFF, SMBHSTSTS);
-/* make sure SMBus is idle */
+        /* make sure SMBus is idle */
         temp = inb_p(SMBHSTSTS);
         for (timeout = 0;
@@ -412 +363 @@
         }
         if (timeout >= MAX_TIMEOUT) {
-                printk("i2c-ali15x3.o: Idle wait Timeout! STS=0x%02x\n",
-                       temp);
+                dev_err(adap, "Idle wait Timeout! STS=0x%02x\n", temp);
         }
 
         switch (size) {
         case I2C_SMBUS_PROC_CALL:
-                printk
-                    ("i2c-ali15x3.o: I2C_SMBUS_PROC_CALL not supported!\n");
+                dev_err(adap, "I2C_SMBUS_PROC_CALL not supported!\n");
                 return -1;
         case I2C_SMBUS_QUICK:
@@ -466 +415 @@
                         }
                         outb_p(len, SMBHSTDAT0);
-                        outb_p(inb_p(SMBHSTCNT) | ALI15X3_BLOCK_CLR, SMBHSTCNT);        /* Reset SMBBLKDAT */
+                        /* Reset SMBBLKDAT */
+                        outb_p(inb_p(SMBHSTCNT) | ALI15X3_BLOCK_CLR, SMBHSTCNT);
                         for (i = 1; i <= len; i++)
                                 outb_p(data->block[i], SMBBLKDAT);
@@ -476 +426 @@
         outb_p(size, SMBHSTCNT);        /* output command */
 
-        if (ali15x3_transaction())      /* Error in transaction */
+        if (ali15x3_transaction(adap))  /* Error in transaction */
                 return -1;
 
@@ -498 +448 @@
                         len = 32;
                 data->block[0] = len;
-                outb_p(inb_p(SMBHSTCNT) | ALI15X3_BLOCK_CLR, SMBHSTCNT);        /* Reset SMBBLKDAT */
+                /* Reset SMBBLKDAT */
+                outb_p(inb_p(SMBHSTCNT) | ALI15X3_BLOCK_CLR, SMBHSTCNT);
                 for (i = 1; i <= data->block[0]; i++) {
                         data->block[i] = inb_p(SMBBLKDAT);
-#ifdef DEBUG
-                        printk
-                            ("i2c-ali15x3.o: Blk: len=%d, i=%d, data=%02x\n",
-                             len, i, data->block[i]);
-#endif  /* DEBUG */
+                        dev_dbg(&adap, "Blk: len=%d, i=%d, data=%02x\n",
+                                len, i, data->block[i]);
                 }
                 break;
@@ -512 +460 @@
 }
 
-
-u32 ali15x3_func(struct i2c_adapter *adapter)
+static u32 ali15x3_func(struct i2c_adapter *adapter)
 {
         return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
@@ -529 +476 @@
 static struct i2c_adapter ali15x3_adapter = {
         .owner          = THIS_MODULE,
-        .name           = "unset",
         .id             = I2C_ALGO_SMBUS | I2C_HW_SMBUS_ALI15X3,
         .algo           = &smbus_algorithm,
+        .name   = "unset",
 };
 
-
-
 static struct pci_device_id ali15x3_ids[] __devinitdata = {
+        {
+        .vendor =       PCI_VENDOR_ID_AL,
+        .device =       PCI_DEVICE_ID_AL_M7101,
+        .subvendor =    PCI_ANY_ID,
+        .subdevice =    PCI_ANY_ID,
+        },
         { 0, }
 };
@@ -542 +493 @@
 static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        if (ali15x3_setup()) {
-                printk
-                    ("i2c-ali15x3.o: ALI15X3 not detected, module not inserted.\n");
-
+        if (ali15x3_setup(dev)) {
+                dev_err(dev,
+                        "ALI15X3 not detected, module not inserted.\n");
                 return -ENODEV;
         }
 
-        sprintf(ali15x3_adapter.name, "SMBus ALI15X3 adapter at %04x",
-                ali15x3_smba);
-        i2c_add_adapter(&ali15x3_adapter);
+        snprintf(ali15x3_adapter.name, 32,
+                "SMBus ALI15X3 adapter at %04x", ali15x3_smba);
+        return i2c_add_adapter(&ali15x3_adapter);
 }
 
@@ -568 +518 @@
 static int __init i2c_ali15x3_init(void)
 {
-        printk("i2c-ali15x3.o version %s (%s)\n", LM_VERSION, LM_DATE);
+        printk("i2c-ali15x3.o version %s (%s)\n", I2C_VERSION, I2C_DATE);
         return pci_module_init(&ali15x3_driver);
 }
-
 
 static void __exit i2c_ali15x3_exit(void)
@@ -579 +528 @@
 }
 
-
-
-MODULE_AUTHOR
-    ("Frodo Looijaard <frodol@dds.nl>, Philip Edelbrock <phil@netroedge.com>, and Mark D. Studebaker <mdsxyz123@yahoo.com>");
+MODULE_AUTHOR ("Frodo Looijaard <frodol@dds.nl>, "
+                "Philip Edelbrock <phil@netroedge.com>, "
+                "and Mark D. Studebaker <mdsxyz123@yahoo.com>");
 MODULE_DESCRIPTION("ALI15X3 SMBus driver");
 MODULE_LICENSE("GPL");