]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - drivers/i2c/busses/scx200_acb.c
[PATCH] i2c: Semaphore to mutex conversions, part 3
[mv-sheeva.git] / drivers / i2c / busses / scx200_acb.c
index f45779b7690804d94452ef9670f12e2a77017e68..8bd305e47f0d1d87ce5718a04a6812865b6841a0 100644 (file)
@@ -2,6 +2,7 @@
     Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com>
 
     National Semiconductor SCx200 ACCESS.bus support
+    Also supports the AMD CS5535 and AMD CS5536
 
     Based on i2c-keywest.c which is:
         Copyright (c) 2001 Benjamin Herrenschmidt <benh@kernel.crashing.org>
@@ -30,7 +31,9 @@
 #include <linux/smp_lock.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <linux/mutex.h>
 #include <asm/io.h>
+#include <asm/msr.h>
 
 #include <linux/scx200.h>
 
@@ -45,16 +48,7 @@ static int base[MAX_DEVICES] = { 0x820, 0x840 };
 module_param_array(base, int, NULL, 0);
 MODULE_PARM_DESC(base, "Base addresses for the ACCESS.bus controllers");
 
-#ifdef DEBUG
-#define DBG(x...) printk(KERN_DEBUG NAME ": " x)
-#else
-#define DBG(x...)
-#endif
-
-/* The hardware supports interrupt driven mode too, but I haven't
-   implemented that. */
-#define POLLED_MODE 1
-#define POLL_TIMEOUT (HZ)
+#define POLL_TIMEOUT   (HZ/5)
 
 enum scx200_acb_state {
        state_idle,
@@ -81,7 +75,7 @@ struct scx200_acb_iface {
        struct scx200_acb_iface *next;
        struct i2c_adapter adapter;
        unsigned base;
-       struct semaphore sem;
+       struct mutex mutex;
 
        /* State machine data */
        enum scx200_acb_state state;
@@ -119,8 +113,8 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status)
 {
        const char *errmsg;
 
-       DBG("state %s, status = 0x%02x\n",
-           scx200_acb_state_name[iface->state], status);
+       dev_dbg(&iface->adapter.dev, "state %s, status = 0x%02x\n",
+               scx200_acb_state_name[iface->state], status);
 
        if (status & ACBST_BER) {
                errmsg = "bus error";
@@ -130,8 +124,17 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status)
                errmsg = "not master";
                goto error;
        }
-       if (status & ACBST_NEGACK)
-               goto negack;
+       if (status & ACBST_NEGACK) {
+               dev_dbg(&iface->adapter.dev, "negative ack in state %s\n",
+                       scx200_acb_state_name[iface->state]);
+
+               iface->state = state_idle;
+               iface->result = -ENXIO;
+
+               outb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1);
+               outb(ACBST_STASTR | ACBST_NEGACK, ACBST);
+               return;
+       }
 
        switch (iface->state) {
        case state_idle:
@@ -208,17 +211,6 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status)
 
        return;
 
- negack:
-       DBG("negative acknowledge in state %s\n",
-           scx200_acb_state_name[iface->state]);
-
-       iface->state = state_idle;
-       iface->result = -ENXIO;
-
-       outb(inb(ACBCTL1) | ACBCTL1_STOP, ACBCTL1);
-       outb(ACBST_STASTR | ACBST_NEGACK, ACBST);
-       return;
-
  error:
        dev_err(&iface->adapter.dev, "%s in state %s\n", errmsg,
                scx200_acb_state_name[iface->state]);
@@ -228,20 +220,9 @@ static void scx200_acb_machine(struct scx200_acb_iface *iface, u8 status)
        iface->needs_reset = 1;
 }
 
-static void scx200_acb_timeout(struct scx200_acb_iface *iface)
-{
-       dev_err(&iface->adapter.dev, "timeout in state %s\n",
-               scx200_acb_state_name[iface->state]);
-
-       iface->state = state_idle;
-       iface->result = -EIO;
-       iface->needs_reset = 1;
-}
-
-#ifdef POLLED_MODE
 static void scx200_acb_poll(struct scx200_acb_iface *iface)
 {
-       u8 status = 0;
+       u8 status;
        unsigned long timeout;
 
        timeout = jiffies + POLL_TIMEOUT;
@@ -251,12 +232,16 @@ static void scx200_acb_poll(struct scx200_acb_iface *iface)
                        scx200_acb_machine(iface, status);
                        return;
                }
-               msleep(10);
+               yield();
        }
 
-       scx200_acb_timeout(iface);
+       dev_err(&iface->adapter.dev, "timeout in state %s\n",
+               scx200_acb_state_name[iface->state]);
+
+       iface->state = state_idle;
+       iface->result = -EIO;
+       iface->needs_reset = 1;
 }
