| Message ID | 1469124230-8583-3-git-send-email-s.nawrocki@samsung.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 42a74e77471ea42e6ab44e5be16723ede72b9901 |
| Headers | show |
On Thu, Jul 21, 2016 at 8:03 PM, Sylwester Nawrocki <s.nawrocki@samsung.com> wrote: > The DMA channel names are specified through struct snd_dmaengine_pcm_config > rather than using SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME flag when > booting with devicetree in order to properly support deferred probing. > Without this change the sound machine driver initialization can complete > successfully with unavailable DMA resources. > Is this the fix for the issue I reported recently (http://www.spinics.net/lists/linux-clk/msg10805.html)? It looks like it, so a credit? :) BR, Krzysztof
On 07/21/2016 08:32 PM, Krzysztof Kozlowski wrote: > Is this the fix for the issue I reported recently > (http://www.spinics.net/lists/linux-clk/msg10805.html)? It looks like > it, so a credit? :) My apologies Krzysztof for this unfortunate omission, it's indeed a fix for the issue you've reported. You're doing a great job by continuously testing -next on multiple platforms and I just have miserably forgotten to give due credits. This can't be undone now but there must be something I can do in recompense. I could buy you an orange juice or whatever juice you like next time we meet.
On Thu, Jul 21, 2016 at 10:03 PM, Sylwester Nawrocki <sylvester.nawrocki@gmail.com> wrote: > On 07/21/2016 08:32 PM, Krzysztof Kozlowski wrote: > >> Is this the fix for the issue I reported recently >> (http://www.spinics.net/lists/linux-clk/msg10805.html)? It looks like >> it, so a credit? :) > > My apologies Krzysztof for this unfortunate omission, it's indeed a fix > for the issue you've reported. You're doing a great job by continuously > testing -next on multiple platforms and I just have miserably forgotten > to give due credits. This can't be undone now but there must be something > I can do in recompense. I could buy you an orange juice or whatever juice > you like next time we meet. My preferred juice is a fermented and distilled juice from malt so the only suitable compensation would be a barrel of 12 yo single malt whisky. It could be older than 12 years of course! :) BTW, I can provide you a tested by when I am back to the office - on Monday. Best regards, Krzysztof
On Thu, Jul 21, 2016 at 10:13 PM, Krzysztof Kozlowski <k.kozlowski@samsung.com> wrote: > On Thu, Jul 21, 2016 at 10:03 PM, Sylwester Nawrocki > <sylvester.nawrocki@gmail.com> wrote: >> On 07/21/2016 08:32 PM, Krzysztof Kozlowski wrote: >> >>> Is this the fix for the issue I reported recently >>> (http://www.spinics.net/lists/linux-clk/msg10805.html)? It looks like >>> it, so a credit? :) >> >> My apologies Krzysztof for this unfortunate omission, it's indeed a fix >> for the issue you've reported. You're doing a great job by continuously >> testing -next on multiple platforms and I just have miserably forgotten >> to give due credits. This can't be undone now but there must be something >> I can do in recompense. I could buy you an orange juice or whatever juice >> you like next time we meet. > > My preferred juice is a fermented and distilled juice from malt so the > only suitable compensation would be a barrel of 12 yo single malt > whisky. It could be older than 12 years of course! :) > > BTW, I can provide you a tested by when I am back to the office - on Monday. Oh, it is already applied... so no testing needed from my side... Damn, I am going sailing. Have a nice weekend folks! BR, Krzysztof
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index 4a7a503..547d310 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c @@ -389,7 +389,8 @@ static int s3c_ac97_probe(struct platform_device *pdev) goto err5; ret = samsung_asoc_dma_platform_register(&pdev->dev, - ac97_pdata->dma_filter); + ac97_pdata->dma_filter, + NULL, NULL); if (ret) { dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret); goto err5; diff --git a/sound/soc/samsung/dma.h b/sound/soc/samsung/dma.h index a7616cc..3830f29 100644 --- a/sound/soc/samsung/dma.h +++ b/sound/soc/samsung/dma.h @@ -26,7 +26,10 @@ struct s3c_dma_params { void samsung_asoc_init_dma_data(struct snd_soc_dai *dai, struct s3c_dma_params *playback, struct s3c_dma_params *capture); -int samsung_asoc_dma_platform_register(struct device *dev, - dma_filter_fn fn); - +/* + * @tx, @rx arguments can be NULL if the DMA channel names are "tx", "rx", + * otherwise actual DMA channel names must be passed to this function. + */ +int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter, + const char *tx, const char *rx); #endif diff --git a/sound/soc/samsung/dmaengine.c b/sound/soc/samsung/dmaengine.c index 0631259..2c87f38 100644 --- a/sound/soc/samsung/dmaengine.c +++ b/sound/soc/samsung/dmaengine.c @@ -28,10 +28,6 @@ #include "dma.h" -static struct snd_dmaengine_pcm_config samsung_dmaengine_pcm_config = { - .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, -}; - void samsung_asoc_init_dma_data(struct snd_soc_dai *dai, struct s3c_dma_params *playback, struct s3c_dma_params *capture) @@ -58,15 +54,28 @@ void samsung_asoc_init_dma_data(struct snd_soc_dai *dai, } EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data); -int samsung_asoc_dma_platform_register(struct device *dev, - dma_filter_fn filter) +int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter, + const char *tx, const char *rx) { - samsung_dmaengine_pcm_config.compat_filter_fn = filter; + unsigned int flags = SND_DMAENGINE_PCM_FLAG_COMPAT; + + struct snd_dmaengine_pcm_config *pcm_conf; + + pcm_conf = devm_kzalloc(dev, sizeof(*pcm_conf), GFP_KERNEL); + if (!pcm_conf) + return -ENOMEM; + + pcm_conf->prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config; + pcm_conf->compat_filter_fn = filter; + + if (dev->of_node) { + pcm_conf->chan_names[SNDRV_PCM_STREAM_PLAYBACK] = tx; + pcm_conf->chan_names[SNDRV_PCM_STREAM_CAPTURE] = rx; + } else { + flags |= SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME; + } - return devm_snd_dmaengine_pcm_register(dev, - &samsung_dmaengine_pcm_config, - SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME | - SND_DMAENGINE_PCM_FLAG_COMPAT); + return devm_snd_dmaengine_pcm_register(dev, pcm_conf, flags); } EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register); diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 2bb3550..50635ee 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1244,7 +1244,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) return ret; return samsung_asoc_dma_platform_register(&pdev->dev, - sec_dai->filter); + sec_dai->filter, "tx-sec", NULL); } pri_dai = i2s_alloc_dai(pdev, false); @@ -1351,7 +1351,8 @@ static int samsung_i2s_probe(struct platform_device *pdev) if (ret < 0) goto err_free_dai; - ret = samsung_asoc_dma_platform_register(&pdev->dev, pri_dai->filter); + ret = samsung_asoc_dma_platform_register(&pdev->dev, pri_dai->filter, + NULL, NULL); if (ret < 0) goto err_free_dai; diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index 498f563..490c1a8 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -576,7 +576,8 @@ static int s3c_pcm_dev_probe(struct platform_device *pdev) goto err5; } - ret = samsung_asoc_dma_platform_register(&pdev->dev, filter); + ret = samsung_asoc_dma_platform_register(&pdev->dev, filter, + NULL, NULL); if (ret) { dev_err(&pdev->dev, "failed to get register DMA: %d\n", ret); goto err5; diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index 204029d..d45dffb 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c @@ -177,7 +177,8 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) } ret = samsung_asoc_dma_platform_register(&pdev->dev, - pdata->dma_filter); + pdata->dma_filter, + NULL, NULL); if (ret) pr_err("failed to register the DMA: %d\n", ret); diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index b3a475d..3e76f2a 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -482,7 +482,8 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) } ret = samsung_asoc_dma_platform_register(&pdev->dev, - pdata->dma_filter); + pdata->dma_filter, + NULL, NULL); if (ret) pr_err("failed to register the dma: %d\n", ret); diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 4687f52..0cb9c85 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c @@ -435,7 +435,8 @@ static int spdif_probe(struct platform_device *pdev) spdif->dma_playback = &spdif_stereo_out; - ret = samsung_asoc_dma_platform_register(&pdev->dev, filter); + ret = samsung_asoc_dma_platform_register(&pdev->dev, filter, + NULL, NULL); if (ret) { dev_err(&pdev->dev, "failed to register DMA: %d\n", ret); goto err4;
The DMA channel names are specified through struct snd_dmaengine_pcm_config rather than using SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME flag when booting with devicetree in order to properly support deferred probing. Without this change the sound machine driver initialization can complete successfully with unavailable DMA resources. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> --- sound/soc/samsung/ac97.c | 3 ++- sound/soc/samsung/dma.h | 9 ++++++--- sound/soc/samsung/dmaengine.c | 31 ++++++++++++++++++++----------- sound/soc/samsung/i2s.c | 5 +++-- sound/soc/samsung/pcm.c | 3 ++- sound/soc/samsung/s3c2412-i2s.c | 3 ++- sound/soc/samsung/s3c24xx-i2s.c | 3 ++- sound/soc/samsung/spdif.c | 3 ++- 8 files changed, 39 insertions(+), 21 deletions(-)