korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC/SoundWire: dai: expand 'stream' concept beyond SoundWire

Browse Source 
The HDAudio ASoC support relies on the set_tdm_slots() helper to store
the HDaudio stream tag in the tx_mask. This only works because of the
pre-existing order in soc-pcm.c, where the hw_params() is handled for
codec_dais *before* cpu_dais. When the order is reversed, the
stream_tag is used as a mask in the codec fixup functions:

	/* fixup params based on TDM slot masks */
	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
	    codec_dai->tx_mask)
		soc_pcm_codec_params_fixup(&codec_params,
					   codec_dai->tx_mask);

As a result of this confusion, the codec_params_fixup() ends-up
generating bad channel masks, depending on what stream_tag was
allocated.

We could add a flag to state that the tx_mask is really not a mask,
but it would be quite ugly to persist in overloading concepts.

Instead, this patch suggests a more generic get/set 'stream' API based
on the existing model for SoundWire. We can expand the concept to
store 'stream' opaque information that is specific to different DAI
types. In the case of HDAudio DAIs, we only need to store a stream tag
as an unsigned char pointer. The TDM rx_ and tx_masks should really
only be used to store masks.

Rename get_sdw_stream/set_sdw_stream callbacks and helpers as
get_stream/set_stream. No functionality change beyond the rename.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Acked-By: Vinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20211224021034.26635-5-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2021-12-24 10:10:31 +08:00 committed by Mark Brown
parent 8ddeafb957
commit e8444560b4
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
19 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/soundwire/intel.c
View File

