ALSA: bebob: give up updating streams at bus reset handler

DM1000/DM1100/DM1500 chipsets transfer packets with discontinue value in
'dbc' field of CIP header. For ALSA bebob driver, this makes its bus-reset
handler meaningless, because the discontinuity is detected quite earlier
than executing the handler.

This commit gives up updating streams at the bus reset handler.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c
index 671179eaff1e47f1f2feda0e422cf16230c1113e..3e4e0756e3febfeb90547f5f9085f13f6d948451 100644 (file)
--- a/sound/firewire/bebob/bebob.c
+++ b/sound/firewire/bebob/bebob.c
@@ -300,6 +300,22 @@ error:
        return err;
 }
 
+/*
+ * This driver doesn't update streams in bus reset handler.
+ *
+ * DM1000/ DM1100/DM1500 chipsets with BeBoB firmware transfer packets with
+ * discontinued counter at bus reset. This discontinuity is immediately
+ * detected in packet streaming layer, then it sets XRUN to PCM substream.
+ *
+ * ALSA PCM applications can know the XRUN by getting -EPIPE from PCM operation.
+ * Then, they can recover the PCM substream by executing ioctl(2) with
+ * SNDRV_PCM_IOCTL_PREPARE. 'struct snd_pcm_ops.prepare' is called and drivers
+ * restart packet streaming.
+ *
+ * The above processing may be executed before this bus-reset handler is
+ * executed. When this handler updates streams with current isochronous
+ * channels, the streams already have the current ones.
+ */
 static void
 bebob_update(struct fw_unit *unit)
 {
@@ -310,10 +326,6 @@ bebob_update(struct fw_unit *unit)
 
        fcp_bus_reset(bebob->unit);
 
-       mutex_lock(&bebob->mutex);
-       snd_bebob_stream_update_duplex(bebob);
-       mutex_unlock(&bebob->mutex);
-
        if (bebob->deferred_registration) {
                if (snd_card_register(bebob->card) < 0) {
                        snd_bebob_stream_destroy_duplex(bebob);

diff --git a/sound/firewire/bebob/bebob.h b/sound/firewire/bebob/bebob.h
index 4fe58e422133931097d8876ac10781bbeedecd3b..b50bb33d9d46616b1186143b03495b309967f770 100644 (file)
--- a/sound/firewire/bebob/bebob.h
+++ b/sound/firewire/bebob/bebob.h
@@ -217,7 +217,6 @@ int snd_bebob_stream_discover(struct snd_bebob *bebob);
 int snd_bebob_stream_init_duplex(struct snd_bebob *bebob);
 int snd_bebob_stream_start_duplex(struct snd_bebob *bebob, unsigned int rate);
 void snd_bebob_stream_stop_duplex(struct snd_bebob *bebob);
-void snd_bebob_stream_update_duplex(struct snd_bebob *bebob);
 void snd_bebob_stream_destroy_duplex(struct snd_bebob *bebob);
 
 void snd_bebob_stream_lock_changed(struct snd_bebob *bebob);

diff --git a/sound/firewire/bebob/bebob_stream.c b/sound/firewire/bebob/bebob_stream.c
index 8c687456a0e6dbb31866493f49a3aded626b7b58..77cbb02bff342271555398bbd582ab5a4a578bed 100644 (file)
--- a/sound/firewire/bebob/bebob_stream.c
+++ b/sound/firewire/bebob/bebob_stream.c
@@ -746,21 +746,6 @@ void snd_bebob_stream_stop_duplex(struct snd_bebob *bebob)
        }
 }
 
-void snd_bebob_stream_update_duplex(struct snd_bebob *bebob)
-{
-       if ((cmp_connection_update(&bebob->in_conn) < 0) ||
-           (cmp_connection_update(&bebob->out_conn) < 0)) {
-               amdtp_stream_pcm_abort(&bebob->rx_stream);
-               amdtp_stream_pcm_abort(&bebob->tx_stream);
-               amdtp_stream_stop(&bebob->rx_stream);
-               amdtp_stream_stop(&bebob->tx_stream);
-               break_both_connections(bebob);
-       } else {
-               amdtp_stream_update(&bebob->rx_stream);
-               amdtp_stream_update(&bebob->tx_stream);
-       }
-}
-
 /*
  * This function should be called before starting streams or after stopping
  * streams.