Merge branch 'for-next' into for-linus

[cascardo/linux.git] / sound / core / hrtimer.c

diff --git a/sound/core/hrtimer.c b/sound/core/hrtimer.c
index 656d9a9..e2f2702 100644 (file)
--- a/sound/core/hrtimer.c
+++ b/sound/core/hrtimer.c
@@ -38,37 +38,53 @@ static unsigned int resolution;
 struct snd_hrtimer {
        struct snd_timer *timer;
        struct hrtimer hrt;
-       atomic_t running;
+       bool in_callback;
 };
 
 static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt)
 {
        struct snd_hrtimer *stime = container_of(hrt, struct snd_hrtimer, hrt);
        struct snd_timer *t = stime->timer;
-       unsigned long oruns;
-
-       if (!atomic_read(&stime->running))
-               return HRTIMER_NORESTART;
-
-       oruns = hrtimer_forward_now(hrt, ns_to_ktime(t->sticks * resolution));
-       snd_timer_interrupt(stime->timer, t->sticks * oruns);
+       ktime_t delta;
+       unsigned long ticks;
+       enum hrtimer_restart ret = HRTIMER_NORESTART;
+
+       spin_lock(&t->lock);
+       if (!t->running)
+               goto out; /* fast path */
+       stime->in_callback = true;
+       ticks = t->sticks;
+       spin_unlock(&t->lock);
+
+       /* calculate the drift */
+       delta = ktime_sub(hrt->base->get_time(), hrtimer_get_expires(hrt));
+       if (delta.tv64 > 0)
+               ticks += ktime_divns(delta, ticks * resolution);
+
+       snd_timer_interrupt(stime->timer, ticks);
+
+       spin_lock(&t->lock);
+       if (t->running) {
+               hrtimer_add_expires_ns(hrt, t->sticks * resolution);
+               ret = HRTIMER_RESTART;
+       }
 
-       if (!atomic_read(&stime->running))
-               return HRTIMER_NORESTART;
-       return HRTIMER_RESTART;
+       stime->in_callback = false;
+ out:
+       spin_unlock(&t->lock);
+       return ret;
 }
 
 static int snd_hrtimer_open(struct snd_timer *t)
 {
        struct snd_hrtimer *stime;
 
-       stime = kmalloc(sizeof(*stime), GFP_KERNEL);
+       stime = kzalloc(sizeof(*stime), GFP_KERNEL);
        if (!stime)
                return -ENOMEM;
        hrtimer_init(&stime->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
        stime->timer = t;
        stime->hrt.function = snd_hrtimer_callback;
-       atomic_set(&stime->running, 0);
        t->private_data = stime;
        return 0;
 }
@@ -78,6 +94,11 @@ static int snd_hrtimer_close(struct snd_timer *t)
        struct snd_hrtimer *stime = t->private_data;
 
        if (stime) {
+               spin_lock_irq(&t->lock);
+               t->running = 0; /* just to be sure */
+               stime->in_callback = 1; /* skip start/stop */
+               spin_unlock_irq(&t->lock);
+
                hrtimer_cancel(&stime->hrt);
                kfree(stime);
                t->private_data = NULL;
@@ -89,18 +110,19 @@ static int snd_hrtimer_start(struct snd_timer *t)
 {
        struct snd_hrtimer *stime = t->private_data;
 
-       atomic_set(&stime->running, 0);
-       hrtimer_try_to_cancel(&stime->hrt);
+       if (stime->in_callback)
+               return 0;
        hrtimer_start(&stime->hrt, ns_to_ktime(t->sticks * resolution),
                      HRTIMER_MODE_REL);
-       atomic_set(&stime->running, 1);
        return 0;
 }
 
 static int snd_hrtimer_stop(struct snd_timer *t)
 {
        struct snd_hrtimer *stime = t->private_data;
-       atomic_set(&stime->running, 0);
+
+       if (stime->in_callback)
+               return 0;
        hrtimer_try_to_cancel(&stime->hrt);
        return 0;
 }