Commit 4dba76fe authored by Sudeep Holla's avatar Sudeep Holla Committed by Sasha Levin

mailbox: skip complete wait event if timer expired

[ Upstream commit cc6eeaa3 ]

If a wait_for_completion_timeout() call returns due to a timeout,
complete() can get called after returning from the wait which is
incorrect and can cause subsequent transmissions on a channel to fail.
Since the wait_for_completion_timeout() sees the completion variable
is non-zero caused by the erroneous/spurious complete() call, and
it immediately returns without waiting for the time as expected by the
client.

This patch fixes the issue by skipping complete() call for the timer
expiry.

Fixes: 2b6d83e2 ("mailbox: Introduce framework for mailbox")
Reported-by: default avatarAlexey Klimov <alexey.klimov@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarJassi Brar <jaswinder.singh@linaro.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent c7d4b67d
...@@ -108,7 +108,7 @@ static void tx_tick(struct mbox_chan *chan, int r) ...@@ -108,7 +108,7 @@ static void tx_tick(struct mbox_chan *chan, int r)
if (mssg && chan->cl->tx_done) if (mssg && chan->cl->tx_done)
chan->cl->tx_done(chan->cl, mssg, r); chan->cl->tx_done(chan->cl, mssg, r);
if (chan->cl->tx_block) if (r != -ETIME && chan->cl->tx_block)
complete(&chan->tx_complete); complete(&chan->tx_complete);
} }
...@@ -269,8 +269,8 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg) ...@@ -269,8 +269,8 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg)
ret = wait_for_completion_timeout(&chan->tx_complete, wait); ret = wait_for_completion_timeout(&chan->tx_complete, wait);
if (ret == 0) { if (ret == 0) {
t = -EIO; t = -ETIME;
tx_tick(chan, -EIO); tx_tick(chan, t);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment