[for-3.18,12/15] mailbox: always wait in mbox_send_message for blocking Tx mode

Message ID 1501015526-32178-13-git-send-email-amit.pundir@linaro.org
State New
Headers show
  • Stable candidates for 3.18.y
Related show

Commit Message

Amit Pundir July 25, 2017, 8:45 p.m.
From: Sudeep Holla <sudeep.holla@arm.com>

commit c61b781ee084e69855477d23dd33e7e6caad652c upstream.

There exists a race when msg_submit return immediately as there was an
active request being processed which may have completed just before it's
checked again in mbox_send_message. This will result in return to the
caller without waiting in mbox_send_message even when it's blocking Tx.

This patch fixes the issue by waiting for the completion always if Tx
is in blocking mode.

Fixes: 2b6d83e2b8b7 ("mailbox: Introduce framework for mailbox")
Reported-by: Alexey Klimov <alexey.klimov@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

Reviewed-by: Alexey Klimov <alexey.klimov@arm.com>

Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>

[AmitP: fixed a minor cherry-pick conflict on 3.18.y]
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

 drivers/mailbox/mailbox.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index afcb430508ec..2691cb75b2e8 100644
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -255,7 +255,7 @@  int mbox_send_message(struct mbox_chan *chan, void *mssg)
 	if (chan->txdone_method	== TXDONE_BY_POLL)
 		poll_txdone((unsigned long)chan->mbox);
-	if (chan->cl->tx_block && chan->active_req) {
+	if (chan->cl->tx_block) {
 		unsigned long wait;
 		int ret;