1 files changed, 272 insertions, 171 deletions

diff --git a/sound/usb/line6/pcm.c b/sound/usb/line6/pcm.c
index 8a6059adef69..8461d6bf992f 100644
--- a/sound/usb/line6/pcm.c
+++ b/sound/usb/line6/pcm.c
@@ -45,15 +45,22 @@ static int snd_line6_impulse_volume_put(struct snd_kcontrol *kcontrol,
 {
         struct snd_line6_pcm *line6pcm = snd_kcontrol_chip(kcontrol);
         int value = ucontrol->value.integer.value[0];
+        int err;
 
         if (line6pcm->impulse_volume == value)
                 return 0;
 
         line6pcm->impulse_volume = value;
-        if (value > 0)
-                line6_pcm_acquire(line6pcm, LINE6_BITS_PCM_IMPULSE);
-        else
-                line6_pcm_release(line6pcm, LINE6_BITS_PCM_IMPULSE);
+        if (value > 0) {
+                err = line6_pcm_acquire(line6pcm, LINE6_STREAM_IMPULSE);
+                if (err < 0) {
+                        line6pcm->impulse_volume = 0;
+                        line6_pcm_release(line6pcm, LINE6_STREAM_IMPULSE);
+                        return err;
+                }
+        } else {
+                line6_pcm_release(line6pcm, LINE6_STREAM_IMPULSE);
+        }
         return 1;
 }
 
@@ -90,180 +97,277 @@ static int snd_line6_impulse_period_put(struct snd_kcontrol *kcontrol,
         return 1;
 }
 
-static bool test_flags(unsigned long flags0, unsigned long flags1,
-                       unsigned long mask)
-{
-        return ((flags0 & mask) == 0) && ((flags1 & mask) != 0);
-}
-
-int line6_pcm_acquire(struct snd_line6_pcm *line6pcm, int channels)
+/*
+        Unlink all currently active URBs.
+*/
+static void line6_unlink_audio_urbs(struct snd_line6_pcm *line6pcm,
+                                    struct line6_pcm_stream *pcms)
 {
-        unsigned long flags_old, flags_new, flags_final;
-        int err;
-
-        do {
-                flags_old = ACCESS_ONCE(line6pcm->flags);
-                flags_new = flags_old | channels;
-        } while (cmpxchg(&line6pcm->flags, flags_old, flags_new) != flags_old);
-
-        flags_final = flags_old;
-
-        line6pcm->prev_fbuf = NULL;
-
-        if (test_flags(flags_old, flags_new, LINE6_BITS_CAPTURE_BUFFER)) {
-                /* Invoked multiple times in a row so allocate once only */
-                if (!line6pcm->buffer_in) {
-                        line6pcm->buffer_in =
-                                kmalloc(LINE6_ISO_BUFFERS * LINE6_ISO_PACKETS *
-                                        line6pcm->max_packet_size, GFP_KERNEL);
-                        if (!line6pcm->buffer_in) {
-                                err = -ENOMEM;
-                                goto pcm_acquire_error;
-                        }
-
-                        flags_final |= channels & LINE6_BITS_CAPTURE_BUFFER;
-                }
-        }
+        int i;
 
-        if (test_flags(flags_old, flags_new, LINE6_BITS_CAPTURE_STREAM)) {
-                /*
-                   Waiting for completion of active URBs in the stop handler is
-                   a bug, we therefore report an error if capturing is restarted
-                   too soon.
-                 */
-                if (line6pcm->active_urb_in | line6pcm->unlink_urb_in) {
-                        dev_err(line6pcm->line6->ifcdev, "Device not yet ready\n");
-                        return -EBUSY;
+        for (i = 0; i < LINE6_ISO_BUFFERS; i++) {
+                if (test_bit(i, &pcms->active_urbs)) {
+                        if (!test_and_set_bit(i, &pcms->unlink_urbs))
+                                usb_unlink_urb(pcms->urbs[i]);
                 }
-
-                line6pcm->count_in = 0;
-                line6pcm->prev_fsize = 0;
-                err = line6_submit_audio_in_all_urbs(line6pcm);
-
-                if (err < 0)
-                        goto pcm_acquire_error;
-
-                flags_final |= channels & LINE6_BITS_CAPTURE_STREAM;
         }
+}
 
-        if (test_flags(flags_old, flags_new, LINE6_BITS_PLAYBACK_BUFFER)) {
-                /* Invoked multiple times in a row so allocate once only */
-                if (!line6pcm->buffer_out) {
-                        line6pcm->buffer_out =
-                                kmalloc(LINE6_ISO_BUFFERS * LINE6_ISO_PACKETS *
-                                        line6pcm->max_packet_size, GFP_KERNEL);
-                        if (!line6pcm->buffer_out) {
-                                err = -ENOMEM;
-                                goto pcm_acquire_error;
-                        }
-
-                        flags_final |= channels & LINE6_BITS_PLAYBACK_BUFFER;
-                }
-        }
+/*
+        Wait until unlinking of all currently active URBs has been finished.
+*/
+static void line6_wait_clear_audio_urbs(struct snd_line6_pcm *line6pcm,
+                                        struct line6_pcm_stream *pcms)
+{
+        int timeout = HZ;
+        int i;
+        int alive;
 
-        if (test_flags(flags_old, flags_new, LINE6_BITS_PLAYBACK_STREAM)) {
-                /*
-                  See comment above regarding PCM restart.
-                */
-                if (line6pcm->active_urb_out | line6pcm->unlink_urb_out) {
-                        dev_err(line6pcm->line6->ifcdev, "Device not yet ready\n");
-                        return -EBUSY;
+        do {
+                alive = 0;
+                for (i = 0; i < LINE6_ISO_BUFFERS; i++) {
+                        if (test_bit(i, &pcms->active_urbs))
+                                alive++;
                 }
+                if (!alive)
+                        break;
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout(1);
+        } while (--timeout > 0);
+        if (alive)
+                dev_err(line6pcm->line6->ifcdev,
+                        "timeout: still %d active urbs..\n", alive);
+}
 
-                line6pcm->count_out = 0;
-                err = line6_submit_audio_out_all_urbs(line6pcm);
-
-                if (err < 0)
-                        goto pcm_acquire_error;
+static inline struct line6_pcm_stream *
+get_stream(struct snd_line6_pcm *line6pcm, int direction)
+{
+        return (direction == SNDRV_PCM_STREAM_PLAYBACK) ?
+                &line6pcm->out : &line6pcm->in;
+}
 
-                flags_final |= channels & LINE6_BITS_PLAYBACK_STREAM;
+/* allocate a buffer if not opened yet;
+ * call this in line6pcm.state_change mutex
+ */
+static int line6_buffer_acquire(struct snd_line6_pcm *line6pcm,
+                                struct line6_pcm_stream *pstr, int type)
+{
+        /* Invoked multiple times in a row so allocate once only */
+        if (!test_and_set_bit(type, &pstr->opened) && !pstr->buffer) {
+                pstr->buffer = kmalloc(LINE6_ISO_BUFFERS * LINE6_ISO_PACKETS *
+                                       line6pcm->max_packet_size, GFP_KERNEL);
+                if (!pstr->buffer)
+                        return -ENOMEM;
         }
-
         return 0;
-
-pcm_acquire_error:
-        /*
-           If not all requested resources/streams could be obtained, release
-           those which were successfully obtained (if any).
-        */
-        line6_pcm_release(line6pcm, flags_final & channels);
-        return err;
 }
-EXPORT_SYMBOL_GPL(line6_pcm_acquire);
 
-int line6_pcm_release(struct snd_line6_pcm *line6pcm, int channels)
+/* free a buffer if all streams are closed;
+ * call this in line6pcm.state_change mutex
+ */
+static void line6_buffer_release(struct snd_line6_pcm *line6pcm,
+                                 struct line6_pcm_stream *pstr, int type)
 {
-        unsigned long flags_old, flags_new;
-
-        do {
-                flags_old = ACCESS_ONCE(line6pcm->flags);
-                flags_new = flags_old & ~channels;
-        } while (cmpxchg(&line6pcm->flags, flags_old, flags_new) != flags_old);
 
-        if (test_flags(flags_new, flags_old, LINE6_BITS_CAPTURE_STREAM))
-                line6_unlink_audio_in_urbs(line6pcm);
-
-        if (test_flags(flags_new, flags_old, LINE6_BITS_CAPTURE_BUFFER)) {
-                line6_wait_clear_audio_in_urbs(line6pcm);
-                line6_free_capture_buffer(line6pcm);
+        clear_bit(type, &pstr->opened);
+        if (!pstr->opened) {
+                line6_wait_clear_audio_urbs(line6pcm, pstr);
+                kfree(pstr->buffer);
+                pstr->buffer = NULL;
         }
+}
 
-        if (test_flags(flags_new, flags_old, LINE6_BITS_PLAYBACK_STREAM))
-                line6_unlink_audio_out_urbs(line6pcm);
+/* start a PCM stream */
+static int line6_stream_start(struct snd_line6_pcm *line6pcm, int direction,
+                              int type)
+{
+        unsigned long flags;
+        struct line6_pcm_stream *pstr = get_stream(line6pcm, direction);
+        int ret = 0;
+
+        spin_lock_irqsave(&pstr->lock, flags);
+        if (!test_and_set_bit(type, &pstr->running)) {
+                if (pstr->active_urbs || pstr->unlink_urbs) {
+                        ret = -EBUSY;
+                        goto error;
+                }
 
-        if (test_flags(flags_new, flags_old, LINE6_BITS_PLAYBACK_BUFFER)) {
-                line6_wait_clear_audio_out_urbs(line6pcm);
-                line6_free_playback_buffer(line6pcm);
+                pstr->count = 0;
+                /* Submit all currently available URBs */
+                if (direction == SNDRV_PCM_STREAM_PLAYBACK)
+                        ret = line6_submit_audio_out_all_urbs(line6pcm);
+                else
+                        ret = line6_submit_audio_in_all_urbs(line6pcm);
         }
+ error:
+        if (ret < 0)
+                clear_bit(type, &pstr->running);
+        spin_unlock_irqrestore(&pstr->lock, flags);
+        return ret;
+}
 
-        return 0;
+/* stop a PCM stream; this doesn't sync with the unlinked URBs */
+static void line6_stream_stop(struct snd_line6_pcm *line6pcm, int direction,
+                          int type)
+{
+        unsigned long flags;
+        struct line6_pcm_stream *pstr = get_stream(line6pcm, direction);
+
+        spin_lock_irqsave(&pstr->lock, flags);
+        clear_bit(type, &pstr->running);
+        if (!pstr->running) {
+                line6_unlink_audio_urbs(line6pcm, pstr);
+                if (direction == SNDRV_PCM_STREAM_CAPTURE) {
+                        line6pcm->prev_fbuf = NULL;
+                        line6pcm->prev_fsize = 0;
+                }
+        }
+        spin_unlock_irqrestore(&pstr->lock, flags);
 }
-EXPORT_SYMBOL_GPL(line6_pcm_release);
 
-/* trigger callback */
+/* common PCM trigger callback */
 int snd_line6_trigger(struct snd_pcm_substream *substream, int cmd)
 {
         struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
         struct snd_pcm_substream *s;
         int err;
 
-        spin_lock(&line6pcm->lock_trigger);
-        clear_bit(LINE6_INDEX_PREPARED, &line6pcm->flags);
+        clear_bit(LINE6_FLAG_PREPARED, &line6pcm->flags);
 
         snd_pcm_group_for_each_entry(s, substream) {
                 if (s->pcm->card != substream->pcm->card)
                         continue;
-                switch (s->stream) {
-                case SNDRV_PCM_STREAM_PLAYBACK:
-                        err = snd_line6_playback_trigger(line6pcm, cmd);
 
-                        if (err < 0) {
-                                spin_unlock(&line6pcm->lock_trigger);
+                switch (cmd) {
+                case SNDRV_PCM_TRIGGER_START:
+                case SNDRV_PCM_TRIGGER_RESUME:
+                        err = line6_stream_start(line6pcm, s->stream,
+                                                 LINE6_STREAM_PCM);
+                        if (err < 0)
                                 return err;
-                        }
-
                         break;
 
-                case SNDRV_PCM_STREAM_CAPTURE:
-                        err = snd_line6_capture_trigger(line6pcm, cmd);
+                case SNDRV_PCM_TRIGGER_STOP:
+                case SNDRV_PCM_TRIGGER_SUSPEND:
+                        line6_stream_stop(line6pcm, s->stream,
+                                          LINE6_STREAM_PCM);
+                        break;
 
-                        if (err < 0) {
-                                spin_unlock(&line6pcm->lock_trigger);
-                                return err;
-                        }
+                case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+                        if (s->stream != SNDRV_PCM_STREAM_PLAYBACK)
+                                return -EINVAL;
+                        set_bit(LINE6_FLAG_PAUSE_PLAYBACK, &line6pcm->flags);
+                        break;
 
+                case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+                        if (s->stream != SNDRV_PCM_STREAM_PLAYBACK)
+                                return -EINVAL;
+                        clear_bit(LINE6_FLAG_PAUSE_PLAYBACK, &line6pcm->flags);
                         break;
 
                 default:
-                        dev_err(line6pcm->line6->ifcdev,
-                                "Unknown stream direction %d\n", s->stream);
+                        return -EINVAL;
                 }
         }
 
-        spin_unlock(&line6pcm->lock_trigger);
         return 0;
 }
 
+/* common PCM pointer callback */
+snd_pcm_uframes_t snd_line6_pointer(struct snd_pcm_substream *substream)
+{
+        struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
+        struct line6_pcm_stream *pstr = get_stream(line6pcm, substream->stream);
+
+        return pstr->pos_done;
+}
+
+/* Acquire and start duplex streams:
+ * type is either LINE6_STREAM_IMPULSE or LINE6_STREAM_MONITOR
+ */
+int line6_pcm_acquire(struct snd_line6_pcm *line6pcm, int type)
+{
+        struct line6_pcm_stream *pstr;
+        int ret = 0, dir;
+
+        mutex_lock(&line6pcm->state_mutex);
+        for (dir = 0; dir < 2; dir++) {
+                pstr = get_stream(line6pcm, dir);
+                ret = line6_buffer_acquire(line6pcm, pstr, type);
+                if (ret < 0)
+                        goto error;
+                if (!pstr->running)
+                        line6_wait_clear_audio_urbs(line6pcm, pstr);
+        }
+        for (dir = 0; dir < 2; dir++) {
+                ret = line6_stream_start(line6pcm, dir, type);
+                if (ret < 0)
+                        goto error;
+        }
+ error:
+        mutex_unlock(&line6pcm->state_mutex);
+        if (ret < 0)
+                line6_pcm_release(line6pcm, type);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(line6_pcm_acquire);
+
+/* Stop and release duplex streams */
+void line6_pcm_release(struct snd_line6_pcm *line6pcm, int type)
+{
+        struct line6_pcm_stream *pstr;
+        int dir;
+
+        mutex_lock(&line6pcm->state_mutex);
+        for (dir = 0; dir < 2; dir++)
+                line6_stream_stop(line6pcm, dir, type);
+        for (dir = 0; dir < 2; dir++) {
+                pstr = get_stream(line6pcm, dir);
+                line6_buffer_release(line6pcm, pstr, type);
+        }
+        mutex_unlock(&line6pcm->state_mutex);
+}
+EXPORT_SYMBOL_GPL(line6_pcm_release);
+
+/* common PCM hw_params callback */
+int snd_line6_hw_params(struct snd_pcm_substream *substream,
+                        struct snd_pcm_hw_params *hw_params)
+{
+        int ret;
+        struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
+        struct line6_pcm_stream *pstr = get_stream(line6pcm, substream->stream);
+
+        mutex_lock(&line6pcm->state_mutex);
+        ret = line6_buffer_acquire(line6pcm, pstr, LINE6_STREAM_PCM);
+        if (ret < 0)
+                goto error;
+
+        ret = snd_pcm_lib_malloc_pages(substream,
+                                       params_buffer_bytes(hw_params));
+        if (ret < 0) {
+                line6_buffer_release(line6pcm, pstr, LINE6_STREAM_PCM);
+                goto error;
+        }
+
+        pstr->period = params_period_bytes(hw_params);
+ error:
+        mutex_unlock(&line6pcm->state_mutex);
+        return ret;
+}
+
+/* common PCM hw_free callback */
+int snd_line6_hw_free(struct snd_pcm_substream *substream)
+{
+        struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
+        struct line6_pcm_stream *pstr = get_stream(line6pcm, substream->stream);
+
+        mutex_lock(&line6pcm->state_mutex);
+        line6_buffer_release(line6pcm, pstr, LINE6_STREAM_PCM);
+        mutex_unlock(&line6pcm->state_mutex);
+        return snd_pcm_lib_free_pages(substream);
+}
+
+
 /* control info callback */
 static int snd_line6_control_playback_info(struct snd_kcontrol *kcontrol,
                                            struct snd_ctl_elem_info *uinfo)
@@ -282,7 +386,7 @@ static int snd_line6_control_playback_get(struct snd_kcontrol *kcontrol,
         int i;
         struct snd_line6_pcm *line6pcm = snd_kcontrol_chip(kcontrol);
 
-        for (i = 2; i--;)
+        for (i = 0; i < 2; i++)
                 ucontrol->value.integer.value[i] = line6pcm->volume_playback[i];
 
         return 0;
@@ -295,7 +399,7 @@ static int snd_line6_control_playback_put(struct snd_kcontrol *kcontrol,
         int i, changed = 0;
         struct snd_line6_pcm *line6pcm = snd_kcontrol_chip(kcontrol);
 
-        for (i = 2; i--;)
+        for (i = 0; i < 2; i++)
                 if (line6pcm->volume_playback[i] !=
                     ucontrol->value.integer.value[i]) {
                         line6pcm->volume_playback[i] =
@@ -334,21 +438,24 @@ static struct snd_kcontrol_new line6_controls[] = {
 /*
         Cleanup the PCM device.
 */
-static void line6_cleanup_pcm(struct snd_pcm *pcm)
+static void cleanup_urbs(struct line6_pcm_stream *pcms)
 {
         int i;
-        struct snd_line6_pcm *line6pcm = snd_pcm_chip(pcm);
 
-        for (i = LINE6_ISO_BUFFERS; i--;) {
-                if (line6pcm->urb_audio_out[i]) {
-                        usb_kill_urb(line6pcm->urb_audio_out[i]);
-                        usb_free_urb(line6pcm->urb_audio_out[i]);
-                }
-                if (line6pcm->urb_audio_in[i]) {
-                        usb_kill_urb(line6pcm->urb_audio_in[i]);
-                        usb_free_urb(line6pcm->urb_audio_in[i]);
+        for (i = 0; i < LINE6_ISO_BUFFERS; i++) {
+                if (pcms->urbs[i]) {
+                        usb_kill_urb(pcms->urbs[i]);
+                        usb_free_urb(pcms->urbs[i]);
                 }
         }
+}
+
+static void line6_cleanup_pcm(struct snd_pcm *pcm)
+{
+        struct snd_line6_pcm *line6pcm = snd_pcm_chip(pcm);
+
+        cleanup_urbs(&line6pcm->out);
+        cleanup_urbs(&line6pcm->in);
         kfree(line6pcm);
 }
 
@@ -383,8 +490,10 @@ static int snd_line6_new_pcm(struct usb_line6 *line6, struct snd_pcm **pcm_ret)
 */
 void line6_pcm_disconnect(struct snd_line6_pcm *line6pcm)
 {
-        line6_unlink_wait_clear_audio_out_urbs(line6pcm);
-        line6_unlink_wait_clear_audio_in_urbs(line6pcm);
+        line6_unlink_audio_urbs(line6pcm, &line6pcm->out);
+        line6_unlink_audio_urbs(line6pcm, &line6pcm->in);
+        line6_wait_clear_audio_urbs(line6pcm, &line6pcm->out);
+        line6_wait_clear_audio_urbs(line6pcm, &line6pcm->in);
 }
 
 /*
@@ -411,6 +520,7 @@ int line6_init_pcm(struct usb_line6 *line6,
         if (!line6pcm)
                 return -ENOMEM;
 
+        mutex_init(&line6pcm->state_mutex);
         line6pcm->pcm = pcm;
         line6pcm->properties = properties;
         line6pcm->volume_playback[0] = line6pcm->volume_playback[1] = 255;
@@ -424,9 +534,8 @@ int line6_init_pcm(struct usb_line6 *line6,
                         usb_maxpacket(line6->usbdev,
                                 usb_sndisocpipe(line6->usbdev, ep_write), 1));
 
-        spin_lock_init(&line6pcm->lock_audio_out);
-        spin_lock_init(&line6pcm->lock_audio_in);
-        spin_lock_init(&line6pcm->lock_trigger);
+        spin_lock_init(&line6pcm->out.lock);
+        spin_lock_init(&line6pcm->in.lock);
         line6pcm->impulse_period = LINE6_IMPULSE_DEFAULT_PERIOD;
 
         line6->line6pcm = line6pcm;
@@ -458,30 +567,22 @@ EXPORT_SYMBOL_GPL(line6_init_pcm);
 int snd_line6_prepare(struct snd_pcm_substream *substream)
 {
         struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
-
-        switch (substream->stream) {
-        case SNDRV_PCM_STREAM_PLAYBACK:
-                if ((line6pcm->flags & LINE6_BITS_PLAYBACK_STREAM) == 0)
-                        line6_unlink_wait_clear_audio_out_urbs(line6pcm);
-
-                break;
-
-        case SNDRV_PCM_STREAM_CAPTURE:
-                if ((line6pcm->flags & LINE6_BITS_CAPTURE_STREAM) == 0)
-                        line6_unlink_wait_clear_audio_in_urbs(line6pcm);
-
-                break;
-        }
-
-        if (!test_and_set_bit(LINE6_INDEX_PREPARED, &line6pcm->flags)) {
-                line6pcm->count_out = 0;
-                line6pcm->pos_out = 0;
-                line6pcm->pos_out_done = 0;
-                line6pcm->bytes_out = 0;
-                line6pcm->count_in = 0;
-                line6pcm->pos_in_done = 0;
-                line6pcm->bytes_in = 0;
+        struct line6_pcm_stream *pstr = get_stream(line6pcm, substream->stream);
+
+        mutex_lock(&line6pcm->state_mutex);
+        if (!pstr->running)
+                line6_wait_clear_audio_urbs(line6pcm, pstr);
+
+        if (!test_and_set_bit(LINE6_FLAG_PREPARED, &line6pcm->flags)) {
+                line6pcm->out.count = 0;
+                line6pcm->out.pos = 0;
+                line6pcm->out.pos_done = 0;
+                line6pcm->out.bytes = 0;
+                line6pcm->in.count = 0;
+                line6pcm->in.pos_done = 0;
+                line6pcm->in.bytes = 0;
         }
 
+        mutex_unlock(&line6pcm->state_mutex);
         return 0;
 }