UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

OMAP: mailbox: change full flag per mailbox queue instead of global 

The variable rq_full flag is a global variable, so if there are multiple
mailbox users there will be conflicts. Now there is a full flag per
mailbox queue.

Reported-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>
Acked-by: Hiroshi Doyu <hiroshi.doyu@nokia.com>
This commit is contained in:
Fernando Guzman Lugo 2010-11-29 20:24:11 +00:00 committed by Hari Kanigeri
parent e8a7e48bb2
commit d2295042b7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/plat-omap/include/plat/mailbox.h
View File

@ -48,6 +48,7 @@ struct omap_mbox_queue {
struct tasklet_struct tasklet; struct tasklet_struct tasklet;
int (*callback)(void *); int (*callback)(void *);
struct omap_mbox *mbox; struct omap_mbox *mbox;
bool full;
}; };
struct omap_mbox { struct omap_mbox {

9
arch/arm/plat-omap/mailbox.c
View File

@ -33,7 +33,6 @@
static struct workqueue_struct *mboxd; static struct workqueue_struct *mboxd;
static struct omap_mbox **mboxes; static struct omap_mbox **mboxes;
static bool rq_full;
static int mbox_configured; static int mbox_configured;
static DEFINE_MUTEX(mbox_configured_lock); static DEFINE_MUTEX(mbox_configured_lock);
@ -148,6 +147,12 @@ static void mbox_rx_work(struct work_struct *work)
if (mq->callback) if (mq->callback)
mq->callback((void *)msg); mq->callback((void *)msg);
spin_lock_irq(&mq->lock);
if (mq->full) {
mq->full = false;
omap_mbox_enable_irq(mq->mbox, IRQ_RX);
}
spin_unlock_irq(&mq->lock);
} }
} }
@ -170,7 +175,7 @@ static void __mbox_rx_interrupt(struct omap_mbox *mbox)
while (!mbox_fifo_empty(mbox)) { while (!mbox_fifo_empty(mbox)) {
if (unlikely(kfifo_avail(&mq->fifo) < sizeof(msg))) { if (unlikely(kfifo_avail(&mq->fifo) < sizeof(msg))) {
omap_mbox_disable_irq(mbox, IRQ_RX); omap_mbox_disable_irq(mbox, IRQ_RX);
rq_full = true; mq->full = true;
goto nomem; goto nomem;
} }