[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1360645032-9668-7-git-send-email-s-anna@ti.com>
Date: Mon, 11 Feb 2013 22:57:05 -0600
From: Suman Anna <s-anna@...com>
To: Greg Kroah-Hartman <greg@...uxfoundation.org>
CC: Linus Walleij <linus.walleij@...aro.org>,
Russell King <linux@....linux.org.uk>,
Tony Lindgren <tony@...mide.com>,
Arnd Bergmann <arnd@...db.de>,
Ohad Ben-Cohen <ohad@...ery.com>,
Paul Walmsley <paul@...an.com>,
Benoit Cousson <b-cousson@...com>,
Loic Pallardy <loic.pallardy@...com>,
Omar Ramirez Luna <omar.ramirez@...itl.com>,
<linux-omap@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-kernel@...r.kernel.org>,
Mark Brown <broonie@...nsource.wolfsonmicro.com>,
Janusz Krzysztofik <jkrzyszt@....icnet.pl>,
Dom Cobley <popcornmix@...il.com>,
Wim Van Sebroeck <wim@...ana.be>,
Felipe Contreras <felipe.contreras@...ia.com>,
Tejun Heo <tj@...nel.org>,
Omar Ramirez Luna <omar.luna@...aro.org>
Subject: [PATCH v2 06/13] mailbox: change protection mechanisms
From: Loic Pallardy <loic.pallardy@...com>
TX: replace spin by mutex to release CPU
during wait on mailbox resource.
Signed-off-by: Loic Pallardy <loic.pallardy@...com>
Signed-off-by: Linus Walleij <linus.walleij@...aro.org>
---
drivers/mailbox/mailbox.c | 5 +++--
drivers/mailbox/mailbox_internal.h | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index 6b43e7c..ff6595a 100644
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -94,7 +94,7 @@ int mailbox_msg_send(struct mailbox *mbox, struct mailbox_msg *msg)
struct mailbox_queue *mq = mbox->txq;
int ret = 0, len;
- spin_lock_bh(&mq->lock);
+ mutex_lock(&mq->mlock);
if (kfifo_avail(&mq->fifo) < (sizeof(msg) + msg->size)) {
ret = -ENOMEM;
@@ -118,7 +118,7 @@ int mailbox_msg_send(struct mailbox *mbox, struct mailbox_msg *msg)
tasklet_schedule(&mbox->txq->tasklet);
out:
- spin_unlock_bh(&mq->lock);
+ mutex_unlock(&mq->mlock);
return ret;
}
EXPORT_SYMBOL(mailbox_msg_send);
@@ -289,6 +289,7 @@ static struct mailbox_queue *mbox_queue_alloc(struct mailbox *mbox,
return NULL;
spin_lock_init(&mq->lock);
+ mutex_init(&mq->mlock);
if (kfifo_alloc(&mq->fifo, mbox_kfifo_size, GFP_KERNEL))
goto error;
diff --git a/drivers/mailbox/mailbox_internal.h b/drivers/mailbox/mailbox_internal.h
index ba03910..04f83bf 100644
--- a/drivers/mailbox/mailbox_internal.h
+++ b/drivers/mailbox/mailbox_internal.h
@@ -45,6 +45,7 @@ struct mailbox_ops {
struct mailbox_queue {
spinlock_t lock;
+ struct mutex mlock;
struct kfifo fifo;
struct work_struct work;
struct tasklet_struct tasklet;
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists