Messages in this thread Patch in this message | | | From | Jassi Brar <> | Subject | [PATCHv5 3/4] mailbox: Fix TX completion init | Date | Thu, 15 May 2014 11:41:41 +0530 |
| |
From: LeyFoon Tan <lftan.linux@gmail.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@gmail.com> Signed-off-by: Jassi Brar <jaswinder.singh@linaro.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 921fedd3..befb256 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -245,6 +245,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"); @@ -258,7 +261,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
| |