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

ALSA: firewire-digi00x: support AMDTP domain 

This commit adds AMDTP domain support for ALSA firewire-digi00x driver.

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-08-04 15:21:34 +09:00 committed by Takashi Iwai
parent e9f21129b8
commit 9a08067ec3
2 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
sound/firewire/digi00x/digi00x-stream.c
View File

@ -126,9 +126,6 @@ static void finish_session(struct snd_dg00x *dg00x)
{ {
__be32 data; __be32 data;
amdtp_stream_stop(&dg00x->tx_stream);
amdtp_stream_stop(&dg00x->rx_stream);
data = cpu_to_be32(0x00000003); data = cpu_to_be32(0x00000003);
snd_fw_transaction(dg00x->unit, TCODE_WRITE_QUADLET_REQUEST, snd_fw_transaction(dg00x->unit, TCODE_WRITE_QUADLET_REQUEST,
DG00X_ADDR_BASE + DG00X_OFFSET_STREAMING_SET, DG00X_ADDR_BASE + DG00X_OFFSET_STREAMING_SET,
@ -265,13 +262,23 @@ int snd_dg00x_stream_init_duplex(struct snd_dg00x *dg00x)
if (err < 0) if (err < 0)
destroy_stream(dg00x, &dg00x->rx_stream); destroy_stream(dg00x, &dg00x->rx_stream);
err = amdtp_domain_init(&dg00x->domain);
if (err < 0) {
destroy_stream(dg00x, &dg00x->rx_stream);
destroy_stream(dg00x, &dg00x->tx_stream);
}
return err; return err;
} }
// This function should be called before starting streams or after stopping /*
// streams. * This function should be called before starting streams or after stopping
* streams.
*/
void snd_dg00x_stream_destroy_duplex(struct snd_dg00x *dg00x) void snd_dg00x_stream_destroy_duplex(struct snd_dg00x *dg00x)
{ {
amdtp_domain_destroy(&dg00x->domain);
destroy_stream(dg00x, &dg00x->rx_stream); destroy_stream(dg00x, &dg00x->rx_stream);
destroy_stream(dg00x, &dg00x->tx_stream); destroy_stream(dg00x, &dg00x->tx_stream);
} }
@ -288,6 +295,8 @@ int snd_dg00x_stream_reserve_duplex(struct snd_dg00x *dg00x, unsigned int rate)
rate = curr_rate; rate = curr_rate;
if (dg00x->substreams_counter == 0 || curr_rate != rate) { if (dg00x->substreams_counter == 0 || curr_rate != rate) {
amdtp_domain_stop(&dg00x->domain);
finish_session(dg00x); finish_session(dg00x);
fw_iso_resources_free(&dg00x->tx_resources); fw_iso_resources_free(&dg00x->tx_resources);
@ -320,8 +329,10 @@ int snd_dg00x_stream_start_duplex(struct snd_dg00x *dg00x)
return 0; return 0;
if (amdtp_streaming_error(&dg00x->tx_stream) || if (amdtp_streaming_error(&dg00x->tx_stream) ||
amdtp_streaming_error(&dg00x->rx_stream)) amdtp_streaming_error(&dg00x->rx_stream)) {
amdtp_domain_stop(&dg00x->domain);
finish_session(dg00x); finish_session(dg00x);
}
if (generation != fw_parent_device(dg00x->unit)->card->generation) { if (generation != fw_parent_device(dg00x->unit)->card->generation) {
err = fw_iso_resources_update(&dg00x->tx_resources); err = fw_iso_resources_update(&dg00x->tx_resources);
@ -338,36 +349,30 @@ int snd_dg00x_stream_start_duplex(struct snd_dg00x *dg00x)
* which source of clock is used. * which source of clock is used.
*/ */
if (!amdtp_stream_running(&dg00x->rx_stream)) { if (!amdtp_stream_running(&dg00x->rx_stream)) {
int spd = fw_parent_device(dg00x->unit)->max_speed;
err = begin_session(dg00x); err = begin_session(dg00x);
if (err < 0) if (err < 0)
goto error; goto error;
err = amdtp_stream_start(&dg00x->rx_stream, err = amdtp_domain_add_stream(&dg00x->domain, &dg00x->rx_stream,
dg00x->rx_resources.channel, dg00x->rx_resources.channel, spd);
fw_parent_device(dg00x->unit)->max_speed); if (err < 0)
goto error;
err = amdtp_domain_add_stream(&dg00x->domain, &dg00x->tx_stream,
dg00x->tx_resources.channel, spd);
if (err < 0)
goto error;
err = amdtp_domain_start(&dg00x->domain);
if (err < 0) if (err < 0)
goto error; goto error;
if (!amdtp_stream_wait_callback(&dg00x->rx_stream, if (!amdtp_stream_wait_callback(&dg00x->rx_stream,
CALLBACK_TIMEOUT)) { CALLBACK_TIMEOUT) ||
err = -ETIMEDOUT; !amdtp_stream_wait_callback(&dg00x->tx_stream,
goto error; CALLBACK_TIMEOUT)) {
}
}
/*
* The value of SYT field in transmitted packets is always 0x0000. Thus,
* duplex streams with timestamp synchronization cannot be built.
*/
if (!amdtp_stream_running(&dg00x->tx_stream)) {
err = amdtp_stream_start(&dg00x->tx_stream,
dg00x->tx_resources.channel,
fw_parent_device(dg00x->unit)->max_speed);
if (err < 0)
goto error;
if (!amdtp_stream_wait_callback(&dg00x->tx_stream,
CALLBACK_TIMEOUT)) {
err = -ETIMEDOUT; err = -ETIMEDOUT;
goto error; goto error;
} }
@ -375,6 +380,7 @@ int snd_dg00x_stream_start_duplex(struct snd_dg00x *dg00x)
return 0; return 0;
error: error:
amdtp_domain_stop(&dg00x->domain);
finish_session(dg00x); finish_session(dg00x);
return err; return err;
@ -383,6 +389,7 @@ error:
void snd_dg00x_stream_stop_duplex(struct snd_dg00x *dg00x) void snd_dg00x_stream_stop_duplex(struct snd_dg00x *dg00x)
{ {
if (dg00x->substreams_counter == 0) { if (dg00x->substreams_counter == 0) {
amdtp_domain_stop(&dg00x->domain);
finish_session(dg00x); finish_session(dg00x);
fw_iso_resources_free(&dg00x->tx_resources); fw_iso_resources_free(&dg00x->tx_resources);

2
sound/firewire/digi00x/digi00x.h
View File

@ -59,6 +59,8 @@ struct snd_dg00x {
/* Console models have additional MIDI ports for control surface. */ /* Console models have additional MIDI ports for control surface. */
bool is_console; bool is_console;
struct amdtp_domain domain;
}; };
#define DG00X_ADDR_BASE 0xffffe0000000ull #define DG00X_ADDR_BASE 0xffffe0000000ull