ASoC: Intel: kbl_rt5663_rt5514_max98927: Fix kabylake_ssp_fixup function
Subsystems (3)
PATCH v7 1/1 ASoC: Intel: kbl_rt5663_rt5514_max98927: Fix kabylake_ssp_fixup function
kabylake_ssp_fixup function uses snd_soc_dpcm to identify the codecs DAIs. The hw parameters are changed based on the codec DAI,
the stream is intended for. The earlier approach to get snd_soc_dpcm was using container_of() macro on snd_pcm_hw_params. The structures have been modified over time and snd_soc_dpcm does not have snd_pcm_hw_params as a reference but as a copy.
This causes the current driver to crash when used.
This patch changes the way snd_soc_dpcm is extracted.
The snd_soc_pcm_runtime holds 2 dpcm
instances (one for playback and one for capture).
The 2 codecs on this SSP are dmic and speakers.
One is for capture and one is for playback respectively.
Based on the direction of the stream,
the snd_soc_dpcm is extracted from the snd_soc_pcm_runtime structure. Tested for all use cases of the driver.
---
v1 -> v2:
- Extract dmic from SSP0 as every BE should have own fixup function. v2 -> v3:
- Restore naming in the dapm route table to not confuse with other drivers
- Fixed indentations
v3 -> v4:
- Updated code and commit description according to solution proposed by Harsha
v4 -> v5:
- Cosmetic Changes
v5 -> v6:
- Dmic regression seen with v4 fixed
- Using available routines for obtaining dpcm information v6 -> v7:
- Updated comments
- initilize rtd_dpcm variable
- added break statement in the loop
---
--- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-)
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +29 -9
@@ -379,22 +379,42 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,struct snd_interval *chan =hw_param_interval (params,SNDRV_PCM_HW_PARAM_CHANNELS );struct snd_mask *fmt =hw_param_mask (params,SNDRV_PCM_HW_PARAM_FORMAT ); -struct snd_soc_dpcm *dpcm =container_of ( - params, struct snd_soc_dpcm, hw_params); -struct snd_soc_dai_link *fe_dai_link = dpcm->fe->dai_link; -struct snd_soc_dai_link *be_dai_link = dpcm->be->dai_link; +struct snd_soc_dpcm *dpcm, *rtd_dpcm =NULL ; + +/* +* The following loop will be called only for playback stream +* In this platform, there is only one playback device on every SSP +*/ +for_each_dpcm_fe (rtd,SNDRV_PCM_STREAM_PLAYBACK , dpcm) { + rtd_dpcm = dpcm; +break ; + } + +/* +* This following loop will be called only for capture stream +* In this platform, there is only one capture device on every SSP +*/ +for_each_dpcm_fe (rtd,SNDRV_PCM_STREAM_CAPTURE , dpcm) { + rtd_dpcm = dpcm; +break ; + } + +/* +* The above 2 loops are mutually exclusive based on the strem direction, +* thus rtd_dpcm variable will never be overwritten +*/ /* * The ADSP will convert the FE rate to 48k, stereo, 24 bit */ -if (!strcmp (fe_dai_link->name,"Kbl Audio Port" ) || - !strcmp (fe_dai_link->name,"Kbl Audio Headset Playback" ) || - !strcmp (fe_dai_link->name,"Kbl Audio Capture Port" )) { +if (!strcmp (rtd_dpcm->fe->dai_link->name,"Kbl Audio Port" ) || + !strcmp (rtd_dpcm->fe->dai_link->name,"Kbl Audio Headset Playback" ) || + !strcmp (rtd_dpcm->fe->dai_link->name,"Kbl Audio Capture Port" )) { rate->min = rate->max =48000 ; chan->min = chan->max =2 ;snd_mask_none (fmt);snd_mask_set_format (fmt,SNDRV_PCM_FORMAT_S24_LE ); - }else if (!strcmp (fe_dai_link->name,"Kbl Audio DMIC cap" )) { + }else if (!strcmp (rtd_dpcm->fe->dai_link->name,"Kbl Audio DMIC cap" )) {if (params_channels (params) ==2 ||DMIC_CH (dmic_constraints) ==2 ) chan->min = chan->max =2 ;
@@ -405,7 +425,7 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,* The speaker on the SSP0 supports S16_LE and not S24_LE. * thus changing the mask here */ -if (!strcmp (be_dai_link->name,"SSP0-Codec" )) +if (!strcmp (rtd_dpcm->be->dai_link->name,"SSP0-Codec" ))snd_mask_set_format (fmt,SNDRV_PCM_FORMAT_S16_LE );return 0 ;
Signature · 1 line
2.17.1
Hi Harsha,
this looks mostly good to me, only have a couple of nit-picks below. Thanks!
Quoted 7 lines
kabylake_ssp_fixupfunction usessnd_soc_dpcmto identify the codecs DAIs. The hw parameters are changed based on the codec DAI,
the stream is intended for. The earlier approach to getsnd_soc_dpcmwas usingcontainer_of()macro onsnd_pcm_hw_params. The structures have been modified over time andsnd_soc_dpcmdoes not havesnd_pcm_hw_paramsas a reference but as a copy.
This causes the current driver to crash when used.
Quoted 8 lines
This patch changes the way
snd_soc_dpcmis extracted.
Thesnd_soc_pcm_runtimeholds 2 dpcm
instances (one for playback and one for capture).
The 2 codecs on this SSP are dmic and speakers.
One is for capture and one is for playback respectively. Based on the direction of the stream,
thesnd_soc_dpcmis extracted from thesnd_soc_pcm_runtimestructure. Tested for all use cases of the driver.
Maybe reformat a bit and add newlines, this is difficult to read.
Quoted 9 lines
Signed-off-by Harsha Priya <[email protected]>Signed-off-by Vamshi Krishna Gopal <[email protected]>Tested-by Lukasz Majczak <[email protected]>sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +0
-0
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, · line 382
Quoted 8 lines
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +1
-4@@ -379,22 +379,42 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd,struct snd_interval *chan =hw_param_interval (params,SNDRV_PCM_HW_PARAM_CHANNELS );struct snd_mask *fmt =hw_param_mask (params,SNDRV_PCM_HW_PARAM_FORMAT ); -struct snd_soc_dpcm *dpcm =container_of ( - params, struct snd_soc_dpcm, hw_params); -struct snd_soc_dai_link *fe_dai_link = dpcm->fe->dai_link; -struct snd_soc_dai_link *be_dai_link = dpcm->be->dai_link; +struct snd_soc_dpcm *dpcm, *rtd_dpcm =NULL ;
The idea of initializing was also to test before dereferencing this pointer. Without the test, this is somewhat useless, tools may still complain about dereferencing a NULL pointer?
Quoted 8 lines
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +8
-0+ +/* +* The following loop will be called only for playback stream +* In this platform, there is only one playback device on every SSP +*/ +for_each_dpcm_fe (rtd,SNDRV_PCM_STREAM_PLAYBACK , dpcm) { + rtd_dpcm = dpcm; +break ;
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, · line 400
Quoted 10 lines
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +10
-0+ } + +/* +* This following loop will be called only for capture stream +* In this platform, there is only one capture device on every SSP +*/ +for_each_dpcm_fe (rtd,SNDRV_PCM_STREAM_CAPTURE , dpcm) { + rtd_dpcm = dpcm; +break ; + }
add if (!rtd_dpcm) return -EINVAL here?
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, · line 402
Quoted 2 lines
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +2
-0+/* +* The above 2 loops are mutually exclusive based on the strem direction,
typo: stream
Quoted 2 lines
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +2
-0+* thus rtd_dpcm variable will never be overwritten +*/