@ -1129,8 +1129,8 @@ static const struct snd_soc_dai_ops intel_pcm_dai_ops = {
.hw_free = intel_hw_free, .hw_free = intel_hw_free,
.trigger = intel_trigger, .trigger = intel_trigger,
.shutdown = intel_shutdown, .shutdown = intel_shutdown,
.set_sdw_stream = intel_pcm_set_sdw_stream, .set_stream = intel_pcm_set_sdw_stream,
.get_sdw_stream = intel_get_sdw_stream, .get_stream = intel_get_sdw_stream,
}; };
static const struct snd_soc_dai_ops intel_pdm_dai_ops = { static const struct snd_soc_dai_ops intel_pdm_dai_ops = {
@ -1139,8 +1139,8 @@ static const struct snd_soc_dai_ops intel_pdm_dai_ops = {
.prepare = intel_prepare, .prepare = intel_prepare,
.hw_free = intel_hw_free, .hw_free = intel_hw_free,
.shutdown = intel_shutdown, .shutdown = intel_shutdown,
.set_sdw_stream = intel_pdm_set_sdw_stream, .set_stream = intel_pdm_set_sdw_stream,
.get_sdw_stream = intel_get_sdw_stream, .get_stream = intel_get_sdw_stream,
}; };
static const struct snd_soc_component_driver dai_component = { static const struct snd_soc_component_driver dai_component = {

8
drivers/soundwire/qcom.c
View File

@ -1024,8 +1024,8 @@ static int qcom_swrm_startup(struct snd_pcm_substream *substream,
ctrl->sruntime[dai->id] = sruntime; ctrl->sruntime[dai->id] = sruntime;
for_each_rtd_codec_dais(rtd, i, codec_dai) { for_each_rtd_codec_dais(rtd, i, codec_dai) {
ret = snd_soc_dai_set_sdw_stream(codec_dai, sruntime, ret = snd_soc_dai_set_stream(codec_dai, sruntime,
substream->stream); substream->stream);
if (ret < 0 && ret != -ENOTSUPP) { if (ret < 0 && ret != -ENOTSUPP) {
dev_err(dai->dev, "Failed to set sdw stream on %s\n", dev_err(dai->dev, "Failed to set sdw stream on %s\n",
codec_dai->name); codec_dai->name);
@ -1051,8 +1051,8 @@ static const struct snd_soc_dai_ops qcom_swrm_pdm_dai_ops = {
.hw_free = qcom_swrm_hw_free, .hw_free = qcom_swrm_hw_free,
.startup = qcom_swrm_startup, .startup = qcom_swrm_startup,
.shutdown = qcom_swrm_shutdown, .shutdown = qcom_swrm_shutdown,
.set_sdw_stream = qcom_swrm_set_sdw_stream, .set_stream = qcom_swrm_set_sdw_stream,
.get_sdw_stream = qcom_swrm_get_sdw_stream, .get_stream = qcom_swrm_get_sdw_stream,
}; };
static const struct snd_soc_component_driver qcom_swrm_dai_component = { static const struct snd_soc_component_driver qcom_swrm_dai_component = {

4
drivers/soundwire/stream.c
View File

@ -1863,7 +1863,7 @@ static int set_stream(struct snd_pcm_substream *substream,
/* Set stream pointer on all DAIs */ /* Set stream pointer on all DAIs */
for_each_rtd_dais(rtd, i, dai) { for_each_rtd_dais(rtd, i, dai) {
ret = snd_soc_dai_set_sdw_stream(dai, sdw_stream, substream->stream); ret = snd_soc_dai_set_stream(dai, sdw_stream, substream->stream);
if (ret < 0) { if (ret < 0) {
dev_err(rtd->dev, "failed to set stream pointer on dai %s\n", dai->name); dev_err(rtd->dev, "failed to set stream pointer on dai %s\n", dai->name);
break; break;
@ -1934,7 +1934,7 @@ void sdw_shutdown_stream(void *sdw_substream)
/* Find stream from first CPU DAI */ /* Find stream from first CPU DAI */
dai = asoc_rtd_to_cpu(rtd, 0); dai = asoc_rtd_to_cpu(rtd, 0);
sdw_stream = snd_soc_dai_get_sdw_stream(dai, substream->stream); sdw_stream = snd_soc_dai_get_stream(dai, substream->stream);
if (IS_ERR(sdw_stream)) { if (IS_ERR(sdw_stream)) {
dev_err(rtd->dev, "no stream found for DAI %s\n", dai->name); dev_err(rtd->dev, "no stream found for DAI %s\n", dai->name);

32
include/sound/soc-dai.h
View File

@ -295,9 +295,9 @@ struct snd_soc_dai_ops {
unsigned int *rx_num, unsigned int *rx_slot); unsigned int *rx_num, unsigned int *rx_slot);
int (*set_tristate)(struct snd_soc_dai *dai, int tristate); int (*set_tristate)(struct snd_soc_dai *dai, int tristate);
int (*set_sdw_stream)(struct snd_soc_dai *dai, int (*set_stream)(struct snd_soc_dai *dai,
void *stream, int direction); void *stream, int direction);
void *(*get_sdw_stream)(struct snd_soc_dai *dai, int direction); void *(*get_stream)(struct snd_soc_dai *dai, int direction);
/* /*
* DAI digital mute - optional. * DAI digital mute - optional.
@ -515,42 +515,42 @@ static inline void *snd_soc_dai_get_drvdata(struct snd_soc_dai *dai)
} }
/** /**
* snd_soc_dai_set_sdw_stream() - Configures a DAI for SDW stream operation * snd_soc_dai_set_stream() - Configures a DAI for stream operation
* @dai: DAI * @dai: DAI
* @stream: STREAM * @stream: STREAM (opaque structure depending on DAI type)
* @direction: Stream direction(Playback/Capture) * @direction: Stream direction(Playback/Capture)
* SoundWire subsystem doesn't have a notion of direction and we reuse * Some subsystems, such as SoundWire, don't have a notion of direction and we reuse
* the ASoC stream direction to configure sink/source ports. * the ASoC stream direction to configure sink/source ports.
* Playback maps to source ports and Capture for sink ports. * Playback maps to source ports and Capture for sink ports.
* *
* This should be invoked with NULL to clear the stream set previously. * This should be invoked with NULL to clear the stream set previously.
* Returns 0 on success, a negative error code otherwise. * Returns 0 on success, a negative error code otherwise.
*/ */
static inline int snd_soc_dai_set_sdw_stream(struct snd_soc_dai *dai, static inline int snd_soc_dai_set_stream(struct snd_soc_dai *dai,
void *stream, int direction) void *stream, int direction)
{ {
if (dai->driver->ops->set_sdw_stream) if (dai->driver->ops->set_stream)
return dai->driver->ops->set_sdw_stream(dai, stream, direction); return dai->driver->ops->set_stream(dai, stream, direction);
else else
return -ENOTSUPP; return -ENOTSUPP;
} }
/** /**
* snd_soc_dai_get_sdw_stream() - Retrieves SDW stream from DAI * snd_soc_dai_get_stream() - Retrieves stream from DAI
* @dai: DAI * @dai: DAI
* @direction: Stream direction(Playback/Capture) * @direction: Stream direction(Playback/Capture)
* *
* This routine only retrieves that was previously configured * This routine only retrieves that was previously configured
* with snd_soc_dai_get_sdw_stream() * with snd_soc_dai_get_stream()
* *
* Returns pointer to stream or an ERR_PTR value, e.g. * Returns pointer to stream or an ERR_PTR value, e.g.
* ERR_PTR(-ENOTSUPP) if callback is not supported; * ERR_PTR(-ENOTSUPP) if callback is not supported;
*/ */
static inline void *snd_soc_dai_get_sdw_stream(struct snd_soc_dai *dai, static inline void *snd_soc_dai_get_stream(struct snd_soc_dai *dai,
int direction) int direction)
{ {
if (dai->driver->ops->get_sdw_stream) if (dai->driver->ops->get_stream)
return dai->driver->ops->get_sdw_stream(dai, direction); return dai->driver->ops->get_stream(dai, direction);
else else
return ERR_PTR(-ENOTSUPP); return ERR_PTR(-ENOTSUPP);
} }

2
sound/soc/codecs/max98373-sdw.c
View File

@ -741,7 +741,7 @@ static int max98373_sdw_set_tdm_slot(struct snd_soc_dai *dai,
static const struct snd_soc_dai_ops max98373_dai_sdw_ops = { static const struct snd_soc_dai_ops max98373_dai_sdw_ops = {
.hw_params = max98373_sdw_dai_hw_params, .hw_params = max98373_sdw_dai_hw_params,
.hw_free = max98373_pcm_hw_free, .hw_free = max98373_pcm_hw_free,
.set_sdw_stream = max98373_set_sdw_stream, .set_stream = max98373_set_sdw_stream,
.shutdown = max98373_shutdown, .shutdown = max98373_shutdown,
.set_tdm_slot = max98373_sdw_set_tdm_slot, .set_tdm_slot = max98373_sdw_set_tdm_slot,
}; };

2
sound/soc/codecs/rt1308-sdw.c
View File

@ -613,7 +613,7 @@ static const struct snd_soc_component_driver soc_component_sdw_rt1308 = {
static const struct snd_soc_dai_ops rt1308_aif_dai_ops = { static const struct snd_soc_dai_ops rt1308_aif_dai_ops = {
.hw_params = rt1308_sdw_hw_params, .hw_params = rt1308_sdw_hw_params,
.hw_free = rt1308_sdw_pcm_hw_free, .hw_free = rt1308_sdw_pcm_hw_free,
.set_sdw_stream = rt1308_set_sdw_stream, .set_stream = rt1308_set_sdw_stream,
.shutdown = rt1308_sdw_shutdown, .shutdown = rt1308_sdw_shutdown,
.set_tdm_slot = rt1308_sdw_set_tdm_slot, .set_tdm_slot = rt1308_sdw_set_tdm_slot,
}; };

2
sound/soc/codecs/rt1316-sdw.c
View File

@ -602,7 +602,7 @@ static const struct snd_soc_component_driver soc_component_sdw_rt1316 = {
static const struct snd_soc_dai_ops rt1316_aif_dai_ops = { static const struct snd_soc_dai_ops rt1316_aif_dai_ops = {
.hw_params = rt1316_sdw_hw_params, .hw_params = rt1316_sdw_hw_params,
.hw_free = rt1316_sdw_pcm_hw_free, .hw_free = rt1316_sdw_pcm_hw_free,
.set_sdw_stream = rt1316_set_sdw_stream, .set_stream = rt1316_set_sdw_stream,
.shutdown = rt1316_sdw_shutdown, .shutdown = rt1316_sdw_shutdown,
}; };

2
sound/soc/codecs/rt5682-sdw.c
View File

@ -272,7 +272,7 @@ static int rt5682_sdw_hw_free(struct snd_pcm_substream *substream,
static const struct snd_soc_dai_ops rt5682_sdw_ops = { static const struct snd_soc_dai_ops rt5682_sdw_ops = {
.hw_params = rt5682_sdw_hw_params, .hw_params = rt5682_sdw_hw_params,
.hw_free = rt5682_sdw_hw_free, .hw_free = rt5682_sdw_hw_free,
.set_sdw_stream = rt5682_set_sdw_stream, .set_stream = rt5682_set_sdw_stream,
.shutdown = rt5682_sdw_shutdown, .shutdown = rt5682_sdw_shutdown,
}; };

2
sound/soc/codecs/rt700.c
View File

@ -1005,7 +1005,7 @@ static int rt700_pcm_hw_free(struct snd_pcm_substream *substream,
static const struct snd_soc_dai_ops rt700_ops = { static const struct snd_soc_dai_ops rt700_ops = {
.hw_params = rt700_pcm_hw_params, .hw_params = rt700_pcm_hw_params,
.hw_free = rt700_pcm_hw_free, .hw_free = rt700_pcm_hw_free,
.set_sdw_stream = rt700_set_sdw_stream, .set_stream = rt700_set_sdw_stream,
.shutdown = rt700_shutdown, .shutdown = rt700_shutdown,
}; };

2
sound/soc/codecs/rt711-sdca.c
View File

@ -1358,7 +1358,7 @@ static int rt711_sdca_pcm_hw_free(struct snd_pcm_substream *substream,
static const struct snd_soc_dai_ops rt711_sdca_ops = { static const struct snd_soc_dai_ops rt711_sdca_ops = {
.hw_params = rt711_sdca_pcm_hw_params, .hw_params = rt711_sdca_pcm_hw_params,
.hw_free = rt711_sdca_pcm_hw_free, .hw_free = rt711_sdca_pcm_hw_free,
.set_sdw_stream = rt711_sdca_set_sdw_stream, .set_stream = rt711_sdca_set_sdw_stream,
.shutdown = rt711_sdca_shutdown, .shutdown = rt711_sdca_shutdown,
}; };

2
sound/soc/codecs/rt711.c
View File

@ -1089,7 +1089,7 @@ static int rt711_pcm_hw_free(struct snd_pcm_substream *substream,
static const struct snd_soc_dai_ops rt711_ops = { static const struct snd_soc_dai_ops rt711_ops = {
.hw_params = rt711_pcm_hw_params, .hw_params = rt711_pcm_hw_params,
.hw_free = rt711_pcm_hw_free, .hw_free = rt711_pcm_hw_free,
.set_sdw_stream = rt711_set_sdw_stream, .set_stream = rt711_set_sdw_stream,
.shutdown = rt711_shutdown, .shutdown = rt711_shutdown,
}; };

2
sound/soc/codecs/rt715-sdca.c
View File

@ -938,7 +938,7 @@ static int rt715_sdca_pcm_hw_free(struct snd_pcm_substream *substream,
static const struct snd_soc_dai_ops rt715_sdca_ops = { static const struct snd_soc_dai_ops rt715_sdca_ops = {
.hw_params = rt715_sdca_pcm_hw_params, .hw_params = rt715_sdca_pcm_hw_params,
.hw_free = rt715_sdca_pcm_hw_free, .hw_free = rt715_sdca_pcm_hw_free,
.set_sdw_stream = rt715_sdca_set_sdw_stream, .set_stream = rt715_sdca_set_sdw_stream,
.shutdown = rt715_sdca_shutdown, .shutdown = rt715_sdca_shutdown,
}; };

2
sound/soc/codecs/rt715.c
View File

@ -909,7 +909,7 @@ static int rt715_pcm_hw_free(struct snd_pcm_substream *substream,
static const struct snd_soc_dai_ops rt715_ops = { static const struct snd_soc_dai_ops rt715_ops = {
.hw_params = rt715_pcm_hw_params, .hw_params = rt715_pcm_hw_params,
.hw_free = rt715_pcm_hw_free, .hw_free = rt715_pcm_hw_free,
.set_sdw_stream = rt715_set_sdw_stream, .set_stream = rt715_set_sdw_stream,
.shutdown = rt715_shutdown, .shutdown = rt715_shutdown,
}; };

2
sound/soc/codecs/sdw-mockup.c
View File

@ -138,7 +138,7 @@ static int sdw_mockup_pcm_hw_free(struct snd_pcm_substream *substream,
static const struct snd_soc_dai_ops sdw_mockup_ops = { static const struct snd_soc_dai_ops sdw_mockup_ops = {
.hw_params = sdw_mockup_pcm_hw_params, .hw_params = sdw_mockup_pcm_hw_params,
.hw_free = sdw_mockup_pcm_hw_free, .hw_free = sdw_mockup_pcm_hw_free,
.set_sdw_stream = sdw_mockup_set_sdw_stream, .set_stream = sdw_mockup_set_sdw_stream,
.shutdown = sdw_mockup_shutdown, .shutdown = sdw_mockup_shutdown,
}; };

2
sound/soc/codecs/wcd938x.c
View File

@ -4287,7 +4287,7 @@ static int wcd938x_codec_set_sdw_stream(struct snd_soc_dai *dai,
static const struct snd_soc_dai_ops wcd938x_sdw_dai_ops = { static const struct snd_soc_dai_ops wcd938x_sdw_dai_ops = {
.hw_params = wcd938x_codec_hw_params, .hw_params = wcd938x_codec_hw_params,
.hw_free = wcd938x_codec_free, .hw_free = wcd938x_codec_free,
.set_sdw_stream = wcd938x_codec_set_sdw_stream, .set_stream = wcd938x_codec_set_sdw_stream,
}; };
static struct snd_soc_dai_driver wcd938x_dais[] = { static struct snd_soc_dai_driver wcd938x_dais[] = {

2
sound/soc/codecs/wsa881x.c
View File

@ -1018,7 +1018,7 @@ static const struct snd_soc_dai_ops wsa881x_dai_ops = {
.hw_params = wsa881x_hw_params, .hw_params = wsa881x_hw_params,
.hw_free = wsa881x_hw_free, .hw_free = wsa881x_hw_free,
.mute_stream = wsa881x_digital_mute, .mute_stream = wsa881x_digital_mute,
.set_sdw_stream = wsa881x_set_sdw_stream, .set_stream = wsa881x_set_sdw_stream,
}; };
static struct snd_soc_dai_driver wsa881x_dais[] = { static struct snd_soc_dai_driver wsa881x_dais[] = {

6
sound/soc/intel/boards/sof_sdw.c
View File

@ -347,7 +347,7 @@ int sdw_prepare(struct snd_pcm_substream *substream)
/* Find stream from first CPU DAI */ /* Find stream from first CPU DAI */
dai = asoc_rtd_to_cpu(rtd, 0); dai = asoc_rtd_to_cpu(rtd, 0);
sdw_stream = snd_soc_dai_get_sdw_stream(dai, substream->stream); sdw_stream = snd_soc_dai_get_stream(dai, substream->stream);
if (IS_ERR(sdw_stream)) { if (IS_ERR(sdw_stream)) {
dev_err(rtd->dev, "no stream found for DAI %s", dai->name); dev_err(rtd->dev, "no stream found for DAI %s", dai->name);
@ -367,7 +367,7 @@ int sdw_trigger(struct snd_pcm_substream *substream, int cmd)
/* Find stream from first CPU DAI */ /* Find stream from first CPU DAI */
dai = asoc_rtd_to_cpu(rtd, 0); dai = asoc_rtd_to_cpu(rtd, 0);
sdw_stream = snd_soc_dai_get_sdw_stream(dai, substream->stream); sdw_stream = snd_soc_dai_get_stream(dai, substream->stream);
if (IS_ERR(sdw_stream)) { if (IS_ERR(sdw_stream)) {
dev_err(rtd->dev, "no stream found for DAI %s", dai->name); dev_err(rtd->dev, "no stream found for DAI %s", dai->name);
@ -406,7 +406,7 @@ int sdw_hw_free(struct snd_pcm_substream *substream)
/* Find stream from first CPU DAI */ /* Find stream from first CPU DAI */
dai = asoc_rtd_to_cpu(rtd, 0); dai = asoc_rtd_to_cpu(rtd, 0);
sdw_stream = snd_soc_dai_get_sdw_stream(dai, substream->stream); sdw_stream = snd_soc_dai_get_stream(dai, substream->stream);
if (IS_ERR(sdw_stream)) { if (IS_ERR(sdw_stream)) {
dev_err(rtd->dev, "no stream found for DAI %s", dai->name); dev_err(rtd->dev, "no stream found for DAI %s", dai->name);

4
sound/soc/qcom/sdm845.c
View File

@ -57,8 +57,8 @@ static int sdm845_slim_snd_hw_params(struct snd_pcm_substream *substream,
int ret = 0, i; int ret = 0, i;
for_each_rtd_codec_dais(rtd, i, codec_dai) { for_each_rtd_codec_dais(rtd, i, codec_dai) {
sruntime = snd_soc_dai_get_sdw_stream(codec_dai, sruntime = snd_soc_dai_get_stream(codec_dai,
substream->stream); substream->stream);
if (sruntime != ERR_PTR(-ENOTSUPP)) if (sruntime != ERR_PTR(-ENOTSUPP))
pdata->sruntime[cpu_dai->id] = sruntime; pdata->sruntime[cpu_dai->id] = sruntime;

4
sound/soc/qcom/sm8250.c
View File

@ -136,8 +136,8 @@ static int sm8250_snd_hw_params(struct snd_pcm_substream *substream,
case TX_CODEC_DMA_TX_2: case TX_CODEC_DMA_TX_2:
case TX_CODEC_DMA_TX_3: case TX_CODEC_DMA_TX_3:
for_each_rtd_codec_dais(rtd, i, codec_dai) { for_each_rtd_codec_dais(rtd, i, codec_dai) {
sruntime = snd_soc_dai_get_sdw_stream(codec_dai, sruntime = snd_soc_dai_get_stream(codec_dai,
substream->stream); substream->stream);
if (sruntime != ERR_PTR(-ENOTSUPP)) if (sruntime != ERR_PTR(-ENOTSUPP))
pdata->sruntime[cpu_dai->id] = sruntime; pdata->sruntime[cpu_dai->id] = sruntime;
} }