ALSA: firewire-digi00x: perform sequence replay for media clock recovery

This commit takes ALSA firewire-digi00x driver to perform sequence replay
for media clock recovery.

All of models in Digidesign digi00x family don't transfer isochronous
packets till receiving isochronous packets. The on-the-fly mode is used
for the purpose. They don't interpret presentation time expressed in syt
field of received CIP, therefore the sequence of the number of data blocks
per packet is important for media clock recovery.

The sequence replay is tested with below models:

* Digidesign Digi 002
* Digidesign Digi 002 Rack
* Digidesign Digi 003
* Digidesign Digi 003 Rack

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210531025103.17880-5-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/digi00x/amdtp-dot.c b/sound/firewire/digi00x/amdtp-dot.c
index 398c57a6fb43724c10e0762954c52a3c8d90bfcf..59b86c8d89e13bf888a07350fb99e25edaef8771 100644 (file)
--- a/sound/firewire/digi00x/amdtp-dot.c
+++ b/sound/firewire/digi00x/amdtp-dot.c
@@ -396,16 +396,13 @@ int amdtp_dot_init(struct amdtp_stream *s, struct fw_unit *unit,
                 enum amdtp_stream_direction dir)
 {
        amdtp_stream_process_ctx_payloads_t process_ctx_payloads;
-       unsigned int flags;
+       unsigned int flags = CIP_NONBLOCKING | CIP_UNAWARE_SYT;
 
        // Use different mode between incoming/outgoing.
-       if (dir == AMDTP_IN_STREAM) {
-               flags = CIP_NONBLOCKING;
+       if (dir == AMDTP_IN_STREAM)
                process_ctx_payloads = process_ir_ctx_payloads;
-       } else {
-               flags = CIP_BLOCKING;
+       else
                process_ctx_payloads = process_it_ctx_payloads;
-       }
 
        return amdtp_stream_init(s, unit, dir, flags, CIP_FMT_AM,
                                process_ctx_payloads, sizeof(struct amdtp_dot));

diff --git a/sound/firewire/digi00x/digi00x-stream.c b/sound/firewire/digi00x/digi00x-stream.c
index 2019f653347731daf36ed92b93f16e1a67ea9f02..a15f55b0dce377002b69e6678b89d011828655ed 100644 (file)
--- a/sound/firewire/digi00x/digi00x-stream.c
+++ b/sound/firewire/digi00x/digi00x-stream.c
@@ -7,7 +7,7 @@
 
 #include "digi00x.h"
 
-#define READY_TIMEOUT_MS       500
+#define READY_TIMEOUT_MS       200
 
 const unsigned int snd_dg00x_stream_rates[SND_DG00X_RATE_COUNT] = {
        [SND_DG00X_RATE_44100] = 44100,
@@ -375,7 +375,11 @@ int snd_dg00x_stream_start_duplex(struct snd_dg00x *dg00x)
                if (err < 0)
                        goto error;
 
-               err = amdtp_domain_start(&dg00x->domain, 0, false, false);
+               // NOTE: The device doesn't start packet transmission till receiving any packet.
+               // It ignores presentation time expressed by the value of syt field of CIP header
+               // in received packets. The sequence of the number of data blocks per packet is
+               // important for media clock recovery.
+               err = amdtp_domain_start(&dg00x->domain, 0, true, true);
                if (err < 0)
                        goto error;