[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1395168376-29200-1-git-send-email-jaswinder.singh@linaro.org>
Date: Wed, 19 Mar 2014 00:16:16 +0530
From: Jassi Brar <jassisinghbrar@...il.com>
To: linux-kernel@...r.kernel.org
Cc: gregkh@...uxfoundation.org, s-anna@...com, tony@...mide.com,
omar.ramirez@...itl.com, loic.pallardy@...com,
lftan.linux@...il.com, slapdau@...oo.com.au,
courtney.cavin@...ymobile.com, rafael.j.wysocki@...el.com,
robherring2@...il.com, arnd@...db.de, joshc@...eaurora.org,
linus.walleij@...aro.org, galak@...eaurora.org,
ks.giri@...sung.com, Jassi Brar <jaswinder.singh@...aro.org>
Subject: [PATCHv4 4/5] mailbox: Fix TX completion init
From: LeyFoon Tan <lftan.linux@...il.com>
For fast TX the complete could be called before being initialized as follows
mbox_send_message --> poll_txdone --> tx_tick --> complete(&chan->tx_complete)
Init the completion early enough to fix the race.
Signed-off-by: LeyFoon Tan <lftan.linux@...il.com>
Signed-off-by: Jassi Brar <jaswinder.singh@...aro.org>
---
drivers/mailbox/mailbox.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index 79d576e..cdf7d45 100644
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -278,6 +278,9 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg)
if (!chan || !chan->cl)
return -EINVAL;
+ if (chan->cl->tx_block)
+ init_completion(&chan->tx_complete);
+
t = _add_to_rbuf(chan, mssg);
if (t < 0) {
pr_err("Try increasing MBOX_TX_QUEUE_LEN\n");
@@ -291,7 +294,6 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg)
if (chan->cl->tx_block && chan->active_req) {
int ret;
- init_completion(&chan->tx_complete);
ret = wait_for_completion_timeout(&chan->tx_complete,
chan->cl->tx_tout);
if (ret == 0) {
--
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