ASoC: Intel: Add stream direction for pcm-module map
Subsystems (3)
PATCH 1/2 ASoC: Intel: Add stream direction for pcm-module map
A DAI may have 2 streams(playback/capture) and different modules may be needed for them respectively, so we need add a stream direction here, the combination(dai_id + stream) can tell us which module we really need here.
--- sound/soc/intel/sst-haswell-pcm.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
sound/soc/intel/sst-haswell-pcm.c +9 -9
@@ -83,7 +83,6 @@ static const u32 volume_map[] = {#define HSW_PCM_DAI_ID_OFFLOAD0 1#define HSW_PCM_DAI_ID_OFFLOAD1 2#define HSW_PCM_DAI_ID_LOOPBACK 3 -#define HSW_PCM_DAI_ID_CAPTURE 4static const struct snd_pcm_hardware hsw_pcm_hardware = {
@@ -104,6 +103,7 @@ static const struct snd_pcm_hardware hsw_pcm_hardware = {struct hsw_pcm_module_map {int dai_id; +int stream;enum sst_hsw_module_id mod_id; };
@@ -751,11 +751,11 @@ static struct snd_pcm_ops hsw_pcm_ops = {/* static mappings between PCMs and modules - may be dynamic in future */ static struct hsw_pcm_module_map mod_map[] = { - {HSW_PCM_DAI_ID_SYSTEM ,SST_HSW_MODULE_PCM_SYSTEM }, - {HSW_PCM_DAI_ID_OFFLOAD0 ,SST_HSW_MODULE_PCM }, - {HSW_PCM_DAI_ID_OFFLOAD1 ,SST_HSW_MODULE_PCM }, - {HSW_PCM_DAI_ID_LOOPBACK ,SST_HSW_MODULE_PCM_REFERENCE }, - {HSW_PCM_DAI_ID_CAPTURE ,SST_HSW_MODULE_PCM_CAPTURE }, + {HSW_PCM_DAI_ID_SYSTEM ,0 ,SST_HSW_MODULE_PCM_SYSTEM }, + {HSW_PCM_DAI_ID_OFFLOAD0 ,0 ,SST_HSW_MODULE_PCM }, + {HSW_PCM_DAI_ID_OFFLOAD1 ,0 ,SST_HSW_MODULE_PCM }, + {HSW_PCM_DAI_ID_LOOPBACK ,1 ,SST_HSW_MODULE_PCM_REFERENCE }, + {HSW_PCM_DAI_ID_SYSTEM ,1 ,SST_HSW_MODULE_PCM_CAPTURE }, };static int hsw_pcm_create_modules (struct hsw_priv_data *pdata)
@@ -1139,7 +1139,7 @@ static void hsw_pcm_complete(struct device *dev)return ; } -for (i =0 ; i <HSW_PCM_DAI_ID_CAPTURE +1 ; i++) { +for (i =0 ; i <ARRAY_SIZE (mod_map); i++) { pcm_data = &pdata->pcm[i];if (!pcm_data->substream)
@@ -1173,7 +1173,7 @@ static int hsw_pcm_prepare(struct device *dev)if (pdata->pm_state ==HSW_PM_STATE_D3 )return 0 ;/* suspend all active streams */ -for (i =0 ; i <HSW_PCM_DAI_ID_CAPTURE +1 ; i++) { +for (i =0 ; i <ARRAY_SIZE (mod_map); i++) { pcm_data = &pdata->pcm[i];if (!pcm_data->substream)
@@ -1192,7 +1192,7 @@ static int hsw_pcm_prepare(struct device *dev)sst_hsw_dsp_runtime_suspend (hsw);/* preserve persistent memory */ -for (i =0 ; i <HSW_PCM_DAI_ID_CAPTURE +1 ; i++) { +for (i =0 ; i <ARRAY_SIZE (mod_map); i++) { pcm_data = &pdata->pcm[i];if (!pcm_data->substream)
Signature · 1 line
1.9.1
PATCH 2/2 ASoC: Intel: Split hsw_pcm_data for playback and capture
There may be 2 pcm streams for a same DAI at most, and these 2 streams should have different hsw_pcm_data, e.g. they have different persistent data, so here we need split hsw_pcm_data for playback and capture, to make sure they won't be mixed and keep cleaned.
--- sound/soc/intel/sst-haswell-pcm.c | 94 ++++++++++++++++++++++++++------------- 1 file changed, 63 insertions(+), 31 deletions(-)
sound/soc/intel/sst-haswell-pcm.c +63 -31
@@ -140,7 +140,17 @@ struct hsw_priv_data {struct snd_dma_buffer dmab[HSW_PCM_COUNT ][2 ];/* DAI data */ -struct hsw_pcm_data pcm[HSW_PCM_COUNT ]; +struct hsw_pcm_data pcm[HSW_PCM_COUNT ][2 ]; +}; + + +/* static mappings between PCMs and modules - may be dynamic in future */ +static struct hsw_pcm_module_map mod_map[] = { + {HSW_PCM_DAI_ID_SYSTEM ,0 ,SST_HSW_MODULE_PCM_SYSTEM }, + {HSW_PCM_DAI_ID_OFFLOAD0 ,0 ,SST_HSW_MODULE_PCM }, + {HSW_PCM_DAI_ID_OFFLOAD1 ,0 ,SST_HSW_MODULE_PCM }, + {HSW_PCM_DAI_ID_LOOPBACK ,1 ,SST_HSW_MODULE_PCM_REFERENCE }, + {HSW_PCM_DAI_ID_SYSTEM ,1 ,SST_HSW_MODULE_PCM_CAPTURE }, };static u32 hsw_notify_pointer (struct sst_hsw_stream *stream,void *data);
@@ -173,9 +183,14 @@ static int hsw_stream_volume_put(struct snd_kcontrol *kcontrol, (struct soc_mixer_control *)kcontrol->private_value;struct hsw_priv_data *pdata =snd_soc_platform_get_drvdata (platform); -struct hsw_pcm_data *pcm_data = &pdata->pcm[mc->reg]; +struct hsw_pcm_data *pcm_data;struct sst_hsw *hsw = pdata->hsw;u32 volume; +int dai, stream; + + dai = mod_map[mc->reg].dai_id; + stream = mod_map[mc->reg].stream; + pcm_data = &pdata->pcm[dai][stream];mutex_lock (&pcm_data->mutex);pm_runtime_get_sync (pdata->dev);
@@ -217,9 +232,14 @@ static int hsw_stream_volume_get(struct snd_kcontrol *kcontrol, (struct soc_mixer_control *)kcontrol->private_value;struct hsw_priv_data *pdata =snd_soc_platform_get_drvdata (platform); -struct hsw_pcm_data *pcm_data = &pdata->pcm[mc->reg]; +struct hsw_pcm_data *pcm_data;struct sst_hsw *hsw = pdata->hsw;u32 volume; +int dai, stream; + + dai = mod_map[mc->reg].dai_id; + stream = mod_map[mc->reg].stream; + pcm_data = &pdata->pcm[dai][stream];mutex_lock (&pcm_data->mutex);pm_runtime_get_sync (pdata->dev);
@@ -314,7 +334,7 @@ static const struct snd_kcontrol_new hsw_volume_controls[] = { ARRAY_SIZE(volume_map) - 1, 0, hsw_stream_volume_get, hsw_stream_volume_put, hsw_vol_tlv),/* Mic Capture volume */ - SOC_DOUBLE_EXT_TLV("Mic Capture Volume", 0, 0, 8, + SOC_DOUBLE_EXT_TLV("Mic Capture Volume", 4, 0, 8, ARRAY_SIZE(volume_map) - 1, 0, hsw_stream_volume_get, hsw_stream_volume_put, hsw_vol_tlv), };
@@ -358,7 +378,7 @@ static int hsw_pcm_hw_params(struct snd_pcm_substream *substream,struct snd_pcm_runtime *runtime = substream->runtime;struct hsw_priv_data *pdata =snd_soc_platform_get_drvdata (rtd->platform); -struct hsw_pcm_data *pcm_data =snd_soc_pcm_get_drvdata (rtd); +struct hsw_pcm_data *pcm_data;struct sst_hsw *hsw = pdata->hsw;struct sst_module *module_data;struct sst_dsp *dsp;
@@ -367,7 +387,10 @@ static int hsw_pcm_hw_params(struct snd_pcm_substream *substream,enum sst_hsw_stream_path_id path_id;u32 rate, bits, map, pages, module_id;u8 channels; -int ret; +int ret, dai; + + dai = mod_map[rtd->cpu_dai->id].dai_id; + pcm_data = &pdata->pcm[dai][substream->stream];/* check if we are being called a subsequent time */ if (pcm_data->allocated) {
@@ -557,11 +580,16 @@ static int hsw_pcm_trigger(struct snd_pcm_substream *substream, int cmd)struct snd_soc_pcm_runtime *rtd = substream->private_data;struct hsw_priv_data *pdata =snd_soc_platform_get_drvdata (rtd->platform); -struct hsw_pcm_data *pcm_data =snd_soc_pcm_get_drvdata (rtd); -struct sst_hsw_stream *sst_stream = pcm_data->stream; +struct hsw_pcm_data *pcm_data; +struct sst_hsw_stream *sst_stream;struct sst_hsw *hsw = pdata->hsw;struct snd_pcm_runtime *runtime = substream->runtime;snd_pcm_uframes_t pos; +int dai; + + dai = mod_map[rtd->cpu_dai->id].dai_id; + pcm_data = &pdata->pcm[dai][substream->stream]; + sst_stream = pcm_data->stream;switch (cmd) {case SNDRV_PCM_TRIGGER_START :
@@ -661,11 +689,16 @@ static snd_pcm_uframes_t hsw_pcm_pointer(struct snd_pcm_substream *substream)struct snd_pcm_runtime *runtime = substream->runtime;struct hsw_priv_data *pdata =snd_soc_platform_get_drvdata (rtd->platform); -struct hsw_pcm_data *pcm_data =snd_soc_pcm_get_drvdata (rtd); +struct hsw_pcm_data *pcm_data;struct sst_hsw *hsw = pdata->hsw;snd_pcm_uframes_t offset;uint64_t ppos; -u32 position =sst_hsw_get_dsp_position (hsw, pcm_data->stream); +u32 position; +int dai; + + dai = mod_map[rtd->cpu_dai->id].dai_id; + pcm_data = &pdata->pcm[dai][substream->stream]; + position =sst_hsw_get_dsp_position (hsw, pcm_data->stream); offset =bytes_to_frames (runtime, position); ppos =sst_hsw_get_dsp_presentation_position (hsw, pcm_data->stream);
@@ -682,8 +715,10 @@ static int hsw_pcm_open(struct snd_pcm_substream *substream)snd_soc_platform_get_drvdata (rtd->platform);struct hsw_pcm_data *pcm_data;struct sst_hsw *hsw = pdata->hsw; +int dai; - pcm_data = &pdata->pcm[rtd->cpu_dai->id]; + dai = mod_map[rtd->cpu_dai->id].dai_id; + pcm_data = &pdata->pcm[dai][substream->stream];mutex_lock (&pcm_data->mutex);pm_runtime_get_sync (pdata->dev);
@@ -712,9 +747,12 @@ static int hsw_pcm_close(struct snd_pcm_substream *substream)struct snd_soc_pcm_runtime *rtd = substream->private_data;struct hsw_priv_data *pdata =snd_soc_platform_get_drvdata (rtd->platform); -struct hsw_pcm_data *pcm_data =snd_soc_pcm_get_drvdata (rtd); +struct hsw_pcm_data *pcm_data;struct sst_hsw *hsw = pdata->hsw; -int ret; +int ret, dai; + + dai = mod_map[rtd->cpu_dai->id].dai_id; + pcm_data = &pdata->pcm[dai][substream->stream];mutex_lock (&pcm_data->mutex); ret =sst_hsw_stream_reset (hsw, pcm_data->stream);
@@ -749,15 +787,6 @@ static struct snd_pcm_ops hsw_pcm_ops = { .page = snd_pcm_sgbuf_ops_page, }; -/* static mappings between PCMs and modules - may be dynamic in future */ -static struct hsw_pcm_module_map mod_map[] = { - {HSW_PCM_DAI_ID_SYSTEM ,0 ,SST_HSW_MODULE_PCM_SYSTEM }, - {HSW_PCM_DAI_ID_OFFLOAD0 ,0 ,SST_HSW_MODULE_PCM }, - {HSW_PCM_DAI_ID_OFFLOAD1 ,0 ,SST_HSW_MODULE_PCM }, - {HSW_PCM_DAI_ID_LOOPBACK ,1 ,SST_HSW_MODULE_PCM_REFERENCE }, - {HSW_PCM_DAI_ID_SYSTEM ,1 ,SST_HSW_MODULE_PCM_CAPTURE }, -}; -static int hsw_pcm_create_modules (struct hsw_priv_data *pdata) {struct sst_hsw *hsw = pdata->hsw;
@@ -765,7 +794,7 @@ static int hsw_pcm_create_modules(struct hsw_priv_data *pdata)int i;for (i =0 ; i <ARRAY_SIZE (mod_map); i++) { - pcm_data = &pdata->pcm[i]; + pcm_data = &pdata->pcm[mod_map[i].dai_id][mod_map[i].stream];/* create new runtime module, use same offset if recreated */ pcm_data->runtime = sst_hsw_runtime_module_create(hsw,
@@ -780,7 +809,7 @@ static int hsw_pcm_create_modules(struct hsw_priv_data *pdata) err:for (--i; i >=0 ; i--) { - pcm_data = &pdata->pcm[i]; + pcm_data = &pdata->pcm[mod_map[i].dai_id][mod_map[i].stream];sst_hsw_runtime_module_free (pcm_data->runtime); }
@@ -793,7 +822,7 @@ static void hsw_pcm_free_modules(struct hsw_priv_data *pdata)int i;for (i =0 ; i <ARRAY_SIZE (mod_map); i++) { - pcm_data = &pdata->pcm[i]; + pcm_data = &pdata->pcm[mod_map[i].dai_id][mod_map[i].stream];sst_hsw_runtime_module_free (pcm_data->runtime); }
@@ -821,7 +850,10 @@ static int hsw_pcm_new(struct snd_soc_pcm_runtime *rtd)return ret; } } - priv_data->pcm[rtd->cpu_dai->id].hsw_pcm = pcm; +if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK ].substream) + priv_data->pcm[rtd->cpu_dai->id][SNDRV_PCM_STREAM_PLAYBACK ].hsw_pcm = pcm; +if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE ].substream) + priv_data->pcm[rtd->cpu_dai->id][SNDRV_PCM_STREAM_CAPTURE ].hsw_pcm = pcm;return ret; }
@@ -930,10 +962,9 @@ static int hsw_pcm_probe(struct snd_soc_platform *platform)/* allocate DSP buffer page tables */ for (i =0 ; i <ARRAY_SIZE (hsw_dais); i++) { -mutex_init (&priv_data->pcm[i].mutex); -/* playback */ if (hsw_dais[i].playback.channels_min) { +mutex_init (&priv_data->pcm[i][SNDRV_PCM_STREAM_PLAYBACK ].mutex); ret =snd_dma_alloc_pages (SNDRV_DMA_TYPE_DEV , dma_dev,PAGE_SIZE , &priv_data->dmab[i][0 ]);if (ret <0 )
@@ -942,6 +973,7 @@ static int hsw_pcm_probe(struct snd_soc_platform *platform)/* capture */ if (hsw_dais[i].capture.channels_min) { +mutex_init (&priv_data->pcm[i][SNDRV_PCM_STREAM_CAPTURE ].mutex); ret =snd_dma_alloc_pages (SNDRV_DMA_TYPE_DEV , dma_dev,PAGE_SIZE , &priv_data->dmab[i][1 ]);if (ret <0 )
@@ -1140,7 +1172,7 @@ static void hsw_pcm_complete(struct device *dev) }for (i =0 ; i <ARRAY_SIZE (mod_map); i++) { - pcm_data = &pdata->pcm[i]; + pcm_data = &pdata->pcm[mod_map[i].dai_id][mod_map[i].stream];if (!pcm_data->substream)continue ;
@@ -1174,7 +1206,7 @@ static int hsw_pcm_prepare(struct device *dev)return 0 ;/* suspend all active streams */ for (i =0 ; i <ARRAY_SIZE (mod_map); i++) { - pcm_data = &pdata->pcm[i]; + pcm_data = &pdata->pcm[mod_map[i].dai_id][mod_map[i].stream];if (!pcm_data->substream)continue ;
@@ -1193,7 +1225,7 @@ static int hsw_pcm_prepare(struct device *dev)/* preserve persistent memory */ for (i =0 ; i <ARRAY_SIZE (mod_map); i++) { - pcm_data = &pdata->pcm[i]; + pcm_data = &pdata->pcm[mod_map[i].dai_id][mod_map[i].stream];if (!pcm_data->substream)continue ;
Signature · 1 line
1.9.1
Quoted 4 lines · Jie Yang
A DAI may have 2 streams(playback/capture) and different modules may be needed for them respectively, so we need add a stream direction here, the
combination(dai_id + stream)can tell us which module we really need here.
Applied, thanks.
Mark Brown
maintainerQuoted 4 lines · Jie Yang
A DAI may have 2 streams(playback/capture) and different modules may be needed for them respectively, so we need add a stream direction here, the
combination(dai_id + stream)can tell us which module we really need here.
This doesn't seem to apply against current code, can you please check and resend?