1 files changed, 51 insertions, 233 deletions

diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index 40424edae939..8e90633e4cb9 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/arch/arm/plat-omap/mailbox.c
@@ -26,55 +26,12 @@
 #include <linux/device.h>
 #include <linux/delay.h>
 
-#include <mach/mailbox.h>
-
-static int enable_seq_bit;
-module_param(enable_seq_bit, bool, 0);
-MODULE_PARM_DESC(enable_seq_bit, "Enable sequence bit checking.");
+#include <plat/mailbox.h>
 
 static struct omap_mbox *mboxes;
 static DEFINE_RWLOCK(mboxes_lock);
 
-/*
- * Mailbox sequence bit API
- */
-
-/* seq_rcv should be initialized with any value other than
- * 0 and 1 << 31, to allow either value for the first
- * message.  */
-static inline void mbox_seq_init(struct omap_mbox *mbox)
-{
-        if (!enable_seq_bit)
-                return;
-
-        /* any value other than 0 and 1 << 31 */
-        mbox->seq_rcv = 0xffffffff;
-}
-
-static inline void mbox_seq_toggle(struct omap_mbox *mbox, mbox_msg_t * msg)
-{
-        if (!enable_seq_bit)
-                return;
-
-        /* add seq_snd to msg */
-        *msg = (*msg & 0x7fffffff) | mbox->seq_snd;
-        /* flip seq_snd */
-        mbox->seq_snd ^= 1 << 31;
-}
-
-static inline int mbox_seq_test(struct omap_mbox *mbox, mbox_msg_t msg)
-{
-        mbox_msg_t seq;
-
-        if (!enable_seq_bit)
-                return 0;
-
-        seq = msg & (1 << 31);
-        if (seq == mbox->seq_rcv)
-                return -1;
-        mbox->seq_rcv = seq;
-        return 0;
-}
+static int mbox_configured;
 
 /* Mailbox FIFO handle functions */
 static inline mbox_msg_t mbox_fifo_read(struct omap_mbox *mbox)
@@ -95,14 +52,6 @@ static inline int mbox_fifo_full(struct omap_mbox *mbox)
 }
 
 /* Mailbox IRQ handle functions */
-static inline void enable_mbox_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
-{
-        mbox->ops->enable_irq(mbox, irq);
-}
-static inline void disable_mbox_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
-{
-        mbox->ops->disable_irq(mbox, irq);
-}
 static inline void ack_mbox_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
 {
         if (mbox->ops->ack_irq)
@@ -113,17 +62,10 @@ static inline int is_mbox_irq(struct omap_mbox *mbox, omap_mbox_irq_t irq)
         return mbox->ops->is_irq(mbox, irq);
 }
 
-/* Mailbox Sequence Bit function */
-void omap_mbox_init_seq(struct omap_mbox *mbox)
-{
-        mbox_seq_init(mbox);
-}
-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;
 
@@ -134,89 +76,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;
 }
 
-struct omap_msg_tx_data {
-        mbox_msg_t      msg;
-        void            *arg;
-};
 
-static void omap_msg_tx_end_io(struct request *rq, int error)
+int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg)
 {
-        kfree(rq->special);
-        __blk_put_request(rq->q, rq);
-}
 
