| Message ID | 1384264120-24750-2-git-send-email-broonie@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Hi Mark, On Tue, Nov 12, 2013 at 7:18 PM, Mark Brown <broonie@kernel.org> wrote: > From: Mark Brown <broonie@linaro.org> > > Since all Exynos platforms have been converted to dmaengine and many of > the older platforms are in the process of conversion they do not need to > use the legacy s3c-dma APIs for DMA but can instead use the standard ASoC > dmaengine helpers. This both allows them to benefit from improvements > implemented in the generic code and supports multiplatform. > > Signed-off-by: Mark Brown <broonie@linaro.org> > --- > > This depends on Tomasz's s3c64xx dmaengine conversion since that is how > I've tested it - if possible I'd like to get that merged into ASoC and > SPI early after -rc1, since I maintian both trees it's possibly easiest > if I go ahead any apply it? > > sound/soc/samsung/Kconfig | 13 +++++-- > sound/soc/samsung/Makefile | 6 ++-- > sound/soc/samsung/dma.h | 3 ++ > sound/soc/samsung/dmaengine.c | 82 +++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 100 insertions(+), 4 deletions(-) > create mode 100644 sound/soc/samsung/dmaengine.c > [snip] > void samsung_asoc_init_dma_data(struct snd_soc_dai *dai, > diff --git a/sound/soc/samsung/dmaengine.c b/sound/soc/samsung/dmaengine.c > new file mode 100644 > index 0000000..ad0a371 > --- /dev/null > +++ b/sound/soc/samsung/dmaengine.c > @@ -0,0 +1,82 @@ > +/* > + * dmaengine.c - Samsung dmaengine wrapper > + * > + * Author: Mark Brown <broonie@linaro.org> > + * Copyright 2013 Linaro > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * version 2 as published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, but > + * WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * General Public License for more details. > + * > + */ > + > +#include <linux/module.h> > +#include <linux/amba/pl08x.h> > + > +#include <sound/core.h> > +#include <sound/pcm.h> > +#include <sound/pcm_params.h> > +#include <sound/dmaengine_pcm.h> > +#include <sound/soc.h> > +#include <sound/soc-dai.h> > + > +#include "dma.h" > + > +#ifdef CONFIG_ARCH_S3C64XX > +#define filter_fn pl08x_filter_id > +#else > +#define filter_fn NULL > +#endif > + > +static const struct snd_dmaengine_pcm_config samsung_dmaengine_pcm_config = { > + .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, > + .compat_filter_fn = filter_fn, > +}; > + > +void samsung_asoc_init_dma_data(struct snd_soc_dai *dai, > + struct s3c_dma_params *playback, > + struct s3c_dma_params *capture) > +{ > + struct snd_dmaengine_dai_dma_data *playback_data = NULL; > + struct snd_dmaengine_dai_dma_data *capture_data = NULL; > + > + if (playback) { > + playback_data = &playback->dma_data; > + playback_data->filter_data = (void *)playback->channel; > + playback_data->chan_name = playback->ch_name; > + playback_data->addr = playback->dma_addr; > + playback_data->addr_width = playback->dma_size; > + } > + if (capture) { > + capture_data = &capture->dma_data; > + capture_data->filter_data = (void *)capture->channel; > + capture_data->chan_name = capture->ch_name; > + capture_data->addr = capture->dma_addr; > + capture_data->addr_width = capture->dma_size; > + } > + > + snd_soc_dai_init_dma_data(dai, playback_data, capture_data); > +} > +EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data); > + > +int samsung_asoc_dma_platform_register(struct device *dev) > +{ > + return snd_dmaengine_pcm_register(dev, &samsung_dmaengine_pcm_config, > + SND_DMAENGINE_PCM_FLAG_COMPAT); also need to pass flag SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME here? I tested this patch set on smdk5420 i2s. During playback audio playing fast and there is underrun error like below. underrun!!! (at least 0.061 ms long) underrun!!! (at least 0.043 ms long) Thanks Padma -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Nov 26, 2013 at 10:55:17AM +0530, Padma Venkat wrote: > I tested this patch set on smdk5420 i2s. During playback audio playing > fast and there is underrun error like below. > underrun!!! (at least 0.061 ms long) > underrun!!! (at least 0.043 ms long) This sounds like it's setting the transfer width incorrectly, though I can't immediately see how that's changed unless the DMA driver is not working correctly. What exactly did you do to test?
Hi Mark, On Tue, Nov 26, 2013 at 3:53 PM, Mark Brown <broonie@kernel.org> wrote: > On Tue, Nov 26, 2013 at 10:55:17AM +0530, Padma Venkat wrote: > >> I tested this patch set on smdk5420 i2s. During playback audio playing >> fast and there is underrun error like below. >> underrun!!! (at least 0.061 ms long) >> underrun!!! (at least 0.043 ms long) > > This sounds like it's setting the transfer width incorrectly, though I > can't immediately see how that's changed unless the DMA driver is not > working correctly. What exactly did you do to test? I tried this on linux-samsung tree by applying all the patches from you and Lars. I initialised the dma_data for secondary dai as there is a crash with out that. Then I used aplay after running the mixer settings. ./aplay /mars/share/sounds/alsa/Front_Center.wav Thanks Padma -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Nov 26, 2013 at 04:18:41PM +0530, Padma Venkat wrote: > I tried this on linux-samsung tree by applying all the patches from > you and Lars. Can you use -next plus the posted patches please in case there's something been misplaced, it'll help if we're working from the same code base? > I initialised the dma_data for secondary dai as there is a crash with out that. Can you please send a patch for that if you find it's needed? Like I said in reply to your earlier mail it looks like this doesn't work anyway so mainline ought to be fixed. > Then I used aplay after running the mixer settings. > ./aplay /mars/share/sounds/alsa/Front_Center.wav So this is 16 bit stereo or something, and did it work beforehand? Like I say I suspect the DMA is ending up being configured with the wrong transfer size, can you check what actually happens there please - what's different about the configuration that the DMA controller gets? I don't have any Exynos systems with mainline audio support so I can't test anything myself.
Hi Mark, On Tue, Nov 26, 2013 at 5:50 PM, Mark Brown <broonie@kernel.org> wrote: > On Tue, Nov 26, 2013 at 04:18:41PM +0530, Padma Venkat wrote: > >> I tried this on linux-samsung tree by applying all the patches from >> you and Lars. > > Can you use -next plus the posted patches please in case there's > something been misplaced, it'll help if we're working from the same code > base? Sound tree has some booting issue on smdk5420 so I tried this on linux-samsung tree. > >> I initialised the dma_data for secondary dai as there is a crash with out that. > > Can you please send a patch for that if you find it's needed? Like I > said in reply to your earlier mail it looks like this doesn't work > anyway so mainline ought to be fixed. Okay. I will send a patch. > >> Then I used aplay after running the mixer settings. >> ./aplay /mars/share/sounds/alsa/Front_Center.wav > > So this is 16 bit stereo or something, and did it work beforehand? Like > I say I suspect the DMA is ending up being configured with the wrong > transfer size, can you check what actually happens there please - what's > different about the configuration that the DMA controller gets? I don't > have any Exynos systems with mainline audio support so I can't test > anything myself. This stream was working before. dma_size in i2s_hw_params not getting effected as dma_data is getting initialized only at dai probe time. So by default the dma_size is always 4 which is initialized at driver probe time. The fifo_size of dai is also always 0. It is not getting passed from dai driver. I just hard coded the dma_size to 2 and fifo_size to 32 then I can hear the audio only on right ear phone. Still underrun error message appears. Thanks Padma -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Nov 27, 2013 at 06:08:47PM +0530, Padma Venkat wrote: > On Tue, Nov 26, 2013 at 5:50 PM, Mark Brown <broonie@kernel.org> wrote: > > So this is 16 bit stereo or something, and did it work beforehand? Like > > I say I suspect the DMA is ending up being configured with the wrong > > transfer size, can you check what actually happens there please - what's > > different about the configuration that the DMA controller gets? I don't > > have any Exynos systems with mainline audio support so I can't test > > anything myself. > This stream was working before. dma_size in i2s_hw_params not getting > effected as dma_data is getting initialized only at dai probe time. So > by default the dma_size is always 4 which is initialized at driver > probe time. The fifo_size of dai is also always 0. It is not getting > passed from dai driver. I just hard coded the dma_size to 2 and But if it's initialised at probe time then when is it getting overwritten? This must be something triggered by DT which unfortunately I can't test. It's a bit of a shame that the flows are different between the DT and non-DT cases. The FIFO size looks like a difference between the pl330 and pl080, it doesn't seem to matter for pl080. We just need to set it though. > fifo_size to 32 then I can hear the audio only on right ear phone. > Still underrun error message appears. Are you sure that dma_size should be 2? The i2s DAI driver seems to be hard coding it to 4.
Hi Mark, On Wed, Nov 27, 2013 at 8:35 PM, Mark Brown <broonie@kernel.org> wrote: > On Wed, Nov 27, 2013 at 06:08:47PM +0530, Padma Venkat wrote: >> On Tue, Nov 26, 2013 at 5:50 PM, Mark Brown <broonie@kernel.org> wrote: > >> > So this is 16 bit stereo or something, and did it work beforehand? Like >> > I say I suspect the DMA is ending up being configured with the wrong >> > transfer size, can you check what actually happens there please - what's >> > different about the configuration that the DMA controller gets? I don't >> > have any Exynos systems with mainline audio support so I can't test >> > anything myself. > >> This stream was working before. dma_size in i2s_hw_params not getting >> effected as dma_data is getting initialized only at dai probe time. So >> by default the dma_size is always 4 which is initialized at driver >> probe time. The fifo_size of dai is also always 0. It is not getting >> passed from dai driver. I just hard coded the dma_size to 2 and > > But if it's initialised at probe time then when is it getting > overwritten? This must be something triggered by DT which unfortunately > I can't test. It's a bit of a shame that the flows are different > between the DT and non-DT cases. it's getting overwritten in i2s_hw_params which is happening after dma_data got initialized in dai probe. Based on mono or stereo channel this value getting initialized to 2 or 4 respectively in i2s_hw_params. This value is not triggered by DT now. > > The FIFO size looks like a difference between the pl330 and pl080, it > doesn't seem to matter for pl080. We just need to set it though. fifo_size seems doesn't have any effect even in this case. > >> fifo_size to 32 then I can hear the audio only on right ear phone. >> Still underrun error message appears. > > Are you sure that dma_size should be 2? The i2s DAI driver seems to be > hard coding it to 4. I think for mono files the dma_size should be 2 only. Right now based on mono or stereo this value getting overwritten in i2s_hw_params. Initially it is hardcoded to 4. Due to this commit "ASoC: samsung: Allow mono in i2s driver" which was not there earlier, I got confused. Now it seems clear except that underrun message which I am still debugging. Thanks Padma -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 6afcf9d..cd21a8e 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -1,13 +1,22 @@ config SND_SOC_SAMSUNG tristate "ASoC support for Samsung" depends on PLAT_SAMSUNG || COMPILE_TEST - select S3C64XX_DMA if ARCH_S3C64XX - select S3C24XX_DMA if ARCH_S3C24XX + select S3C2410_DMA if ARCH_S3C24XX + select S3C64XX_PL080 if ARCH_S3C64XX + select SND_S3C_DMA if !ARCH_S3C24XX + select SND_S3C_DMA_LEGACY if ARCH_S3C24XX + select SND_SOC_GENERIC_DMAENGINE_PCM if !ARCH_S3C24XX help Say Y or M if you want to add support for codecs attached to the Samsung SoCs' Audio interfaces. You will also need to select the audio interfaces to support below. +config SND_S3C_DMA + tristate + +config SND_S3C_DMA_LEGACY + tristate + config SND_S3C24XX_I2S tristate select S3C2410_DMA diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile index 709f605..86715d8 100644 --- a/sound/soc/samsung/Makefile +++ b/sound/soc/samsung/Makefile @@ -1,5 +1,6 @@ # S3c24XX Platform Support -snd-soc-s3c24xx-objs := dma.o +snd-soc-s3c-dma-objs := dmaengine.o +snd-soc-s3c-dma-legacy-objs := dma.o snd-soc-idma-objs := idma.o snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o @@ -9,7 +10,8 @@ snd-soc-samsung-spdif-objs := spdif.o snd-soc-pcm-objs := pcm.o snd-soc-i2s-objs := i2s.o -obj-$(CONFIG_SND_SOC_SAMSUNG) += snd-soc-s3c24xx.o +obj-$(CONFIG_SND_S3C_DMA) += snd-soc-s3c-dma.o +obj-$(CONFIG_SND_S3C_DMA_LEGACY) += snd-soc-s3c-dma-legacy.o obj-$(CONFIG_SND_S3C24XX_I2S) += snd-soc-s3c24xx-i2s.o obj-$(CONFIG_SND_SAMSUNG_AC97) += snd-soc-ac97.o obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o diff --git a/sound/soc/samsung/dma.h b/sound/soc/samsung/dma.h index fb09a1c..225e537 100644 --- a/sound/soc/samsung/dma.h +++ b/sound/soc/samsung/dma.h @@ -12,6 +12,8 @@ #ifndef _S3C_AUDIO_H #define _S3C_AUDIO_H +#include <sound/dmaengine_pcm.h> + struct s3c_dma_params { struct s3c2410_dma_client *client; /* stream identifier */ int channel; /* Channel ID */ @@ -20,6 +22,7 @@ struct s3c_dma_params { unsigned ch; struct samsung_dma_ops *ops; char *ch_name; + struct snd_dmaengine_dai_dma_data dma_data; }; void samsung_asoc_init_dma_data(struct snd_soc_dai *dai, diff --git a/sound/soc/samsung/dmaengine.c b/sound/soc/samsung/dmaengine.c new file mode 100644 index 0000000..ad0a371 --- /dev/null +++ b/sound/soc/samsung/dmaengine.c @@ -0,0 +1,82 @@ +/* + * dmaengine.c - Samsung dmaengine wrapper + * + * Author: Mark Brown <broonie@linaro.org> + * Copyright 2013 Linaro + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + */ + +#include <linux/module.h> +#include <linux/amba/pl08x.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/dmaengine_pcm.h> +#include <sound/soc.h> +#include <sound/soc-dai.h> + +#include "dma.h" + +#ifdef CONFIG_ARCH_S3C64XX +#define filter_fn pl08x_filter_id +#else +#define filter_fn NULL +#endif + +static const struct snd_dmaengine_pcm_config samsung_dmaengine_pcm_config = { + .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, + .compat_filter_fn = filter_fn, +}; + +void samsung_asoc_init_dma_data(struct snd_soc_dai *dai, + struct s3c_dma_params *playback, + struct s3c_dma_params *capture) +{ + struct snd_dmaengine_dai_dma_data *playback_data = NULL; + struct snd_dmaengine_dai_dma_data *capture_data = NULL; + + if (playback) { + playback_data = &playback->dma_data; + playback_data->filter_data = (void *)playback->channel; + playback_data->chan_name = playback->ch_name; + playback_data->addr = playback->dma_addr; + playback_data->addr_width = playback->dma_size; + } + if (capture) { + capture_data = &capture->dma_data; + capture_data->filter_data = (void *)capture->channel; + capture_data->chan_name = capture->ch_name; + capture_data->addr = capture->dma_addr; + capture_data->addr_width = capture->dma_size; + } + + snd_soc_dai_init_dma_data(dai, playback_data, capture_data); +} +EXPORT_SYMBOL_GPL(samsung_asoc_init_dma_data); + +int samsung_asoc_dma_platform_register(struct device *dev) +{ + return snd_dmaengine_pcm_register(dev, &samsung_dmaengine_pcm_config, + SND_DMAENGINE_PCM_FLAG_COMPAT); +} +EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register); + +void samsung_asoc_dma_platform_unregister(struct device *dev) +{ + return snd_dmaengine_pcm_unregister(dev); +} +EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_unregister); + +MODULE_AUTHOR("Mark Brown <broonie@linaro.org>"); +MODULE_DESCRIPTION("Samsung dmaengine ASoC driver"); +MODULE_LICENSE("GPL");