All of lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Cc: alsa-devel@alsa-project.org, clemens@ladisch.de,
	ffado-devel@lists.sf.net
Subject: Re: [PATCH 22/25] ALSA: firewire-tascam: add PCM functionality
Date: Mon, 24 Aug 2015 23:12:39 +0200	[thread overview]
Message-ID: <s5htwro4chk.wl-tiwai@suse.de> (raw)
In-Reply-To: <1440235181-18181-23-git-send-email-o-takashi@sakamocchi.jp>

On Sat, 22 Aug 2015 11:19:38 +0200,
Takashi Sakamoto wrote:
> 
> This commit adds PCM functionality to transmit/receive PCM samples.
> 
> When one of PCM substreams are running or external clock source is
> selected, current sampling rate is used. Else, the sampling rate is
> changed as an userspace application requests.
> 
> Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
> ---
>  sound/firewire/tascam/Makefile     |   2 +-
>  sound/firewire/tascam/tascam-pcm.c | 287 +++++++++++++++++++++++++++++++++++++
>  sound/firewire/tascam/tascam.c     |   4 +
>  sound/firewire/tascam/tascam.h     |   2 +
>  4 files changed, 294 insertions(+), 1 deletion(-)
>  create mode 100644 sound/firewire/tascam/tascam-pcm.c
> 
> diff --git a/sound/firewire/tascam/Makefile b/sound/firewire/tascam/Makefile
> index 0a1c387..f075b9b 100644
> --- a/sound/firewire/tascam/Makefile
> +++ b/sound/firewire/tascam/Makefile
> @@ -1,3 +1,3 @@
>  snd-firewire-tascam-objs := tascam-proc.o amdtp-tascam.o tascam-stream.o \
> -			    tascam.o
> +			    tascam-pcm.o tascam.o
>  obj-$(CONFIG_SND_FIREWIRE_TASCAM) += snd-firewire-tascam.o
> diff --git a/sound/firewire/tascam/tascam-pcm.c b/sound/firewire/tascam/tascam-pcm.c
> new file mode 100644
> index 0000000..b1aa980
> --- /dev/null
> +++ b/sound/firewire/tascam/tascam-pcm.c
> @@ -0,0 +1,287 @@
> +/*
> + * tascam-pcm.c - a part of driver for TASCAM FireWire series
> + *
> + * Copyright (c) 2015 Takashi Sakamoto
> + *
> + * Licensed under the terms of the GNU General Public License, version 2.
> + */
> +
> +#include "tascam.h"
> +
> +static void set_buffer_params(struct snd_pcm_hardware *hw)
> +{
> +	hw->period_bytes_min = 4 * hw->channels_min;
> +	hw->period_bytes_max = hw->period_bytes_min * 2048;
> +	hw->buffer_bytes_max = hw->period_bytes_max * 2;
> +
> +	hw->periods_min = 2;
> +	hw->periods_max = UINT_MAX;
> +}
> +
> +static int pcm_init_hw_params(struct snd_tscm *tscm,
> +			      struct snd_pcm_substream *substream)
> +{
> +	static const struct snd_pcm_hardware hardware = {
> +		.info = SNDRV_PCM_INFO_BATCH |
> +			SNDRV_PCM_INFO_BLOCK_TRANSFER |
> +			SNDRV_PCM_INFO_INTERLEAVED |
> +			SNDRV_PCM_INFO_JOINT_DUPLEX |
> +			SNDRV_PCM_INFO_MMAP |
> +			SNDRV_PCM_INFO_MMAP_VALID,
> +		.rates = SNDRV_PCM_RATE_44100 |
> +			 SNDRV_PCM_RATE_48000 |
> +			 SNDRV_PCM_RATE_88200 |
> +			 SNDRV_PCM_RATE_96000,
> +		.rate_min = 44100,
> +		.rate_max = 96000,
> +		.channels_min = 10,
> +		.channels_max = 18,
> +	};
> +	struct snd_pcm_runtime *runtime = substream->runtime;
> +	struct amdtp_stream *stream;
> +	unsigned int pcm_channels;
> +
> +	runtime->hw = hardware;
> +
> +	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
> +		runtime->hw.formats = SNDRV_PCM_FMTBIT_S32;
> +		stream = &tscm->tx_stream;
> +		pcm_channels = tscm->spec->pcm_capture_analog_channels;
> +		if (tscm->spec->has_adat)
> +			pcm_channels += 8;
> +		if (tscm->spec->has_spdif)
> +			pcm_channels += 2;
> +		runtime->hw.channels_min =
> +					runtime->hw.channels_max = pcm_channels;
> +	} else {
> +		runtime->hw.formats =
> +				SNDRV_PCM_FMTBIT_S16 | SNDRV_PCM_FMTBIT_S32;
> +		stream = &tscm->rx_stream;
> +		pcm_channels = tscm->spec->pcm_playback_analog_channels;
> +		if (tscm->spec->has_adat)
> +			pcm_channels += 8;
> +		if (tscm->spec->has_spdif)
> +			pcm_channels += 2;
> +		runtime->hw.channels_min =
> +					runtime->hw.channels_max = pcm_channels;
> +	}
> +
> +	set_buffer_params(&runtime->hw);
> +
> +	return amdtp_tscm_add_pcm_hw_constraints(stream, runtime);
> +}
> +
> +static int pcm_open(struct snd_pcm_substream *substream)
> +{
> +	struct snd_tscm *tscm = substream->private_data;
> +	enum snd_tscm_clock clock;
> +	unsigned int rate;
> +	int err;
> +
> +	err = pcm_init_hw_params(tscm, substream);
> +	if (err < 0)
> +		return err;
> +
> +	err = snd_tscm_stream_get_clock(tscm, &clock);
> +	if ((clock != SND_TSCM_CLOCK_INTERNAL) |
> +	    amdtp_stream_pcm_running(&tscm->rx_stream) |
> +	    amdtp_stream_pcm_running(&tscm->tx_stream)) {

Must be '||'.

> +		err = snd_tscm_stream_get_rate(tscm, &rate);
> +		if (err < 0)
> +			return err;
> +		substream->runtime->hw.rate_min = rate;
> +		substream->runtime->hw.rate_max = rate;
> +	}
> +
> +	snd_pcm_set_sync(substream);
> +
> +	return err;
> +}
> +
> +static int pcm_close(struct snd_pcm_substream *substream)
> +{
> +	return 0;
> +}
> +
> +static int pcm_capture_hw_params(struct snd_pcm_substream *substream,
> +				 struct snd_pcm_hw_params *hw_params)
> +{
> +	struct snd_tscm *tscm = substream->private_data;
> +
> +	if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) {
> +		mutex_lock(&tscm->mutex);
> +		tscm->substreams_counter++;
> +		mutex_unlock(&tscm->mutex);
> +	}