-#endif /* POLLED_MODE */
 
 static void scx200_acb_reset(struct scx200_acb_iface *iface)
 {
@@ -297,13 +282,8 @@ static s32 scx200_acb_smbus_xfer(struct i2c_adapter *adapter,
                break;
 
        case I2C_SMBUS_BYTE:
-               if (rw == I2C_SMBUS_READ) {
-                       len = 1;
-                       buffer = &data->byte;
-               } else {
-                       len = 1;
-                       buffer = &command;
-               }
+               len = 1;
+               buffer = rw ? &data->byte : &command;
                break;
 
        case I2C_SMBUS_BYTE_DATA:
@@ -326,24 +306,18 @@ static s32 scx200_acb_smbus_xfer(struct i2c_adapter *adapter,
                return -EINVAL;
        }
 
-       DBG("size=%d, address=0x%x, command=0x%x, len=%d, read=%d\n",
-           size, address, command, len, rw == I2C_SMBUS_READ);
+       dev_dbg(&adapter->dev,
+               "size=%d, address=0x%x, command=0x%x, len=%d, read=%d\n",
+               size, address, command, len, rw);
 
        if (!len && rw == I2C_SMBUS_READ) {
-               dev_warn(&adapter->dev, "zero length read\n");
+               dev_dbg(&adapter->dev, "zero length read\n");
                return -EINVAL;
        }
 
-       if (len && !buffer) {
-               dev_warn(&adapter->dev, "nonzero length but no buffer\n");
-               return -EFAULT;
-       }
-
-       down(&iface->sem);
+       mutex_lock(&iface->mutex);
 
-       iface->address_byte = address<<1;
-       if (rw == I2C_SMBUS_READ)
-               iface->address_byte |= 1;
+       iface->address_byte = (address << 1) | rw;
        iface->command = command;
        iface->ptr = buffer;
        iface->len = len;
@@ -357,25 +331,21 @@ static s32 scx200_acb_smbus_xfer(struct i2c_adapter *adapter,
        else
                iface->state = state_address;
 
-#ifdef POLLED_MODE
        while (iface->state != state_idle)
                scx200_acb_poll(iface);
-#else /* POLLED_MODE */
-#error Interrupt driven mode not implemented
-#endif /* POLLED_MODE */       
 
        if (iface->needs_reset)
                scx200_acb_reset(iface);
 
        rc = iface->result;
 
-       up(&iface->sem);
+       mutex_unlock(&iface->mutex);
 
        if (rc == 0 && size == I2C_SMBUS_WORD_DATA && rw == I2C_SMBUS_READ)
                data->word = le16_to_cpu(cur_word);
 
 #ifdef DEBUG
-       DBG(": transfer done, result: %d", rc);
+       dev_dbg(&adapter->dev, "transfer done, result: %d", rc);
        if (buffer) {
                int i;
                printk(" data:");
@@ -402,6 +372,7 @@ static struct i2c_algorithm scx200_acb_algorithm = {
 };
 
 static struct scx200_acb_iface *scx200_acb_list;
+static DECLARE_MUTEX(scx200_acb_list_mutex);
 
 static int scx200_acb_probe(struct scx200_acb_iface *iface)
 {
@@ -412,7 +383,7 @@ static int scx200_acb_probe(struct scx200_acb_iface *iface)
        outb(0x70, ACBCTL2);
 
        if (inb(ACBCTL2) != 0x70) {
-               DBG("ACBCTL2 readback failed\n");
+               pr_debug(NAME ": ACBCTL2 readback failed\n");
                return -ENXIO;
        }
 
@@ -420,7 +391,8 @@ static int scx200_acb_probe(struct scx200_acb_iface *iface)
 
        val = inb(ACBCTL1);
        if (val) {
-               DBG("disabled, but ACBCTL1=0x%02x\n", val);
+               pr_debug(NAME ": disabled, but ACBCTL1=0x%02x\n",
+                       val);
                return -ENXIO;
        }
 
@@ -430,18 +402,19 @@ static int scx200_acb_probe(struct scx200_acb_iface *iface)
 
        val = inb(ACBCTL1);
        if ((val & ACBCTL1_NMINTE) != ACBCTL1_NMINTE) {
-               DBG("enabled, but NMINTE won't be set, ACBCTL1=0x%02x\n", val);
+               pr_debug(NAME ": enabled, but NMINTE won't be set, "
+                        "ACBCTL1=0x%02x\n", val);
                return -ENXIO;
        }
 
        return 0;
 }
 
-static int  __init scx200_acb_create(int base, int index)
+static int  __init scx200_acb_create(const char *text, int base, int index)
 {
        struct scx200_acb_iface *iface;
        struct i2c_adapter *adapter;
-       int rc = 0;
+       int rc;
        char description[64];
 
        iface = kzalloc(sizeof(*iface), GFP_KERNEL);
@@ -453,51 +426,51 @@ static int  __init scx200_acb_create(int base, int index)
 
        adapter = &iface->adapter;
        i2c_set_adapdata(adapter, iface);
-       snprintf(adapter->name, I2C_NAME_SIZE, "SCx200 ACB%d", index);
+       snprintf(adapter->name, I2C_NAME_SIZE, "%s ACB%d", text, index);
        adapter->owner = THIS_MODULE;
        adapter->id = I2C_HW_SMBUS_SCX200;
        adapter->algo = &scx200_acb_algorithm;
        adapter->class = I2C_CLASS_HWMON;
 
-       init_MUTEX(&iface->sem);
+       mutex_init(&iface->mutex);
+
+       snprintf(description, sizeof(description), "%s ACCESS.bus [%s]",
+                text, adapter->name);
 
-       snprintf(description, sizeof(description),
-                "NatSemi SCx200 ACCESS.bus [%s]", adapter->name);
        if (request_region(base, 8, description) == 0) {
-               dev_err(&adapter->dev, "can't allocate io 0x%x-0x%x\n",
+               printk(KERN_ERR NAME ": can't allocate io 0x%x-0x%x\n",
                        base, base + 8-1);
                rc = -EBUSY;
-               goto errout;
+               goto errout_free;
        }
        iface->base = base;
 
        rc = scx200_acb_probe(iface);
        if (rc) {
-               dev_warn(&adapter->dev, "probe failed\n");
-               goto errout;
+               printk(KERN_WARNING NAME ": probe failed\n");
+               goto errout_release;
        }
 
        scx200_acb_reset(iface);
 
        if (i2c_add_adapter(adapter) < 0) {
-               dev_err(&adapter->dev, "failed to register\n");
+               printk(KERN_ERR NAME ": failed to register\n");
                rc = -ENODEV;
-               goto errout;
+               goto errout_release;
        }
 
-       lock_kernel();
+       down(&scx200_acb_list_mutex);
        iface->next = scx200_acb_list;
        scx200_acb_list = iface;
-       unlock_kernel();
+       up(&scx200_acb_list_mutex);
 
        return 0;
 
+ errout_release:
+       release_region(iface->base, 8);
+ errout_free:
+       kfree(iface);
  errout:
-       if (iface) {
-               if (iface->base)
-                       release_region(iface->base, 8);
-               kfree(iface);
-       }
        return rc;
 }
 
@@ -507,24 +480,50 @@ static struct pci_device_id scx200[] = {
        { },
 };
 
+static struct pci_device_id divil_pci[] = {
+       { PCI_DEVICE(PCI_VENDOR_ID_NS,  PCI_DEVICE_ID_NS_CS5535_ISA) },
+       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA) },
+       { } /* NULL entry */
+};
+
+#define MSR_LBAR_SMB           0x5140000B
+
+static int scx200_add_cs553x(void)
+{
+       u32     low, hi;
+       u32     smb_base;
+
+       /* Grab & reserve the SMB I/O range */
+       rdmsr(MSR_LBAR_SMB, low, hi);
+
+       /* Check the IO mask and whether SMB is enabled */
+       if (hi != 0x0000F001) {
+               printk(KERN_WARNING NAME ": SMBus not enabled\n");
+               return -ENODEV;
+       }
+
+       /* SMBus IO size is 8 bytes */
+       smb_base = low & 0x0000FFF8;
+
+       return scx200_acb_create("CS5535", smb_base, 0);
+}
+
 static int __init scx200_acb_init(void)
 {
        int i;
-       int rc;
+       int     rc = -ENODEV;
 
        pr_debug(NAME ": NatSemi SCx200 ACCESS.bus Driver\n");
 
        /* Verify that this really is a SCx200 processor */
-       if (pci_dev_present(scx200) == 0)
-               return -ENODEV;
+       if (pci_dev_present(scx200)) {
+               for (i = 0; i < MAX_DEVICES; ++i) {
+                       if (base[i] > 0)
+                               rc = scx200_acb_create("SCx200", base[i], i);
+               }
+       } else if (pci_dev_present(divil_pci))
+               rc = scx200_add_cs553x();
 
-       rc = -ENXIO;
-       for (i = 0; i < MAX_DEVICES; ++i) {
-               if (base[i] > 0)
-                       rc = scx200_acb_create(base[i], i);
-       }
-       if (scx200_acb_list)
-               return 0;
        return rc;
 }
 
@@ -532,17 +531,17 @@ static void __exit scx200_acb_cleanup(void)
 {
        struct scx200_acb_iface *iface;
 
-       lock_kernel();
+       down(&scx200_acb_list_mutex);
        while ((iface = scx200_acb_list) != NULL) {
                scx200_acb_list = iface->next;
-               unlock_kernel();
+               up(&scx200_acb_list_mutex);
 
                i2c_del_adapter(&iface->adapter);
                release_region(iface->base, 8);
                kfree(iface);
-               lock_kernel();
+               down(&scx200_acb_list_mutex);
        }
-       unlock_kernel();
+       up(&scx200_acb_list_mutex);
 }
 
 module_init(scx200_acb_init);