Mailbox: new mutext lock for h/w mailbox configuration
mailbox startup and shutdown are being executed against a single H/W module, and a mailbox H/W module is totally __independent__ of the registration of logical mailboxes. So, an independent mutext should be used for startup and shutdown. Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com> Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
This commit is contained in:
parent
9caae4d87c
commit
72b917ef90
|
@ -34,6 +34,7 @@ static struct omap_mbox *mboxes;
|
|||
static DEFINE_RWLOCK(mboxes_lock);
|
||||
|
||||
static int mbox_configured;
|
||||
static DEFINE_MUTEX(mbox_configured_lock);
|
||||
|
||||
/* Mailbox FIFO handle functions */
|
||||
static inline mbox_msg_t mbox_fifo_read(struct omap_mbox *mbox)
|
||||
|
@ -250,16 +251,16 @@ static int omap_mbox_startup(struct omap_mbox *mbox)
|
|||
struct omap_mbox_queue *mq;
|
||||
|
||||
if (likely(mbox->ops->startup)) {
|
||||
write_lock(&mboxes_lock);
|
||||
mutex_lock(&mbox_configured_lock);
|
||||
if (!mbox_configured)
|
||||
ret = mbox->ops->startup(mbox);
|
||||
|
||||
if (unlikely(ret)) {
|
||||
write_unlock(&mboxes_lock);
|
||||
mutex_unlock(&mbox_configured_lock);
|
||||
return ret;
|
||||
}
|
||||
mbox_configured++;
|
||||
write_unlock(&mboxes_lock);
|
||||
mutex_unlock(&mbox_configured_lock);
|
||||
}
|
||||
|
||||
ret = request_irq(mbox->irq, mbox_interrupt, IRQF_SHARED,
|
||||
|
@ -306,12 +307,12 @@ static void omap_mbox_fini(struct omap_mbox *mbox)
|
|||
mbox_queue_free(mbox->rxq);
|
||||
|
||||
if (unlikely(mbox->ops->shutdown)) {
|
||||
write_lock(&mboxes_lock);
|
||||
mutex_lock(&mbox_configured_lock);
|
||||
if (mbox_configured > 0)
|
||||
mbox_configured--;
|
||||
if (!mbox_configured)
|
||||
mbox->ops->shutdown(mbox);
|
||||
write_unlock(&mboxes_lock);
|
||||
mutex_unlock(&mbox_configured_lock);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue