Unverified Commit 90309b74 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "simple-audio-card codec2codec support" from Samuel Holland <samuel@sholland.org>: 

We are currently using simple-audio-card on the Allwinner A64 SoC.
The digital audio codec there (sun8i-codec) has 3 AIFs, one each for the
CPU, the modem, and Bluetooth. Adding support for the secondary AIFs
requires adding codec2codec DAI links.

Since the modem and bt-sco codec DAI drivers only have one set of
possible PCM parameters (namely, 8kHz mono S16LE), there's no real
need for a machine driver to specify the DAI link configuration. The
parameters for these "simple" DAI links can be chosen automatically.

This series adds codec2codec DAI link support to simple-audio-card.
Codec to codec links are automatically detected when all DAIs in the
link belong to codec components.

I tried to reuse as much code as possible, so the first two patches
refactor a couple of helper functions to be more generic.

The last patch adds the new feature and its documentation.

Changes in v4:
  - Rebased on top of asoc/for-next, several changes to patch 2
  - Removed unused variable from patch 3
Changes in v3:
  - Update use of for_each_rtd_components for v5.6
Changes in v2:
  - Drop patch 1 as it was merged
  - Automatically detect codec2codec links instead of using a DT property

Samuel Holland (3):
  ALSA: pcm: Add a standalone version of snd_pcm_limit_hw_rates
  ASoC: pcm: Export parameter intersection logic
  ASoC: simple-card: Add support for codec2codec DAI links

 Documentation/sound/soc/codec-to-codec.rst |  9 +++-
 include/sound/pcm.h                        |  9 +++-
 include/sound/soc.h                        |  3 ++
 sound/core/pcm_misc.c                      | 18 +++----
 sound/soc/generic/simple-card-utils.c      | 48 ++++++++++++++++++
 sound/soc/soc-pcm.c                        | 59 ++++++++++++++--------
 6 files changed, 114 insertions(+), 32 deletions(-)

--
2.24.1
parents 0776d6a8 95cfc0a0

Documentation/sound/soc/codec-to-codec.rst

+7 −2
Original line number Diff line number Diff line
@@ -104,5 +104,10 @@ Make sure to name your corresponding cpu and codec playback and capture 
dai names ending with "Playback" and "Capture" respectively as dapm core

will link and power those dais based on the name.



Note that in current device tree there is no way to mark a dai_link

as codec to codec. However, it may change in future.
 
A dai_link in a "simple-audio-card" will automatically be detected as

codec to codec when all DAIs on the link belong to codec components.

The dai_link will be initialized with the subset of stream parameters

(channels, format, sample rate) supported by all DAIs on the link. Since

there is no way to provide these parameters in the device tree, this is

mostly useful for communication with simple fixed-function codecs, such

as a Bluetooth controller or cellular modem.

include/sound/pcm.h

+8 −1
Original line number Diff line number Diff line
@@ -1127,7 +1127,14 @@ snd_pcm_kernel_readv(struct snd_pcm_substream *substream, 
	return __snd_pcm_lib_xfer(substream, bufs, false, frames, true);

}



int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime);

int snd_pcm_hw_limit_rates(struct snd_pcm_hardware *hw);



static inline int

snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime)

{

	return snd_pcm_hw_limit_rates(&runtime->hw);

}



unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate);

unsigned int snd_pcm_rate_bit_to_rate(unsigned int rate_bit);

unsigned int snd_pcm_rate_mask_intersect(unsigned int rates_a,

include/sound/soc.h

+3 −0
Original line number Diff line number Diff line
@@ -471,6 +471,9 @@ bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd); 
void snd_soc_runtime_activate(struct snd_soc_pcm_runtime *rtd, int stream);

void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);



int snd_soc_runtime_calc_hw(struct snd_soc_pcm_runtime *rtd,

			    struct snd_pcm_hardware *hw, int stream);



int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,

	unsigned int dai_fmt);

sound/core/pcm_misc.c

+9 −9
Original line number Diff line number Diff line
@@ -474,32 +474,32 @@ int snd_pcm_format_set_silence(snd_pcm_format_t format, void *data, unsigned int 
EXPORT_SYMBOL(snd_pcm_format_set_silence);



/**

 * snd_pcm_limit_hw_rates - determine rate_min/rate_max fields

 * @runtime: the runtime instance

 * snd_pcm_hw_limit_rates - determine rate_min/rate_max fields

 * @hw: the pcm hw instance

 *

 * Determines the rate_min and rate_max fields from the rates bits of

 * the given runtime->hw.

 * the given hw.

 *

 * Return: Zero if successful.

 */

int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime)

int snd_pcm_hw_limit_rates(struct snd_pcm_hardware *hw)

{

	int i;

	for (i = 0; i < (int)snd_pcm_known_rates.count; i++) {

		if (runtime->hw.rates & (1 << i)) {

			runtime->hw.rate_min = snd_pcm_known_rates.list[i];

		if (hw->rates & (1 << i)) {

			hw->rate_min = snd_pcm_known_rates.list[i];

			break;

		}

	}

	for (i = (int)snd_pcm_known_rates.count - 1; i >= 0; i--) {

		if (runtime->hw.rates & (1 << i)) {

			runtime->hw.rate_max = snd_pcm_known_rates.list[i];

		if (hw->rates & (1 << i)) {

			hw->rate_max = snd_pcm_known_rates.list[i];

			break;

		}

	}

	return 0;

}

EXPORT_SYMBOL(snd_pcm_limit_hw_rates);

EXPORT_SYMBOL(snd_pcm_hw_limit_rates);



/**

 * snd_pcm_rate_to_rate_bit - converts sample rate to SNDRV_PCM_RATE_xxx bit

sound/soc/generic/simple-card-utils.c

+48 −0
Original line number Diff line number Diff line
@@ -331,6 +331,50 @@ static int asoc_simple_init_dai(struct snd_soc_dai *dai, 
	return 0;

}



static int asoc_simple_init_dai_link_params(struct snd_soc_pcm_runtime *rtd,

					    struct simple_dai_props *dai_props)

{

	struct snd_soc_dai_link *dai_link = rtd->dai_link;

	struct snd_soc_component *component;

	struct snd_soc_pcm_stream *params;

	struct snd_pcm_hardware hw;

	int i, ret, stream;



	/* Only codecs should have non_legacy_dai_naming set. */

	for_each_rtd_components(rtd, i, component) {

		if (!component->driver->non_legacy_dai_naming)

			return 0;

	}



	/* Assumes the capabilities are the same for all supported streams */

	for (stream = 0; stream < 2; stream++) {

		ret = snd_soc_runtime_calc_hw(rtd, &hw, stream);

		if (ret == 0)

			break;

	}



	if (ret < 0) {

		dev_err(rtd->dev, "simple-card: no valid dai_link params\n");

		return ret;

	}



	params = devm_kzalloc(rtd->dev, sizeof(*params), GFP_KERNEL);

	if (!params)

		return -ENOMEM;



	params->formats = hw.formats;

	params->rates = hw.rates;

	params->rate_min = hw.rate_min;

	params->rate_max = hw.rate_max;

	params->channels_min = hw.channels_min;

	params->channels_max = hw.channels_max;



	dai_link->params = params;

	dai_link->num_params = 1;



	return 0;

}



int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd)

{

	struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);
@@ -347,6 +391,10 @@ int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd) 
	if (ret < 0)

		return ret;



	ret = asoc_simple_init_dai_link_params(rtd, dai_props);

	if (ret < 0)

		return ret;



	return 0;

}

EXPORT_SYMBOL_GPL(asoc_simple_dai_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE