forked from Minki/linux
0f925660a7
In error path of snd_dice_stream_init_duplex(), stream data for incoming
packet can be left to be initialized.
This commit fixes it.
Fixes: 436b5abe22
('ALSA: dice: handle whole available isochronous streams')
Cc: <stable@vger.kernel.org> # v4.6+
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
524 lines
12 KiB
C
524 lines
12 KiB
C
/*
|
|
* dice_stream.c - a part of driver for DICE based devices
|
|
*
|
|
* Copyright (c) Clemens Ladisch <clemens@ladisch.de>
|
|
* Copyright (c) 2014 Takashi Sakamoto <o-takashi@sakamocchi.jp>
|
|
*
|
|
* Licensed under the terms of the GNU General Public License, version 2.
|
|
*/
|
|
|
|
#include "dice.h"
|
|
|
|
#define CALLBACK_TIMEOUT 200
|
|
#define NOTIFICATION_TIMEOUT_MS (2 * MSEC_PER_SEC)
|
|
|
|
struct reg_params {
|
|
unsigned int count;
|
|
unsigned int size;
|
|
};
|
|
|
|
const unsigned int snd_dice_rates[SND_DICE_RATES_COUNT] = {
|
|
/* mode 0 */
|
|
[0] = 32000,
|
|
[1] = 44100,
|
|
[2] = 48000,
|
|
/* mode 1 */
|
|
[3] = 88200,
|
|
[4] = 96000,
|
|
/* mode 2 */
|
|
[5] = 176400,
|
|
[6] = 192000,
|
|
};
|
|
|
|
/*
|
|
* This operation has an effect to synchronize GLOBAL_STATUS/GLOBAL_SAMPLE_RATE
|
|
* to GLOBAL_STATUS. Especially, just after powering on, these are different.
|
|
*/
|
|
static int ensure_phase_lock(struct snd_dice *dice)
|
|
{
|
|
__be32 reg, nominal;
|
|
int err;
|
|
|
|
err = snd_dice_transaction_read_global(dice, GLOBAL_CLOCK_SELECT,
|
|
®, sizeof(reg));
|
|
if (err < 0)
|
|
return err;
|
|
|
|
if (completion_done(&dice->clock_accepted))
|
|
reinit_completion(&dice->clock_accepted);
|
|
|
|
err = snd_dice_transaction_write_global(dice, GLOBAL_CLOCK_SELECT,
|
|
®, sizeof(reg));
|
|
if (err < 0)
|
|
return err;
|
|
|
|
if (wait_for_completion_timeout(&dice->clock_accepted,
|
|
msecs_to_jiffies(NOTIFICATION_TIMEOUT_MS)) == 0) {
|
|
/*
|
|
* Old versions of Dice firmware transfer no notification when
|
|
* the same clock status as current one is set. In this case,
|
|
* just check current clock status.
|
|
*/
|
|
err = snd_dice_transaction_read_global(dice, GLOBAL_STATUS,
|
|
&nominal, sizeof(nominal));
|
|
if (err < 0)
|
|
return err;
|
|
if (!(be32_to_cpu(nominal) & STATUS_SOURCE_LOCKED))
|
|
return -ETIMEDOUT;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int get_register_params(struct snd_dice *dice,
|
|
struct reg_params *tx_params,
|
|
struct reg_params *rx_params)
|
|
{
|
|
__be32 reg[2];
|
|
int err;
|
|
|
|
err = snd_dice_transaction_read_tx(dice, TX_NUMBER, reg, sizeof(reg));
|
|
if (err < 0)
|
|
return err;
|
|
tx_params->count =
|
|
min_t(unsigned int, be32_to_cpu(reg[0]), MAX_STREAMS);
|
|
tx_params->size = be32_to_cpu(reg[1]) * 4;
|
|
|
|
err = snd_dice_transaction_read_rx(dice, RX_NUMBER, reg, sizeof(reg));
|
|
if (err < 0)
|
|
return err;
|
|
rx_params->count =
|
|
min_t(unsigned int, be32_to_cpu(reg[0]), MAX_STREAMS);
|
|
rx_params->size = be32_to_cpu(reg[1]) * 4;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void release_resources(struct snd_dice *dice)
|
|
{
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < MAX_STREAMS; i++) {
|
|
if (amdtp_stream_running(&dice->tx_stream[i])) {
|
|
amdtp_stream_pcm_abort(&dice->tx_stream[i]);
|
|
amdtp_stream_stop(&dice->tx_stream[i]);
|
|
}
|
|
if (amdtp_stream_running(&dice->rx_stream[i])) {
|
|
amdtp_stream_pcm_abort(&dice->rx_stream[i]);
|
|
amdtp_stream_stop(&dice->rx_stream[i]);
|
|
}
|
|
|
|
fw_iso_resources_free(&dice->tx_resources[i]);
|
|
fw_iso_resources_free(&dice->rx_resources[i]);
|
|
}
|
|
}
|
|
|
|
static void stop_streams(struct snd_dice *dice, enum amdtp_stream_direction dir,
|
|
struct reg_params *params)
|
|
{
|
|
__be32 reg;
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < params->count; i++) {
|
|
reg = cpu_to_be32((u32)-1);
|
|
if (dir == AMDTP_IN_STREAM) {
|
|
snd_dice_transaction_write_tx(dice,
|
|
params->size * i + TX_ISOCHRONOUS,
|
|
®, sizeof(reg));
|
|
} else {
|
|
snd_dice_transaction_write_rx(dice,
|
|
params->size * i + RX_ISOCHRONOUS,
|
|
®, sizeof(reg));
|
|
}
|
|
}
|
|
}
|
|
|
|
static int keep_resources(struct snd_dice *dice,
|
|
enum amdtp_stream_direction dir, unsigned int index,
|
|
unsigned int rate, unsigned int pcm_chs,
|
|
unsigned int midi_ports)
|
|
{
|
|
struct amdtp_stream *stream;
|
|
struct fw_iso_resources *resources;
|
|
bool double_pcm_frames;
|
|
unsigned int i;
|
|
int err;
|
|
|
|
if (dir == AMDTP_IN_STREAM) {
|
|
stream = &dice->tx_stream[index];
|
|
resources = &dice->tx_resources[index];
|
|
} else {
|
|
stream = &dice->rx_stream[index];
|
|
resources = &dice->rx_resources[index];
|
|
}
|
|
|
|
/*
|
|
* At 176.4/192.0 kHz, Dice has a quirk to transfer two PCM frames in
|
|
* one data block of AMDTP packet. Thus sampling transfer frequency is
|
|
* a half of PCM sampling frequency, i.e. PCM frames at 192.0 kHz are
|
|
* transferred on AMDTP packets at 96 kHz. Two successive samples of a
|
|
* channel are stored consecutively in the packet. This quirk is called
|
|
* as 'Dual Wire'.
|
|
* For this quirk, blocking mode is required and PCM buffer size should
|
|
* be aligned to SYT_INTERVAL.
|
|
*/
|
|
double_pcm_frames = rate > 96000;
|
|
if (double_pcm_frames) {
|
|
rate /= 2;
|
|
pcm_chs *= 2;
|
|
}
|
|
|
|
err = amdtp_am824_set_parameters(stream, rate, pcm_chs, midi_ports,
|
|
double_pcm_frames);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
if (double_pcm_frames) {
|
|
pcm_chs /= 2;
|
|
|
|
for (i = 0; i < pcm_chs; i++) {
|
|
amdtp_am824_set_pcm_position(stream, i, i * 2);
|
|
amdtp_am824_set_pcm_position(stream, i + pcm_chs,
|
|
i * 2 + 1);
|
|
}
|
|
}
|
|
|
|
return fw_iso_resources_allocate(resources,
|
|
amdtp_stream_get_max_payload(stream),
|
|
fw_parent_device(dice->unit)->max_speed);
|
|
}
|
|
|
|
static int start_streams(struct snd_dice *dice, enum amdtp_stream_direction dir,
|
|
unsigned int rate, struct reg_params *params)
|
|
{
|
|
__be32 reg[2];
|
|
unsigned int i, pcm_chs, midi_ports;
|
|
struct amdtp_stream *streams;
|
|
struct fw_iso_resources *resources;
|
|
struct fw_device *fw_dev = fw_parent_device(dice->unit);
|
|
int err = 0;
|
|
|
|
if (dir == AMDTP_IN_STREAM) {
|
|
streams = dice->tx_stream;
|
|
resources = dice->tx_resources;
|
|
} else {
|
|
streams = dice->rx_stream;
|
|
resources = dice->rx_resources;
|
|
}
|
|
|
|
for (i = 0; i < params->count; i++) {
|
|
if (dir == AMDTP_IN_STREAM) {
|
|
err = snd_dice_transaction_read_tx(dice,
|
|
params->size * i + TX_NUMBER_AUDIO,
|
|
reg, sizeof(reg));
|
|
} else {
|
|
err = snd_dice_transaction_read_rx(dice,
|
|
params->size * i + RX_NUMBER_AUDIO,
|
|
reg, sizeof(reg));
|
|
}
|
|
if (err < 0)
|
|
return err;
|
|
pcm_chs = be32_to_cpu(reg[0]);
|
|
midi_ports = be32_to_cpu(reg[1]);
|
|
|
|
err = keep_resources(dice, dir, i, rate, pcm_chs, midi_ports);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
reg[0] = cpu_to_be32(resources[i].channel);
|
|
if (dir == AMDTP_IN_STREAM) {
|
|
err = snd_dice_transaction_write_tx(dice,
|
|
params->size * i + TX_ISOCHRONOUS,
|
|
reg, sizeof(reg[0]));
|
|
} else {
|
|
err = snd_dice_transaction_write_rx(dice,
|
|
params->size * i + RX_ISOCHRONOUS,
|
|
reg, sizeof(reg[0]));
|
|
}
|
|
if (err < 0)
|
|
return err;
|
|
|
|
if (dir == AMDTP_IN_STREAM) {
|
|
reg[0] = cpu_to_be32(fw_dev->max_speed);
|
|
err = snd_dice_transaction_write_tx(dice,
|
|
params->size * i + TX_SPEED,
|
|
reg, sizeof(reg[0]));
|
|
if (err < 0)
|
|
return err;
|
|
}
|
|
|
|
err = amdtp_stream_start(&streams[i], resources[i].channel,
|
|
fw_dev->max_speed);
|
|
if (err < 0)
|
|
return err;
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
/*
|
|
* MEMO: After this function, there're two states of streams:
|
|
* - None streams are running.
|
|
* - All streams are running.
|
|
*/
|
|
int snd_dice_stream_start_duplex(struct snd_dice *dice, unsigned int rate)
|
|
{
|
|
unsigned int curr_rate;
|
|
unsigned int i;
|
|
struct reg_params tx_params, rx_params;
|
|
bool need_to_start;
|
|
int err;
|
|
|
|
if (dice->substreams_counter == 0)
|
|
return -EIO;
|
|
|
|
err = get_register_params(dice, &tx_params, &rx_params);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
err = snd_dice_transaction_get_rate(dice, &curr_rate);
|
|
if (err < 0) {
|
|
dev_err(&dice->unit->device,
|
|
"fail to get sampling rate\n");
|
|
return err;
|
|
}
|
|
if (rate == 0)
|
|
rate = curr_rate;
|
|
if (rate != curr_rate)
|
|
return -EINVAL;
|
|
|
|
/* Judge to need to restart streams. */
|
|
for (i = 0; i < MAX_STREAMS; i++) {
|
|
if (i < tx_params.count) {
|
|
if (amdtp_streaming_error(&dice->tx_stream[i]) ||
|
|
!amdtp_stream_running(&dice->tx_stream[i]))
|
|
break;
|
|
}
|
|
if (i < rx_params.count) {
|
|
if (amdtp_streaming_error(&dice->rx_stream[i]) ||
|
|
!amdtp_stream_running(&dice->rx_stream[i]))
|
|
break;
|
|
}
|
|
}
|
|
need_to_start = (i < MAX_STREAMS);
|
|
|
|
if (need_to_start) {
|
|
/* Stop transmission. */
|
|
snd_dice_transaction_clear_enable(dice);
|
|
stop_streams(dice, AMDTP_IN_STREAM, &tx_params);
|
|
stop_streams(dice, AMDTP_OUT_STREAM, &rx_params);
|
|
release_resources(dice);
|
|
|
|
err = ensure_phase_lock(dice);
|
|
if (err < 0) {
|
|
dev_err(&dice->unit->device,
|
|
"fail to ensure phase lock\n");
|
|
return err;
|
|
}
|
|
|
|
/* Start both streams. */
|
|
err = start_streams(dice, AMDTP_IN_STREAM, rate, &tx_params);
|
|
if (err < 0)
|
|
goto error;
|
|
err = start_streams(dice, AMDTP_OUT_STREAM, rate, &rx_params);
|
|
if (err < 0)
|
|
goto error;
|
|
|
|
err = snd_dice_transaction_set_enable(dice);
|
|
if (err < 0) {
|
|
dev_err(&dice->unit->device,
|
|
"fail to enable interface\n");
|
|
goto error;
|
|
}
|
|
|
|
for (i = 0; i < MAX_STREAMS; i++) {
|
|
if ((i < tx_params.count &&
|
|
!amdtp_stream_wait_callback(&dice->tx_stream[i],
|
|
CALLBACK_TIMEOUT)) ||
|
|
(i < rx_params.count &&
|
|
!amdtp_stream_wait_callback(&dice->rx_stream[i],
|
|
CALLBACK_TIMEOUT))) {
|
|
err = -ETIMEDOUT;
|
|
goto error;
|
|
}
|
|
}
|
|
}
|
|
|
|
return err;
|
|
error:
|
|
snd_dice_transaction_clear_enable(dice);
|
|
stop_streams(dice, AMDTP_IN_STREAM, &tx_params);
|
|
stop_streams(dice, AMDTP_OUT_STREAM, &rx_params);
|
|
release_resources(dice);
|
|
return err;
|
|
}
|
|
|
|
/*
|
|
* MEMO: After this function, there're two states of streams:
|
|
* - None streams are running.
|
|
* - All streams are running.
|
|
*/
|
|
void snd_dice_stream_stop_duplex(struct snd_dice *dice)
|
|
{
|
|
struct reg_params tx_params, rx_params;
|
|
|
|
if (dice->substreams_counter > 0)
|
|
return;
|
|
|
|
snd_dice_transaction_clear_enable(dice);
|
|
|
|
if (get_register_params(dice, &tx_params, &rx_params) == 0) {
|
|
stop_streams(dice, AMDTP_IN_STREAM, &tx_params);
|
|
stop_streams(dice, AMDTP_OUT_STREAM, &rx_params);
|
|
}
|
|
|
|
release_resources(dice);
|
|
}
|
|
|
|
static int init_stream(struct snd_dice *dice, enum amdtp_stream_direction dir,
|
|
unsigned int index)
|
|
{
|
|
struct amdtp_stream *stream;
|
|
struct fw_iso_resources *resources;
|
|
int err;
|
|
|
|
if (dir == AMDTP_IN_STREAM) {
|
|
stream = &dice->tx_stream[index];
|
|
resources = &dice->tx_resources[index];
|
|
} else {
|
|
stream = &dice->rx_stream[index];
|
|
resources = &dice->rx_resources[index];
|
|
}
|
|
|
|
err = fw_iso_resources_init(resources, dice->unit);
|
|
if (err < 0)
|
|
goto end;
|
|
resources->channels_mask = 0x00000000ffffffffuLL;
|
|
|
|
err = amdtp_am824_init(stream, dice->unit, dir, CIP_BLOCKING);
|
|
if (err < 0) {
|
|
amdtp_stream_destroy(stream);
|
|
fw_iso_resources_destroy(resources);
|
|
}
|
|
end:
|
|
return err;
|
|
}
|
|
|
|
/*
|
|
* This function should be called before starting streams or after stopping
|
|
* streams.
|
|
*/
|
|
static void destroy_stream(struct snd_dice *dice,
|
|
enum amdtp_stream_direction dir,
|
|
unsigned int index)
|
|
{
|
|
struct amdtp_stream *stream;
|
|
struct fw_iso_resources *resources;
|
|
|
|
if (dir == AMDTP_IN_STREAM) {
|
|
stream = &dice->tx_stream[index];
|
|
resources = &dice->tx_resources[index];
|
|
} else {
|
|
stream = &dice->rx_stream[index];
|
|
resources = &dice->rx_resources[index];
|
|
}
|
|
|
|
amdtp_stream_destroy(stream);
|
|
fw_iso_resources_destroy(resources);
|
|
}
|
|
|
|
int snd_dice_stream_init_duplex(struct snd_dice *dice)
|
|
{
|
|
int i, err;
|
|
|
|
for (i = 0; i < MAX_STREAMS; i++) {
|
|
err = init_stream(dice, AMDTP_IN_STREAM, i);
|
|
if (err < 0) {
|
|
for (; i >= 0; i--)
|
|
destroy_stream(dice, AMDTP_IN_STREAM, i);
|
|
goto end;
|
|
}
|
|
}
|
|
|
|
for (i = 0; i < MAX_STREAMS; i++) {
|
|
err = init_stream(dice, AMDTP_OUT_STREAM, i);
|
|
if (err < 0) {
|
|
for (; i >= 0; i--)
|
|
destroy_stream(dice, AMDTP_OUT_STREAM, i);
|
|
for (i = 0; i < MAX_STREAMS; i++)
|
|
destroy_stream(dice, AMDTP_IN_STREAM, i);
|
|
break;
|
|
}
|
|
}
|
|
end:
|
|
return err;
|
|
}
|
|
|
|
void snd_dice_stream_destroy_duplex(struct snd_dice *dice)
|
|
{
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < MAX_STREAMS; i++) {
|
|
destroy_stream(dice, AMDTP_IN_STREAM, i);
|
|
destroy_stream(dice, AMDTP_OUT_STREAM, i);
|
|
}
|
|
}
|
|
|
|
void snd_dice_stream_update_duplex(struct snd_dice *dice)
|
|
{
|
|
struct reg_params tx_params, rx_params;
|
|
|
|
/*
|
|
* On a bus reset, the DICE firmware disables streaming and then goes
|
|
* off contemplating its own navel for hundreds of milliseconds before
|
|
* it can react to any of our attempts to reenable streaming. This
|
|
* means that we lose synchronization anyway, so we force our streams
|
|
* to stop so that the application can restart them in an orderly
|
|
* manner.
|
|
*/
|
|
dice->global_enabled = false;
|
|
|
|
if (get_register_params(dice, &tx_params, &rx_params) == 0) {
|
|
stop_streams(dice, AMDTP_IN_STREAM, &tx_params);
|
|
stop_streams(dice, AMDTP_OUT_STREAM, &rx_params);
|
|
}
|
|
}
|
|
|
|
static void dice_lock_changed(struct snd_dice *dice)
|
|
{
|
|
dice->dev_lock_changed = true;
|
|
wake_up(&dice->hwdep_wait);
|
|
}
|
|
|
|
int snd_dice_stream_lock_try(struct snd_dice *dice)
|
|
{
|
|
int err;
|
|
|
|
spin_lock_irq(&dice->lock);
|
|
|
|
if (dice->dev_lock_count < 0) {
|
|
err = -EBUSY;
|
|
goto out;
|
|
}
|
|
|
|
if (dice->dev_lock_count++ == 0)
|
|
dice_lock_changed(dice);
|
|
err = 0;
|
|
out:
|
|
spin_unlock_irq(&dice->lock);
|
|
return err;
|
|
}
|
|
|
|
void snd_dice_stream_lock_release(struct snd_dice *dice)
|
|
{
|
|
spin_lock_irq(&dice->lock);
|
|
|
|
if (WARN_ON(dice->dev_lock_count <= 0))
|
|
goto out;
|
|
|
|
if (--dice->dev_lock_count == 0)
|
|
dice_lock_changed(dice);
|
|
out:
|
|
spin_unlock_irq(&dice->lock);
|
|
}
|