-int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg, void* arg)
-{
-        struct omap_msg_tx_data *tx_data;
         struct request *rq;
         struct request_queue *q = mbox->txq->queue;
 
-        tx_data = kmalloc(sizeof(*tx_data), GFP_ATOMIC);
-        if (unlikely(!tx_data))
-                return -ENOMEM;
-
         rq = blk_get_request(q, WRITE, GFP_ATOMIC);
-        if (unlikely(!rq)) {
-                kfree(tx_data);
+        if (unlikely(!rq))
                 return -ENOMEM;
-        }
 
-        tx_data->msg = msg;
-        tx_data->arg = arg;
-        rq->end_io = omap_msg_tx_end_io;
-        blk_insert_request(q, rq, 0, tx_data);
+        blk_insert_request(q, rq, 0, (void *) msg);
+        tasklet_schedule(&mbox->txq->tasklet);
 
-        schedule_work(&mbox->txq->work);
         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) {
-                struct omap_msg_tx_data *tx_data;
 
-                spin_lock(q->queue_lock);
                 rq = blk_fetch_request(q);
-                spin_unlock(q->queue_lock);
 
                 if (!rq)
                         break;
 
-                tx_data = rq->special;
-
-                ret = __mbox_msg_send(mbox, tx_data->msg, tx_data->arg);
+                ret = __mbox_msg_send(mbox, (mbox_msg_t)rq->special);
                 if (ret) {
-                        enable_mbox_irq(mbox, IRQ_TX);
-                        spin_lock(q->queue_lock);
+                        omap_mbox_enable_irq(mbox, IRQ_TX);
                         blk_requeue_request(q, rq);
-                        spin_unlock(q->queue_lock);
                         return;
                 }
-
-                spin_lock(q->queue_lock);
-                __blk_end_request_all(rq, 0);
-                spin_unlock(q->queue_lock);
+                blk_end_request_all(rq, 0);
         }
 }
 
@@ -233,11 +135,6 @@ 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 = blk_fetch_request(q);
@@ -254,19 +151,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)
@@ -275,8 +172,6 @@ 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))
@@ -284,11 +179,6 @@ static void __mbox_rx_interrupt(struct omap_mbox *mbox)
 
                 msg = mbox_fifo_read(mbox);
 
-                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, (void *)msg);
                 if (mbox->ops->type == OMAP_MBOX_TYPE1)
@@ -297,7 +187,6 @@ static void __mbox_rx_interrupt(struct omap_mbox *mbox)
 
         /* 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);
 }
@@ -315,76 +204,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 = blk_fetch_request(q);
-                spin_unlock_irqrestore(q->queue_lock, flags);
-
-                if (!rq)
-                        break;
-
-                *p = (mbox_msg_t)rq->special;
-
-                blk_end_request_all(rq, 0);
-
-                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-mailbox",
-};
-
 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;
@@ -401,8 +224,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);
@@ -415,18 +241,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))
+                write_lock(&mboxes_lock);
+                if (!mbox_configured)
+                        ret = mbox->ops->startup(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
@@ -434,14 +267,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;
@@ -468,8 +301,14 @@ static void omap_mbox_fini(struct omap_mbox *mbox)
 
         free_irq(mbox->irq, mbox);
 
-        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)
@@ -498,7 +337,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);
 
@@ -522,15 +361,6 @@ int omap_mbox_register(struct device *parent, struct omap_mbox *mbox)
         if (mbox->next)
                 return -EBUSY;
 
-        mbox->dev = device_create(&omap_mbox_class,
-                                  parent, 0, mbox, "%s", mbox->name);
-        if (IS_ERR(mbox->dev))
-                return PTR_ERR(mbox->dev);
-
-        ret = device_create_file(mbox->dev, &dev_attr_mbox);
-        if (ret)
-                goto err_sysfs;
-
         write_lock(&mboxes_lock);
         tmp = find_mboxes(mbox->name);
         if (*tmp) {
@@ -544,9 +374,6 @@ int omap_mbox_register(struct device *parent, struct omap_mbox *mbox)
         return 0;
 
 err_find:
-        device_remove_file(mbox->dev, &dev_attr_mbox);
-err_sysfs:
-        device_unregister(mbox->dev);
         return ret;
 }
 EXPORT_SYMBOL(omap_mbox_register);
@@ -562,8 +389,6 @@ int omap_mbox_unregister(struct omap_mbox *mbox)
                         *tmp = mbox->next;
                         mbox->next = NULL;
                         write_unlock(&mboxes_lock);
-                        device_remove_file(mbox->dev, &dev_attr_mbox);
-                        device_unregister(mbox->dev);
                         return 0;
                 }
                 tmp = &(*tmp)->next;
@@ -574,23 +399,16 @@ 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);
-
-        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);
 }
-
-subsys_initcall(omap_mbox_class_init);
-module_exit(omap_mbox_class_exit);
+module_exit(omap_mbox_exit);
 
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("omap mailbox: interrupt driven messaging");