Skip to content
Commit bca1a100 authored by Björn Ardö's avatar Björn Ardö Committed by Jassi Brar
Browse files

mailbox: forward the hrtimer if not queued and under a lock



This reverts commit c7dacf5b,
"mailbox: avoid timer start from callback"

The previous commit was reverted since it lead to a race that
caused the hrtimer to not be started at all. The check for
hrtimer_active() in msg_submit() will return true if the
callback function txdone_hrtimer() is currently running. This
function could return HRTIMER_NORESTART and then the timer
will not be restarted, and also msg_submit() will not start
the timer. This will lead to a message actually being submitted
but no timer will start to check for its compleation.

The original fix that added checking hrtimer_active() was added to
avoid a warning with hrtimer_forward. Looking in the kernel
another solution to avoid this warning is to check hrtimer_is_queued()
before calling hrtimer_forward_now() instead. This however requires a
lock so the timer is not started by msg_submit() inbetween this check
and the hrtimer_forward() call.

Fixes: c7dacf5b ("mailbox: avoid timer start from callback")
Signed-off-by: default avatarBjörn Ardö <bjorn.ardo@axis.com>
Signed-off-by: default avatarJassi Brar <jaswinder.singh@linaro.org>
parent c25f7789
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment