include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
[safe/jmp/linux-2.6] / arch / arm / plat-omap / mailbox.c
index 848fdca..08a2df7 100644 (file)
@@ -1,10 +1,9 @@
 /*
  * OMAP mailbox driver
  *
- * Copyright (C) 2006 Nokia Corporation. All rights reserved.
+ * Copyright (C) 2006-2009 Nokia Corporation. All rights reserved.
  *
- * Contact: Toshihiro Kobayashi <toshihiro.kobayashi@nokia.com>
- *             Restructured by Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
+ * Contact: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  *
  */
 
-#include <linux/init.h>
 #include <linux/module.h>
-#include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
-#include <linux/blkdev.h>
-#include <linux/err.h>
 #include <linux/delay.h>
-#include <asm/io.h>
-#include <asm/arch/mailbox.h>
-#include "mailbox.h"
+#include <linux/slab.h>
 
+#include <plat/mailbox.h>
+
+static struct workqueue_struct *mboxd;
 static struct omap_mbox *mboxes;
 static DEFINE_RWLOCK(mboxes_lock);
 
-/* Mailbox Sequence Bit function */
-void omap_mbox_init_seq(struct omap_mbox *mbox)
+static int mbox_configured;
+
+/* Mailbox FIFO handle functions */
+static inline mbox_msg_t mbox_fifo_read(struct omap_mbox *mbox)
+{
+       return mbox->ops->fifo_read(mbox);
+}
+static inline void mbox_fifo_write(struct omap_mbox *mbox, mbox_msg_t msg)
+{
+       mbox->ops->fifo_write(mbox, msg);
+}
+static inline int mbox_fifo_empty(struct omap_mbox *mbox)
+{
+       return mbox->ops->fifo_empty(mbox);
+}
+static inline int mbox_fifo_full(struct omap_mbox *mbox)
+{
+       return mbox->ops->fifo_full(mbox);
+}
+
+/* Mailbox IRQ handle functions */
+static inline void ack_mbox_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
 {
-       mbox_seq_init(mbox);
+       if (mbox->ops->ack_irq)
+               mbox->ops->ack_irq(mbox, irq);
+}
+static inline int is_mbox_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
+{
+       return mbox->ops->is_irq(mbox, irq);
 }
-EXPORT_SYMBOL(omap_mbox_init_seq);
 
 /*
  * message sender
  */
-static int __mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg, void *arg)
+static int __mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg)
 {
        int ret = 0, i = 1000;
 
@@ -58,67 +78,49 @@ static int __mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg, void *arg)
                        return -1;
                udelay(1);
        }
-
-       if (arg && mbox->txq->callback) {
-               ret = mbox->txq->callback(arg);
-               if (ret)
-                       goto out;
-       }
-
-       mbox_seq_toggle(mbox, &msg);
        mbox_fifo_write(mbox, msg);
- out:
        return ret;
 }
 
-int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg, void* arg)
+
+int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg)
 {
+
        struct request *rq;
        struct request_queue *q = mbox->txq->queue;
-       int ret = 0;
 
        rq = blk_get_request(q, WRITE, GFP_ATOMIC);
-       if (unlikely(!rq)) {
-               ret = -ENOMEM;
-               goto fail;
-       }
+       if (unlikely(!rq))
+               return -ENOMEM;
 
-       rq->data = (void *)msg;
-       blk_insert_request(q, rq, 0, arg);
+       blk_insert_request(q, rq, 0, (void *) msg);
+       tasklet_schedule(&mbox->txq->tasklet);
 
-       schedule_work(&mbox->txq->work);
- fail:
-       return ret;
+       return 0;
 }
 EXPORT_SYMBOL(omap_mbox_msg_send);
 
-static void mbox_tx_work(struct work_struct *work)
+static void mbox_tx_tasklet(unsigned long tx_data)
 {
        int ret;
        struct request *rq;
-       struct omap_mbox_queue *mq = container_of(work,
-                               struct omap_mbox_queue, work);
-       struct omap_mbox *mbox = mq->queue->queuedata;
+       struct omap_mbox *mbox = (struct omap_mbox *)tx_data;
        struct request_queue *q = mbox->txq->queue;
 
        while (1) {
-               spin_lock(q->queue_lock);
-               rq = elv_next_request(q);
-               spin_unlock(q->queue_lock);
+
+               rq = blk_fetch_request(q);
 
                if (!rq)
                        break;
 
-               ret = __mbox_msg_send(mbox, (mbox_msg_t) rq->data, rq->special);
+               ret = __mbox_msg_send(mbox, (mbox_msg_t)rq->special);
                if (ret) {
-                       enable_mbox_irq(mbox, IRQ_TX);
+                       omap_mbox_enable_irq(mbox, IRQ_TX);
+                       blk_requeue_request(q, rq);
                        return;
                }
-
-               spin_lock(q->queue_lock);
-               if (__blk_end_request(rq, 0, 0))
-                       BUG();
-               spin_unlock(q->queue_lock);
+               blk_end_request_all(rq, 0);
        }
 }
 
@@ -135,23 +137,15 @@ static void mbox_rx_work(struct work_struct *work)
        mbox_msg_t msg;
        unsigned long flags;
 
-       if (mbox->rxq->callback == NULL) {
-               sysfs_notify(&mbox->dev.kobj, NULL, "mbox");
-               return;
-       }
-
        while (1) {
                spin_lock_irqsave(q->queue_lock, flags);
-               rq = elv_next_request(q);
+               rq = blk_fetch_request(q);
                spin_unlock_irqrestore(q->queue_lock, flags);
                if (!rq)
                        break;
 
-               msg = (mbox_msg_t) rq->data;
-
-               if (blk_end_request(rq, 0, 0))
-                       BUG();
-
+               msg = (mbox_msg_t)rq->special;
+               blk_end_request_all(rq, 0);
                mbox->rxq->callback((void *)msg);
        }
 }
@@ -159,19 +153,19 @@ static void mbox_rx_work(struct work_struct *work)
 /*
  * Mailbox interrupt handler
  */
-static void mbox_txq_fn(struct request_queue * q)
+static void mbox_txq_fn(struct request_queue *q)
 {
 }
 
-static void mbox_rxq_fn(struct request_queue * q)
+static void mbox_rxq_fn(struct request_queue *q)
 {
 }
 
 static void __mbox_tx_interrupt(struct omap_mbox *mbox)
 {
-       disable_mbox_irq(mbox, IRQ_TX);
+       omap_mbox_disable_irq(mbox, IRQ_TX);
        ack_mbox_irq(mbox, IRQ_TX);
-       schedule_work(&mbox->txq->work);
+       tasklet_schedule(&mbox->txq->tasklet);
 }
 
 static void __mbox_rx_interrupt(struct omap_mbox *mbox)
@@ -180,32 +174,23 @@ static void __mbox_rx_interrupt(struct omap_mbox *mbox)
        mbox_msg_t msg;
        struct request_queue *q = mbox->rxq->queue;
 
-       disable_mbox_irq(mbox, IRQ_RX);
-
        while (!mbox_fifo_empty(mbox)) {
                rq = blk_get_request(q, WRITE, GFP_ATOMIC);
                if (unlikely(!rq))
                        goto nomem;
 
                msg = mbox_fifo_read(mbox);
-               rq->data = (void *)msg;
 
-               if (unlikely(mbox_seq_test(mbox, msg))) {
-                       pr_info("mbox: Illegal seq bit!(%08x)\n", msg);
-                       if (mbox->err_notify)
-                               mbox->err_notify();
-               }
 
-               blk_insert_request(q, rq, 0, NULL);
+               blk_insert_request(q, rq, 0, (void *)msg);
                if (mbox->ops->type == OMAP_MBOX_TYPE1)
                        break;
        }
 
        /* no more messages in the fifo. clear IRQ source. */
        ack_mbox_irq(mbox, IRQ_RX);
-       enable_mbox_irq(mbox, IRQ_RX);
-       nomem:
-       schedule_work(&mbox->rxq->work);
+nomem:
+       queue_work(mboxd, &mbox->rxq->work);
 }
 
 static irqreturn_t mbox_interrupt(int irq, void *p)
@@ -221,77 +206,10 @@ static irqreturn_t mbox_interrupt(int irq, void *p)
        return IRQ_HANDLED;
 }
 
