]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
usb: musb: cppi41: restart hrtimer only if not yet done
authorThomas Gleixner <tglx@linutronix.de>
Thu, 2 Oct 2014 15:32:16 +0000 (17:32 +0200)
committerJiri Slaby <jslaby@suse.cz>
Thu, 13 Nov 2014 18:02:49 +0000 (19:02 +0100)
commitcd4386a94a23465eb28dfdce149e3cce72839588
treedf60cd13e385a531515d29d68af9af8766f6d7f7
parent45b5df583c2c1d0e68f09e18b6c88cf476c6354e
usb: musb: cppi41: restart hrtimer only if not yet done

commit d2e6d62c9cbbc2da4211f672dbeea08960e29a80 upstream.

commit c58d80f52 ("usb: musb: Ensure that cppi41 timer gets armed on
premature DMA TX irq") fixed hrtimer scheduling bug. There is one left
which does not trigger that often.
The following scenario is still possible:

    lock(&x->lock);
    hrtimer_start(&x->t);
    unlock(&x->lock);

expires:
    t->function();
                                lock(&x->lock);
    lock(&x->lock);             if (!hrtimer_queued(&x->t))
                                        hrtimer_start(&x->t);
                                unlock(&x->lock);

    if (!list_empty(x->early_tx_list))
           ret = HRTIMER_RESTART;
->         hrtimer_forward_now(...)
    } else
           ret = HRTIMER_NORESTART;

    unlock(&x->lock);

and the timer callback returns HRTIMER_RESTART for an armed timer. This
is wrong and we run into the BUG_ON() in __run_hrtimer().
This can happens on SMP or PREEMPT-RT.
The patch fixes the problem by only starting the timer if the timer is
not yet queued.

Reported-by: Torben Hohn <torbenh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
[bigeasy: collected information and created a patch + description based
          on it]
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/usb/musb/musb_cppi41.c