提交 72b917ef 编写于 作者: H Hiroshi DOYU

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: NFernando Guzman Lugo <x0095840@ti.com>
Signed-off-by: NHiroshi DOYU <Hiroshi.DOYU@nokia.com>
上级 9caae4d8
...@@ -34,6 +34,7 @@ static struct omap_mbox *mboxes; ...@@ -34,6 +34,7 @@ static struct omap_mbox *mboxes;
static DEFINE_RWLOCK(mboxes_lock); static DEFINE_RWLOCK(mboxes_lock);
static int mbox_configured; static int mbox_configured;
static DEFINE_MUTEX(mbox_configured_lock);
/* Mailbox FIFO handle functions */ /* Mailbox FIFO handle functions */
static inline mbox_msg_t mbox_fifo_read(struct omap_mbox *mbox) 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) ...@@ -250,16 +251,16 @@ static int omap_mbox_startup(struct omap_mbox *mbox)
struct omap_mbox_queue *mq; struct omap_mbox_queue *mq;
if (likely(mbox->ops->startup)) { if (likely(mbox->ops->startup)) {
write_lock(&mboxes_lock); mutex_lock(&mbox_configured_lock);
if (!mbox_configured) if (!mbox_configured)
ret = mbox->ops->startup(mbox); ret = mbox->ops->startup(mbox);
if (unlikely(ret)) { if (unlikely(ret)) {
write_unlock(&mboxes_lock); mutex_unlock(&mbox_configured_lock);
return ret; return ret;
} }
mbox_configured++; mbox_configured++;
write_unlock(&mboxes_lock); mutex_unlock(&mbox_configured_lock);
} }
ret = request_irq(mbox->irq, mbox_interrupt, IRQF_SHARED, ret = request_irq(mbox->irq, mbox_interrupt, IRQF_SHARED,
...@@ -306,12 +307,12 @@ static void omap_mbox_fini(struct omap_mbox *mbox) ...@@ -306,12 +307,12 @@ static void omap_mbox_fini(struct omap_mbox *mbox)
mbox_queue_free(mbox->rxq); mbox_queue_free(mbox->rxq);
if (unlikely(mbox->ops->shutdown)) { if (unlikely(mbox->ops->shutdown)) {
write_lock(&mboxes_lock); mutex_lock(&mbox_configured_lock);
if (mbox_configured > 0) if (mbox_configured > 0)
mbox_configured--; mbox_configured--;
if (!mbox_configured) if (!mbox_configured)
mbox->ops->shutdown(mbox); mbox->ops->shutdown(mbox);
write_unlock(&mboxes_lock); mutex_unlock(&mbox_configured_lock);
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册