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:
parent
e8a7e48bb2
commit
d2295042b7
|
@ -48,6 +48,7 @@ struct omap_mbox_queue {
|
|||
struct tasklet_struct tasklet;
|
||||
int (*callback)(void *);
|
||||
struct omap_mbox *mbox;
|
||||
bool full;
|
||||
};
|
||||
|
||||
struct omap_mbox {
|
||||
|
|
|
@ -33,7 +33,6 @@
|
|||
|
||||
static struct workqueue_struct *mboxd;
|
||||
static struct omap_mbox **mboxes;
|
||||
static bool rq_full;
|
||||
|
||||
static int mbox_configured;
|
||||
static DEFINE_MUTEX(mbox_configured_lock);
|
||||
|
@ -148,6 +147,12 @@ static void mbox_rx_work(struct work_struct *work)
|
|||
|
||||
if (mq->callback)
|
||||
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)) {
|
||||
if (unlikely(kfifo_avail(&mq->fifo) < sizeof(msg))) {
|
||||
omap_mbox_disable_irq(mbox, IRQ_RX);
|
||||
rq_full = true;
|
||||
mq->full = true;
|
||||
goto nomem;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue