summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanigeri, Hari <h-kanigeri2@ti.com>2010-11-29 20:24:13 +0000
committerHari Kanigeri <h-kanigeri2@ti.com>2010-12-02 05:43:16 -0600
commita42743c26a53a2a5f2b2018a9659ab3fb604d5bc (patch)
treef25f038eeed91eb7b9e66ad9cc2b071657823837
parentab66ac3007cb3e59fe80dfcf36aff243d3008cb9 (diff)
OMAP: mailbox: send message in process context
Schedule the Tasklet to send only when mailbox fifo is full and there are pending messages in kfifo, else send the message directly in the Process context. This would avoid needless scheduling of Tasklet for every message transfer Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com> Acked-by: Hiroshi Doyu <hiroshi.doyu@nokia.com>
-rw-r--r--arch/arm/plat-omap/mailbox.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index d9aa87c0a92..cc58b44325f 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/arch/arm/plat-omap/mailbox.c
@@ -92,20 +92,25 @@ int omap_mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg)
struct omap_mbox_queue *mq = mbox->txq;
int ret = 0, len;
- spin_lock(&mq->lock);
+ spin_lock_bh(&mq->lock);
if (kfifo_avail(&mq->fifo) < sizeof(msg)) {
ret = -ENOMEM;
goto out;
}
+ if (kfifo_is_empty(&mq->fifo) && !__mbox_poll_for_space(mbox)) {
+ mbox_fifo_write(mbox, msg);
+ goto out;
+ }
+
len = kfifo_in(&mq->fifo, (unsigned char *)&msg, sizeof(msg));
WARN_ON(len != sizeof(msg));
tasklet_schedule(&mbox->txq->tasklet);
out:
- spin_unlock(&mq->lock);
+ spin_unlock_bh(&mq->lock);
return ret;
}
EXPORT_SYMBOL(omap_mbox_msg_send);