-/*
- * sysfs files
- */
-static ssize_t
-omap_mbox_write(struct device *dev, struct device_attribute *attr,
-               const char * buf, size_t count)
-{
-       int ret;
-       mbox_msg_t *p = (mbox_msg_t *)buf;
-       struct omap_mbox *mbox = dev_get_drvdata(dev);
-
-       for (; count >= sizeof(mbox_msg_t); count -= sizeof(mbox_msg_t)) {
-               ret = omap_mbox_msg_send(mbox, be32_to_cpu(*p), NULL);
-               if (ret)
-                       return -EAGAIN;
-               p++;
-       }
-
-       return (size_t)((char *)p - buf);
-}
-
-static ssize_t
-omap_mbox_read(struct device *dev, struct device_attribute *attr, char *buf)
-{
-       unsigned long flags;
-       struct request *rq;
-       mbox_msg_t *p = (mbox_msg_t *) buf;
-       struct omap_mbox *mbox = dev_get_drvdata(dev);
-       struct request_queue *q = mbox->rxq->queue;
-
-       while (1) {
-               spin_lock_irqsave(q->queue_lock, flags);
-               rq = elv_next_request(q);
-               spin_unlock_irqrestore(q->queue_lock, flags);
-
-               if (!rq)
-                       break;
-
-               *p = (mbox_msg_t) rq->data;
-
-               if (blk_end_request(rq, 0, 0))
-                       BUG();
-
-               if (unlikely(mbox_seq_test(mbox, *p))) {
-                       pr_info("mbox: Illegal seq bit!(%08x) ignored\n", *p);
-                       continue;
-               }
-               p++;
-       }
-
-       pr_debug("%02x %02x %02x %02x\n", buf[0], buf[1], buf[2], buf[3]);
-
-       return (size_t) ((char *)p - buf);
-}
-
-static DEVICE_ATTR(mbox, S_IRUGO | S_IWUSR, omap_mbox_read, omap_mbox_write);
-
-static ssize_t mbox_show(struct class *class, char *buf)
-{
-       return sprintf(buf, "mbox");
-}
-
-static CLASS_ATTR(mbox, S_IRUGO, mbox_show, NULL);
-
-static struct class omap_mbox_class = {
-       .name = "omap_mbox",
-};
-
 static struct omap_mbox_queue *mbox_queue_alloc(struct omap_mbox *mbox,
-                                       request_fn_proc * proc,
-                                       void (*work) (struct work_struct *))
+                                       request_fn_proc *proc,
+                                       void (*work) (struct work_struct *),
+                                       void (*tasklet)(unsigned long))
 {
        struct request_queue *q;
        struct omap_mbox_queue *mq;
@@ -308,8 +226,11 @@ static struct omap_mbox_queue *mbox_queue_alloc(struct omap_mbox *mbox,
        q->queuedata = mbox;
        mq->queue = q;
 
-       INIT_WORK(&mq->work, work);
+       if (work)
+               INIT_WORK(&mq->work, work);
 
+       if (tasklet)
+               tasklet_init(&mq->tasklet, tasklet, (unsigned long)mbox);
        return mq;
 error:
        kfree(mq);
@@ -322,33 +243,25 @@ static void mbox_queue_free(struct omap_mbox_queue *q)
        kfree(q);
 }
 
-static int omap_mbox_init(struct omap_mbox *mbox)
+static int omap_mbox_startup(struct omap_mbox *mbox)
 {
-       int ret;
+       int ret = 0;
        struct omap_mbox_queue *mq;
 
        if (likely(mbox->ops->startup)) {
-               ret = mbox->ops->startup(mbox);
-               if (unlikely(ret))
-                       return ret;
-       }
-
-       mbox->dev.class = &omap_mbox_class;
-       strlcpy(mbox->dev.bus_id, mbox->name, BUS_ID_SIZE);
-       dev_set_drvdata(&mbox->dev, mbox);
+               write_lock(&mboxes_lock);
+               if (!mbox_configured)
+                       ret = mbox->ops->startup(mbox);
 
-       ret = device_register(&mbox->dev);
-       if (unlikely(ret))
-               goto fail_device_reg;
-
-       ret = device_create_file(&mbox->dev, &dev_attr_mbox);
-       if (unlikely(ret)) {
-               printk(KERN_ERR
-                       "device_create_file failed: %d\n", ret);
-               goto fail_create_mbox;
+               if (unlikely(ret)) {
+                       write_unlock(&mboxes_lock);
+                       return ret;
+               }
+               mbox_configured++;
+               write_unlock(&mboxes_lock);
        }
 
-       ret = request_irq(mbox->irq, mbox_interrupt, IRQF_DISABLED,
+       ret = request_irq(mbox->irq, mbox_interrupt, IRQF_SHARED,
                                mbox->name, mbox);
        if (unlikely(ret)) {
                printk(KERN_ERR
@@ -356,14 +269,14 @@ static int omap_mbox_init(struct omap_mbox *mbox)
                goto fail_request_irq;
        }
 
-       mq = mbox_queue_alloc(mbox, mbox_txq_fn, mbox_tx_work);
+       mq = mbox_queue_alloc(mbox, mbox_txq_fn, NULL, mbox_tx_tasklet);
        if (!mq) {
                ret = -ENOMEM;
                goto fail_alloc_txq;
        }
        mbox->txq = mq;
 
-       mq = mbox_queue_alloc(mbox, mbox_rxq_fn, mbox_rx_work);
+       mq = mbox_queue_alloc(mbox, mbox_rxq_fn, mbox_rx_work, NULL);
        if (!mq) {
                ret = -ENOMEM;
                goto fail_alloc_rxq;
@@ -377,10 +290,6 @@ static int omap_mbox_init(struct omap_mbox *mbox)
  fail_alloc_txq:
        free_irq(mbox->irq, mbox);
  fail_request_irq:
-       device_remove_file(&mbox->dev, &dev_attr_mbox);
- fail_create_mbox:
-       device_unregister(&mbox->dev);
- fail_device_reg:
        if (unlikely(mbox->ops->shutdown))
                mbox->ops->shutdown(mbox);
 
@@ -393,11 +302,15 @@ static void omap_mbox_fini(struct omap_mbox *mbox)
        mbox_queue_free(mbox->rxq);
 
        free_irq(mbox->irq, mbox);
-       device_remove_file(&mbox->dev, &dev_attr_mbox);
-       class_unregister(&omap_mbox_class);
 
-       if (unlikely(mbox->ops->shutdown))
-               mbox->ops->shutdown(mbox);
+       if (unlikely(mbox->ops->shutdown)) {
+               write_lock(&mboxes_lock);
+               if (mbox_configured > 0)
+                       mbox_configured--;
+               if (!mbox_configured)
+                       mbox->ops->shutdown(mbox);
+               write_unlock(&mboxes_lock);
+       }
 }
 
 static struct omap_mbox **find_mboxes(const char *name)
@@ -426,7 +339,7 @@ struct omap_mbox *omap_mbox_get(const char *name)
 
        read_unlock(&mboxes_lock);
 
-       ret = omap_mbox_init(mbox);
+       ret = omap_mbox_startup(mbox);
        if (ret)
                return ERR_PTR(-ENODEV);
 
@@ -440,7 +353,7 @@ void omap_mbox_put(struct omap_mbox *mbox)
 }
 EXPORT_SYMBOL(omap_mbox_put);
 
-int omap_mbox_register(struct omap_mbox *mbox)
+int omap_mbox_register(struct device *parent, struct omap_mbox *mbox)
 {
        int ret = 0;
        struct omap_mbox **tmp;
@@ -452,12 +365,17 @@ int omap_mbox_register(struct omap_mbox *mbox)
 
        write_lock(&mboxes_lock);
        tmp = find_mboxes(mbox->name);
-       if (*tmp)
+       if (*tmp) {
                ret = -EBUSY;
-       else
-               *tmp = mbox;
+               write_unlock(&mboxes_lock);
+               goto err_find;
+       }
+       *tmp = mbox;
        write_unlock(&mboxes_lock);
 
+       return 0;
+
+err_find:
        return ret;
 }
 EXPORT_SYMBOL(omap_mbox_register);
@@ -483,22 +401,22 @@ int omap_mbox_unregister(struct omap_mbox *mbox)
 }
 EXPORT_SYMBOL(omap_mbox_unregister);
 
-static int __init omap_mbox_class_init(void)
+static int __init omap_mbox_init(void)
 {
-       int ret = class_register(&omap_mbox_class);
-       if (!ret)
-               ret = class_create_file(&omap_mbox_class, &class_attr_mbox);
+       mboxd = create_workqueue("mboxd");
+       if (!mboxd)
+               return -ENOMEM;
 
-       return ret;
+       return 0;
 }
+module_init(omap_mbox_init);
 
-static void __exit omap_mbox_class_exit(void)
+static void __exit omap_mbox_exit(void)
 {
-       class_remove_file(&omap_mbox_class, &class_attr_mbox);
-       class_unregister(&omap_mbox_class);
+       destroy_workqueue(mboxd);
 }
+module_exit(omap_mbox_exit);
 
-subsys_initcall(omap_mbox_class_init);
-module_exit(omap_mbox_class_exit);
-
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("omap mailbox: interrupt driven messaging");
+MODULE_AUTHOR("Toshihiro Kobayashi and Hiroshi DOYU");