This looks dangerous.  For example...

> +	amdtp_tscm_set_pcm_format(&tscm->tx_stream, params_format(hw_params));
> +	return snd_pcm_lib_alloc_vmalloc_buffer(substream,
> +						params_buffer_bytes(hw_params));

... if the buffer allocation fails, this return an error.  And
snd_pcm_hw_params() calls hw_free() at the error path.  But hw_free()
decreases the counter only when the state is not OPEN.  At this
moment, however, the state is still OPEN, so the counter is unbalanced.


> +}
> +static int pcm_playback_hw_params(struct snd_pcm_substream *substream,

Put a blank line (also in many places in this file).


Takashi

  reply	other threads:[~2015-08-24 21:12 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-22  9:19 [PATCH 00/25 v2] ALSA: support AMDTP variants Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 01/25] ALSA: firewire-lib: rename 'amdtp' to 'amdtp-stream' for functional separation Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 02/25] ALSA: firewire-lib: functional separation for packet transmission layer and data processing layer Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 03/25] ALSA: firewire-lib: add helper functions for asynchronous MIDI port Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 04/25] ALSA: firewire-lib: add a restriction for a transaction at once Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 05/25] ALSA: firewire-lib: schedule tasklet again when MIDI substream has rest of MIDI messages Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 06/25] ALSA: firewire-lib: add throttle for MIDI data rate Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 07/25] ALSA: firewire-lib: avoid endless loop to transfer MIDI messages at fatal error Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 08/25] ALSA: firewire-digi00x: add skeleton for Digi 002/003 family Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 09/25] ALSA: firewire-digi00x: add data processing layer Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 10/25] ALSA: firewire-digi00x: add stream functionality Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 11/25] ALSA: firewire-digi00x: add proc node to show clock status Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 12/25] ALSA: firewire-digi00x: add PCM functionality Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 13/25] ALSA: firewire-digi00x: add MIDI functionality Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 14/25] ALSA: firewire-digi00x: add hwdep interface Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 15/25] ALSA: firewire-digi00x: add support for asynchronous messaging Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 16/25] ALSA: firewire-digi00x: add support for MIDI ports for machine control Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 17/25] ALSA: firewire-tascam: add skeleton for TASCAM FireWire series Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 18/25] ALSA: firewire-tascam: add a structure for model-dependent parameters Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 19/25] ALSA: firewire-tascam: add proc node to show firmware information Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 20/25] ALSA: firewire-tascam: add data processing layer Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 21/25] ALSA: firewire-tascam: add streaming functionality Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 22/25] ALSA: firewire-tascam: add PCM functionality Takashi Sakamoto
2015-08-24 21:12   ` Takashi Iwai [this message]
2015-08-25 11:56     ` Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 23/25] ALSA: firewire-tascam: add transaction functionality Takashi Sakamoto
2015-08-22  9:19 ` [PATCH 24/25] ALSA: firewire-tascam: add MIDI functionality Takashi Sakamoto
2015-08-24 20:59   ` Takashi Iwai
2015-08-22  9:19 ` [PATCH 25/25] ALSA: firewire-tascam: add hwdep interface Takashi Sakamoto
2015-08-23  8:04 ` [PATCH 00/25 v2] ALSA: support AMDTP variants Takashi Iwai
2015-08-23 14:58   ` Takashi Sakamoto
2015-08-24  6:26     ` Takashi Iwai
2015-08-25  5:24       ` Takashi Iwai
2015-08-25 11:47         ` Takashi Sakamoto
2015-08-25 12:03           ` Takashi Iwai
2015-08-29  6:00             ` Takashi Sakamoto
  -- strict thread matches above, loose matches on Subject: below --
2015-08-13  0:19 [PATCH 00/25] " Takashi Sakamoto
2015-08-13  0:20 ` [PATCH 22/25] ALSA: firewire-tascam: add PCM functionality Takashi Sakamoto

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=s5htwro4chk.wl-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=clemens@ladisch.de \
    --cc=ffado-devel@lists.sf.net \
    --cc=o-takashi@sakamocchi.jp \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.