bugs in "ASoC: core - Optimise and refactor pcm_new() to pass only rtd"?
Subsystems (3)
Hi,
I've bisected a problem with an out of tree set of asoc drivers down to commit 552d1ef6b5a98d7b95959d5b139071e3c90cebf1 ("ASoC: core - Optimise and refactor pcm_new() to pass only rtd"). By the looks of it this change was intended not to change the workings of the code, however the dai parameter of pcm_new used to be passed codec_dai in soc_new_pcm() (initialised from rtd->codec_dai), but each driver now sets it's dai to rtd->cpu_dai instead. This seems to make the driver check the wrong dai's driver->capture.channels_min in the pcm_new callback, which makes it dereference pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream in the driver's preallocate_dma_buffer() function which can be NULL. Is this a bug (in every pcm asoc driver) that just happens not to have been noticed, or have I misunderstood it?
Relevant snippets of the original patch below.
Thanks
James
sound/soc/samsung/dma.c +4 -2
@@ -425,9 +425,11 @@ static void dma_free_dma_buffers(struct snd_pcm *pcm)static u64 dma_mask =DMA_BIT_MASK (32 ); -static int dma_new (struct snd_card *card, -struct snd_soc_dai *dai,struct snd_pcm *pcm) +static int dma_new (struct snd_soc_pcm_runtime *rtd) { +struct snd_card *card = rtd->card->snd_card; +struct snd_soc_dai *dai = rtd->cpu_dai; +struct snd_pcm *pcm = rtd->pcm;int ret =0 ;pr_debug ("Entered %s\n" , __func__);
sound/soc/soc-core.c +1 -2
@@ -2143,8 +2143,7 @@ static int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_CAPTURE , &soc_pcm_ops);if (platform->driver->pcm_new) { - ret = platform->driver->pcm_new (rtd->card->snd_card, - codec_dai, pcm); + ret = platform->driver->pcm_new (rtd);if (ret <0 ) {pr_err ("asoc: platform pcm constructor failed\n" );return ret;
Quoted 4 lines · James Hogan
I've bisected a problem with an out of tree set of asoc drivers down to commit
552d1ef6b5a98d7b95959d5b139071e3c90cebf1("ASoC: core - Optimise and refactorpcm_new()to pass only rtd"). By the looks of it this change was intended not to change the workings of the code, however the dai parameter ofpcm_newused
Quoted 8 lines
to be passed
codec_daiinsoc_new_pcm()(initialised fromrtd->codec_dai), but each driver now sets it's dai tortd->cpu_daiinstead. This seems to make the driver check the wrong dai'sdriver->capture.channels_minin thepcm_newcallback, which makes it dereference pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream in the driver'spreallocate_dma_buffer()function which can be NULL. Is this a bug (in every pcm asoc driver) that just happens not to have been noticed, or have I misunderstood it?
Your drivers should never have beenn relying on this behaviour of the core - see changes in the pxa and fsl drivers which remove similar assumptions. The CPU driver should be checking for the substream if it's looking to see if a particular substream is present, not peering inside the DAI for a random parameter.
Quoted 15 lines · Mark Brown
Quoted 4 lines · James Hogan
I've bisected a problem with an out of tree set of asoc drivers down to commit
552d1ef6b5a98d7b95959d5b139071e3c90cebf1("ASoC: core - Optimise and refactorpcm_new()to pass only rtd"). By the looks of it this change was intended not to change the workings of the code, however the dai parameter ofpcm_newusedQuoted 8 lines
to be passed
codec_daiinsoc_new_pcm()(initialised fromrtd->codec_dai), but each driver now sets it's dai tortd->cpu_daiinstead. This seems to make the driver check the wrong dai'sdriver->capture.channels_minin thepcm_newcallback, which makes it dereference pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream in the driver'spreallocate_dma_buffer()function which can be NULL. Is this a bug (in every pcm asoc driver) that just happens not to have been noticed, or have I misunderstood it?
Quoted 5 lines
Your drivers should never have beenn relying on this behaviour of the core - see changes in the pxa and fsl drivers which remove similar assumptions. The CPU driver should be checking for the substream if it's looking to see if a particular substream is present, not peering inside the DAI for a random parameter.
Thanks Mark, we were basing our drivers on one of the other ones (I think the atmel one, which still seems to do it as of v3.2-rc4).
Cheers
James