UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: firewire-motu: update isochronous resources when starting packet streaming after bus-reset 

After bus reset, isochronous resource manager releases all of allocated
isochronous resources. The nodes to transfer isochronous packet should
request reallocation of the resources.

However, between the bus-reset and invocation of 'struct fw_driver.update'
handler, ALSA PCM application can detect this situation by XRUN because
the target device cancelled to transmit packets once bus-reset occurs.

Due to the above mechanism, ALSA fireface driver just stops packet
streaming in the update handler, thus pcm.prepare handler should
request the reallocation.

This commit requests the reallocation in pcm.prepare callback when
bus generation is changed.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2019-06-17 17:15:09 +09:00 committed by Takashi Iwai
parent 8edc56ec8f
commit 2d103420c6
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/firewire/motu/motu-stream.c
View File

@ -236,6 +236,7 @@ static int ensure_packet_formats(struct snd_motu *motu)
int snd_motu_stream_start_duplex(struct snd_motu *motu)
{
unsigned int generation = motu->rx_resources.generation;
int err = 0;
if (motu->substreams_counter == 0)
@ -245,6 +246,16 @@ int snd_motu_stream_start_duplex(struct snd_motu *motu)
amdtp_streaming_error(&motu->tx_stream))
finish_session(motu);
if (generation != fw_parent_device(motu->unit)->card->generation) {
err = fw_iso_resources_update(&motu->rx_resources);
if (err < 0)
return err;
err = fw_iso_resources_update(&motu->tx_resources);
if (err < 0)
return err;
}
if (!amdtp_stream_running(&motu->rx_stream)) {
err = ensure_packet_formats(motu);
if (err < 0)