diff options
author | Sudeep Holla <sudeep.holla@arm.com> | 2017-03-21 12:30:14 +0100 |
---|---|---|
committer | Jassi Brar <jaswinder.singh@linaro.org> | 2017-04-27 12:50:04 +0200 |
commit | c61b781ee084e69855477d23dd33e7e6caad652c (patch) | |
tree | 8c480b9a20cc24f9d92d83e81f775441eb0314a7 /drivers/mailbox | |
parent | mailbox: Remove depends on COMPILE_TEST for BCM_FLEXRM_MBOX (diff) | |
download | linux-c61b781ee084e69855477d23dd33e7e6caad652c.tar.xz linux-c61b781ee084e69855477d23dd33e7e6caad652c.zip |
mailbox: always wait in mbox_send_message for blocking Tx mode
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>
Diffstat (limited to 'drivers/mailbox')
-rw-r--r-- | drivers/mailbox/mailbox.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index 59b722177bf7..28a34cf117dc 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -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; |