mailbox: always wait in mbox_send_message for blocking Tx mode
authorSudeep Holla <sudeep.holla@arm.com>
Tue, 21 Mar 2017 11:30:14 +0000 (11:30 +0000)
committerJassi Brar <jaswinder.singh@linaro.org>
Thu, 27 Apr 2017 10:50:04 +0000 (16:20 +0530)
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>
drivers/mailbox/mailbox.c

index 59b722177bf7b8ad07a00a5c2930df9ca84e74a1..28a34cf117dc4e11fe71af4d0021f7660f4d755b 100644 (file)
@@ -260,7 +260,7 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg)
 
        msg_submit(chan);
 
-       if (chan->cl->tx_block && chan->active_req) {
+       if (chan->cl->tx_block) {
                unsigned long wait;
                int ret;