June 2012 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v2] ASoC: tlv320aic3x: add missing registers and bits
by Prchal Jiří 03 Jul '12

03 Jul '12

Second version of patch keeping formatting. Adds missing register default values to cache. Adds register and bits definitions in header file. Changes are for TLV320AIC310x based on data sheet. Signed-off-by: Jiri Prchal <jiri.prchal(a)aksignal.cz> --- /home/prchal/arm/fw-cdu/linux/linux-3.5-rc3/sound/soc/codecs/tlv320aic3x.c.orig +++ /home/prchal/arm/fw-cdu/linux/linux-3.5-rc3/sound/soc/codecs/tlv320aic3x.c.new @@ -122,7 +122,9 @@ 0x00, 0x00, 0x00, 0x00, /* 88 */ 0x00, 0x00, 0x00, 0x00, /* 92 */ 0x00, 0x00, 0x00, 0x00, /* 96 */ - 0x00, 0x00, 0x02, /* 100 */ + 0x00, 0x00, 0x02, 0x00, /* 100 */ + 0x00, 0x00, 0x00, 0x00, /* 104 */ + 0x00, 0x00, /* 108 */ }; --- /home/prchal/arm/fw-cdu/linux/linux-3.5-rc3/sound/soc/codecs/tlv320aic3x.h +++ /home/prchal/arm/fw-cdu/linux/linux-3.5-rc3/sound/soc/codecs/tlv320aic3x.h.new @@ -13,7 +13,7 @@ #define _AIC3X_H /* AIC3X register space */ -#define AIC3X_CACHEREGNUM 103 +#define AIC3X_CACHEREGNUM 110 /* Page select register */ #define AIC3X_PAGE_SELECT 0 @@ -74,6 +74,8 @@ #define HPLCOM_CFG 37 /* Right High Power Output control registers */ #define HPRCOM_CFG 38 +/* High Power Output Stage Control Register */ +#define HPOUT_SC 40 /* DAC Output Switching control registers */ #define DAC_LINE_MUX 41 /* High Power Output Driver Pop Reduction registers */ @@ -148,6 +150,17 @@ #define AIC3X_GPIOB_REG 101 /* Clock generation control register */ #define AIC3X_CLKGEN_CTRL_REG 102 +/* New AGC registers */ +#define LAGCN_ATTACK 103 +#define LAGCN_DECAY 104 +#define RAGCN_ATTACK 105 +#define RAGCN_DECAY 106 +/* New Programmable ADC Digital Path and I2C Bus Condition Register */ +#define NEW_ADC_DIGITALPATH 107 +/* Passive Analog Signal Bypass Selection During Powerdown Register */ +#define PASSIVE_BYPASS 108 +/* DAC Quiescent Current Adjustment Register */ +#define DAC_ICC_ADJ 109 /* Page select register bits */ #define PAGE0_SELECT 0 @@ -163,6 +176,10 @@ #define DUAL_RATE_MODE ((1 << 5) | (1 << 6)) #define LDAC2LCH (0x1 << 3) #define RDAC2RCH (0x1 << 1) +#define LDAC2RCH (0x2 << 3) +#define RDAC2LCH (0x2 << 1) +#define LDAC2MONOMIX (0x3 << 3) +#define RDAC2MONOMIX (0x3 << 1) /* PLL registers bitfields */ #define PLLP_SHIFT 0

2 5

[alsa-devel] 2.6.18 unknown symbol ksize error
by Patrick Shirkey 02 Jul '12

02 Jul '12

Hi, I have compiled the latest stable alsa drivers against 2.6.18 kernel with gcc-4.1. I am getting an error when I insert the sound card modules. snd_rawmidi: Unknown symbol ksize As far as I can tell 2.6.18 has support for ksize so I am not sure where this error is coming from. -- Patrick Shirkey Boost Hardware Ltd

3 6

[alsa-devel] alsa-driver cross compile problem - upgrading ALSA
by Max Klein 02 Jul '12

02 Jul '12

I am running 2.6.27 kernel on arm board with ALSA driver version 1.0.17 (cat /proc/asound/version) and I would like to update ALSA driver version to current 1.0.25. I am trying to build alsa-drivers with "./configure --with-cross=arm-none-linux-gnueabi- --enable-dynamic-minors --with-debug=full --with-isapnp=no --with-oss=no --with-kernel=/data/src/kernel/linux-davinci --with-build=/data/src/kernel/linux-davinci --with-sequencer=no" Afterwards I compile it via "make ARCH=arm" but this fails we the following error: In file included from /data/VRM/davinci33/alsa-1.0.25/alsa-driver-1.0.25/acore/hrtimer.c:1: /data/VRM/davinci33/alsa-1.0.25/alsa-driver-1.0.25/include/adriver.h:753: error: static declaration of 'jiffies_to_msecs' follows non-static declaration include/linux/jiffies.h:286: error: previous declaration of 'jiffies_to_msecs' was here /data/VRM/davinci33/alsa-1.0.25/alsa-driver-1.0.25/include/adriver.h:772: error: static declaration of 'msecs_to_jiffies' follows non-static declaration include/linux/jiffies.h:288: error: previous declaration of 'msecs_to_jiffies' was here Can someone please help me how to get ALSA upgraded on my platform? Obviously I am either doing something wrong when configuring or I am on the absolutely wrong way? I am looking forward for any advice, thanks in advance! -- NEU: FreePhone 3-fach-Flat mit kostenlosem Smartphone! Jetzt informieren: http://mobile.1und1.de/?ac=OM.PW.PW003K20328T7073a

3 3

[alsa-devel] [PATCH] mioa701 convert to snd_soc_register_card API
by Robert Jarzmik 01 Jul '12

01 Jul '12

The mioa701 board code is converted to the snd_soc_register_card() and snd_soc_unregister_card() APIs. Signed-off-by: Robert Jarzmik <robert.jarzmik(a)free.fr> --- sound/soc/pxa/mioa701_wm9713.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c index 9c585af..8687c1c 100644 --- a/sound/soc/pxa/mioa701_wm9713.c +++ b/sound/soc/pxa/mioa701_wm9713.c @@ -186,36 +186,27 @@ static struct snd_soc_card mioa701 = { .num_links = ARRAY_SIZE(mioa701_dai), }; -static struct platform_device *mioa701_snd_device; - -static int mioa701_wm9713_probe(struct platform_device *pdev) +static int __devinit mioa701_wm9713_probe(struct platform_device *pdev) { - int ret; + int rc; if (!machine_is_mioa701()) return -ENODEV; - dev_warn(&pdev->dev, "Be warned that incorrect mixers/muxes setup will" - "lead to overheating and possible destruction of your device." - "Do not use without a good knowledge of mio's board design!\n"); - - mioa701_snd_device = platform_device_alloc("soc-audio", -1); - if (!mioa701_snd_device) - return -ENOMEM; - - platform_set_drvdata(mioa701_snd_device, &mioa701); - - ret = platform_device_add(mioa701_snd_device); - if (!ret) - return 0; - - platform_device_put(mioa701_snd_device); - return ret; + mioa701.dev = &pdev->dev; + rc = snd_soc_register_card(&mioa701); + if (!rc) + dev_warn(&pdev->dev, "Be warned that incorrect mixers/muxes setup will" + "lead to overheating and possible destruction of your device." + " Do not use without a good knowledge of mio's board design!\n"); + return rc; } static int __devexit mioa701_wm9713_remove(struct platform_device *pdev) { - platform_device_unregister(mioa701_snd_device); + struct snd_soc_card *card = platform_get_drvdata(pdev); + + snd_soc_unregister_card(card); return 0; } -- 1.7.10

2 1

[alsa-devel] [PATCH] ASoC: soc-dapm: Use ASYNC_DOMAIN_EXCLUSIVE
by Fabio Estevam 01 Jul '12

01 Jul '12

From: Fabio Estevam <fabio.estevam(a)freescale.com> commit e895407d (async: introduce 'async_domain' type) changed the parameter types of async_schedule_domain() and async_synchronize_full_domain(). Use ASYNC_DOMAIN_EXCLUSIVE and fix the following build warnings: sound/soc/soc-dapm.c:1646:6: warning: passing argument 3 of 'async_schedule_domain' from incompatible pointer type sound/soc/soc-dapm.c:1647:2: warning: passing argument 1 of 'async_synchronize_full_domain' from incompatible pointer type sound/soc/soc-dapm.c:1660:6: warning: passing argument 3 of 'async_schedule_domain' from incompatible pointer type sound/soc/soc-dapm.c:1661:2: warning: passing argument 1 of 'async_synchronize_full_domain' from incompatible pointer type Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Build tested only. sound/soc/soc-dapm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 9670668..c93e832 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1572,7 +1572,7 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event) struct snd_soc_dapm_context *d; LIST_HEAD(up_list); LIST_HEAD(down_list); - LIST_HEAD(async_domain); + ASYNC_DOMAIN_EXCLUSIVE(async_domain); enum snd_soc_bias_level bias; trace_snd_soc_dapm_start(card); -- 1.7.1

2 1

Re: [alsa-devel] [PATCH] ASoC: tegra: use dmaengine based dma driver
by Stephen Warren 29 Jun '12

29 Jun '12

On 06/29/2012 05:34 AM, Laxman Dewangan wrote: > Use the dmaengine based Tegra APB DMA driver for > data transfer between SPI fifo and memory in > place of legacy Tegra APB DMA. > > Because generic soc-dmaengine-pcm uses the DMAs API > based on dmaengine, using the exported APIs provided > by this generic driver. > > The new driver is selected if legacy driver is not > selected and new dma driver is enabled through config > file. This works just fine with the existing non-dmaengine DMA driver enabled. However, I can't get it to work with dmaengine: > # aplay ~/abba-dq-48000-stereo.wav > [ 151.613476] tegra20-i2s tegra20-i2s.0: dmaengine pcm open failed with err -6 > [ 151.620557] tegra20-i2s tegra20-i2s.0: can't open platform tegra20-i2s.0: -6 > aplay: main:654: audio open error: No such device or address I do have the following in my local tree: 68a67b8 ARM: tegra: add device tree AUXDATA for APBDMA 0db7a96 ARM: tegra: dma: rename driver name for clock to "tegra-apbdma" I also fixed the compatible values in drivers/dma/tegra20-apb-dma.c so the driver would get instantiated, which it does; /sys/devices/tegra-apbdma/dma has a bunch of dmaengine channels in it. (Note: This is on Ventana, although I doubt that makes much difference) Is there something else I need to do to test this?

1 0

Re: [alsa-devel] [PATCH] ASoC: snd_dmaengine: add common api for pcm_mmap
by Takashi Iwai 29 Jun '12

29 Jun '12

At Thu, 28 Jun 2012 19:06:07 +0530, Laxman Dewangan wrote: > > On Thursday 28 June 2012 06:58 PM, Takashi Iwai wrote: > > At Thu, 28 Jun 2012 18:34:02 +0530, > > Laxman Dewangan wrote: > >> On Thursday 28 June 2012 06:27 PM, Takashi Iwai wrote: > >>> At Thu, 28 Jun 2012 18:05:53 +0530, > >>> Laxman Dewangan wrote: > >>>> On Thursday 28 June 2012 05:58 PM, Mark Brown wrote: > >>>>> * PGP Signed by an unknown key > >>>>> > >>>>> On Thu, Jun 28, 2012 at 02:30:26PM +0200, Lars-Peter Clausen wrote: > >>>>>> On 06/28/2012 02:18 PM, Mark Brown wrote: > >>>>>>> Oh, dear - this means we don't actually have a generic API at all. Is > >>>>>>> there any effort being made to make this generally available? > >>>>>> Yes there is, and in fact in next/master there is generic > >>>>>> dma_mmap_writecombine. I'm not quite sure how it behaves on non ARM archs > >>>>>> though. But in theory it should fallback to a normal coherent mapping. Marek > >>>>>> did a lot of work on this, I've put him on Cc. > >>>> So can we put the function snd_pcm_lib_writecombine_mmap() in the > >>>> pcm_native.c and only export this api for ARM i.e. under macro #ifdef > >>>> CONFIG_ARM so that ARM based SOCs like Tegra/epa3xx/mxs/spear can > >>>> directly use that one? > >>>> Or, wait for this common API until all ARCH support it? > >>> I think it's fine to put it first in ALSA side with some ifdef. > >>> A similar trick is already found for snd_pcm_lib_mmap_iomem. > >>> See include/sound/pcm.h. > >>> > >>> But, actually it's a still question what if an architecture doesn't > >>> support the mmap of writecombine at all. The proposed patch doesn't > >>> allow you to know whether writecombine-mmap is possible or not on the > >>> running architecture until you really try to call it and fail. > >>> It's a missing piece, IMO. > >> Lars wanted to move the buffer allocation also to common place. > > Which common place? > > He wanted to refactor allocation part also at same time and so I guessed > that it will be in some common place and though about the sound/core. But the memory allocation rework is basically irrelevant from what's needed for pcm_mmap_writecombine() now. It'd need a lot more reworks than the simple addition of dma_mmap_writecombine() wrapper. > >> Then how about this? > >> create new file and header for snd-pcm-writecombine-buffer.c/.h and put > >> this in sound/core. > >> Select this file compilation through config SND_PCM_WRITECOMBINE_BUFFER > >> which will be select this config through sound/soc/xxx/Kconfig if they > >> want to use. > >> This will provide three apis: new, free and mmap. > > Way too much hustles than necessary... > Ooh no. :-( I had taken the idea from snd_dmaengine_pcm driver. > Bit I like to hear simple way which solves the purpose. As Lars suggested, a simple ifdef should suffice for now. With the upcoming generic dma_mmap_writecombine() stuff, it'd be even simpler in future. But, still we need to be careful about this. As mentioned, there is no flag to know the possibility of writecombine mmap beforehand. It'd be nice if we have either a compile-time or a run-time flag / function to check that. Then the driver can also expose the mmap capability to user-space depending on the flag. Takashi

2 1

Re: [alsa-devel] [PATCH 0/3] ASoC: Move pcm writecombine dma buffer allocation to core
by Lars-Peter Clausen 29 Jun '12

29 Jun '12

On 06/29/2012 05:04 PM, Laxman Dewangan wrote: > [...] > > >> +/* allocate the coherent DMA pages */ >> +static void *snd_malloc_dev_pages(struct device *dev, size_t size, >> dma_addr_t *dma) >> +{ >> + return __snd_malloc_dev_pages(dev, size, dma, dma_alloc_coherent); > > This does not get compiled in ARM because dma_alloc_coherant is macro > defined as > > #define dma_alloc_coherent(d, s, h, f) dma_alloc_attrs(d, s, h, f, NULL) > > static inline void *dma_alloc_attrs(struct device *dev, size_t size, > dma_addr_t *dma_handle, gfp_t flag, > struct dma_attrs *attrs) > > > I fixed this by > static void *_dma_alloc_coherent(struct device *dev, size_t size, > dma_addr_t *dma_handle, gfp_t flag) > { > return dma_alloc_coherent(dev, size, dma_handle, flag); > } > > /* allocate the coherent DMA pages */ > static void *snd_malloc_dev_pages(struct device *dev, size_t size, > dma_addr_t *dma) > { > return _snd_malloc_dev_pages(dev, size, dma, _dma_alloc_coherent); > } I think all dma_alloc_* functions use dma_alloc_attrs internally these days. I think it might be a better idea just to use dma_alloc_attrs in __snd_malloc_dev_pages and just pass a dma_attrs struct instead of a function. Something like: static void *__snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *dma, struct dma_attrs *attrs) { .... res = dma_alloc_attrs(dev, PAGE_SIZE << pg, dma, gfp_flags, attrs); .... } static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *dma) { return __snd_malloc_dev_pages(dev, size, dma, NULL); } static void *snd_malloc_dev_wc_pages(struct device *dev, size_t size, dma_addr_t *dma) { DEFINE_DMA_ATTRS(attrs); dma_set_attr(DMA_ATTR_WRITE_COMBINE, &attrs); return __snd_malloc_dev_pages(dev, size, dma, &attrs); } Same applies for freeing the memory again. - Lars

2 2

Re: [alsa-devel] [PATCH 0/3] ASoC: Move pcm writecombine dma buffer allocation to core
by Takashi Iwai 29 Jun '12

29 Jun '12

At Fri, 29 Jun 2012 20:34:24 +0530, Laxman Dewangan wrote: > > Hi Takashi, > Thanks for sample code. It helps lot. > > On Friday 29 June 2012 05:43 PM, Takashi Iwai wrote: > > At Fri, 29 Jun 2012 15:53:15 +0530, > > Laxman Dewangan wrote: > >> Some of the ARM based soc allocate the writecombine dma buffer for > >> pcm substreams. They have the same codes for managing this buffer. > >> Moving this to the core/pcm files so that they can use that directly. > >> > >> Remove the code from Tegra PCM and use these new library function. > >> > >> This is enabled only for ARM specific and can be extended to other > >> architecture if they support the writecombine dma buffer. > >> > >> This patch is based on detail discussion on patch: > >> [PATCH] ASoC: snd_dmaengine: add common api for pcm_mmap > >> And suggestion from Lars and Takashi. > > Looking through your patch, I think an easier integration is just to > > add writecombine option to memalloc.c which calls > > dma_alloc_writecombine() instead of dma_alloc_coherent(). > > > > The addition for mmap is still an open question. Again, an easier > > option so far looks like just add the call of dma_alloc_writecombine() > > in snd_pcm_lib_default_mmap(). Alternatively, we can create an > > individual mmap pcm_ops as we discussed. > > > > Below is a totally untested patch, but you can imagine what I meant. > > > > After this change, replace with snd_pcm_lib_malloc_pages with > > SNDRV_DMA_TYPE_DEV_WC, and that's all you need in the driver side. > > We can not use the snd_pcm_lib_malloc_pages() in the pcm_new callback > because at this time the substream->runtime is not initialized and it > leads to the kernel crash. > > I used the apis as > > int snd_soc_pcm_new_wc_dma_buffer(struct snd_soc_pcm_runtime *rtd, > size_t max_bytes) > { > ::::::::::::: > substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; > if (substream) { > substream->dma_buffer.dev.type = SNDRV_DMA_TYPE_DEV_WC; > ret = snd_pcm_lib_malloc_pages(substream, max_bytes); > if (ret) > goto err; > } > :::::::: > } > > > int snd_pcm_lib_malloc_pages(struct snd_pcm_substream *substream, size_t > size) > { > struct snd_pcm_runtime *runtime; > struct snd_dma_buffer *dmab = NULL; > > if (PCM_RUNTIME_CHECK(substream)) > return -EINVAL; > > if (snd_BUG_ON(substream->dma_buffer.dev.type == > SNDRV_DMA_TYPE_UNKNOWN)) > return -EINVAL; > > runtime = substream->runtime; > > if (runtime->dma_buffer_p) { > ---------------Kernel crash at this point ---------- > > So I used the snd_dma_alloc_pages() from the driver to allocate WC memory. snd_pcm_lib_malloc_pages() should be called only from hw_params. Prior to that, you need to set up the dam_buffer type by calling snd_pcm_lib_preallocate_pages() or snd_pcm_lib_preallocate_pages_for_all() at the time to create a PCM instance. The size can be 0 if not necessary to allocate there but later on demand. > > > +/* allocate the coherent DMA pages */ > > +static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *dma) > > +{ > > + return __snd_malloc_dev_pages(dev, size, dma, dma_alloc_coherent); > > This does not get compiled in ARM because dma_alloc_coherant is macro > defined as > > #define dma_alloc_coherent(d, s, h, f) dma_alloc_attrs(d, s, h, f, NULL) Ah, OK. thanks, Takashi > static inline void *dma_alloc_attrs(struct device *dev, size_t size, > dma_addr_t *dma_handle, gfp_t flag, > struct dma_attrs *attrs) > > > I fixed this by > static void *_dma_alloc_coherent(struct device *dev, size_t size, > dma_addr_t *dma_handle, gfp_t flag) > { > return dma_alloc_coherent(dev, size, dma_handle, flag); > } > > /* allocate the coherent DMA pages */ > static void *snd_malloc_dev_pages(struct device *dev, size_t size, > dma_addr_t *dma) > { > return _snd_malloc_dev_pages(dev, size, dma, _dma_alloc_coherent); > } >

1 0

Re: [alsa-devel] [PATCH 0/3] ASoC: Move pcm writecombine dma buffer allocation to core
by Takashi Iwai 29 Jun '12

29 Jun '12

At Fri, 29 Jun 2012 15:53:15 +0530, Laxman Dewangan wrote: > > Some of the ARM based soc allocate the writecombine dma buffer for > pcm substreams. They have the same codes for managing this buffer. > Moving this to the core/pcm files so that they can use that directly. > > Remove the code from Tegra PCM and use these new library function. > > This is enabled only for ARM specific and can be extended to other > architecture if they support the writecombine dma buffer. > > This patch is based on detail discussion on patch: > [PATCH] ASoC: snd_dmaengine: add common api for pcm_mmap > And suggestion from Lars and Takashi. Looking through your patch, I think an easier integration is just to add writecombine option to memalloc.c which calls dma_alloc_writecombine() instead of dma_alloc_coherent(). The addition for mmap is still an open question. Again, an easier option so far looks like just add the call of dma_alloc_writecombine() in snd_pcm_lib_default_mmap(). Alternatively, we can create an individual mmap pcm_ops as we discussed. Below is a totally untested patch, but you can imagine what I meant. After this change, replace with snd_pcm_lib_malloc_pages with SNDRV_DMA_TYPE_DEV_WC, and that's all you need in the driver side. Takashi --- diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h index c425062..7840340 100644 --- a/include/sound/memalloc.h +++ b/include/sound/memalloc.h @@ -52,6 +52,7 @@ struct snd_dma_device { #else #define SNDRV_DMA_TYPE_DEV_SG SNDRV_DMA_TYPE_DEV /* no SG-buf support */ #endif +#define SNDRV_DMA_TYPE_DEV_WC 4 /* writecombine pages */ /* * info for buffer allocation diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 6915692..11108e8 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -124,8 +124,12 @@ void snd_free_pages(void *ptr, size_t size) */ #ifdef CONFIG_HAS_DMA -/* allocate the coherent DMA pages */ -static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *dma) +static void *__snd_malloc_dev_pages(struct device *dev, size_t size, + dma_addr_t *dma, + void *(*func)(struct device *dev, + size_t size, + dma_addr_t *dma_handle, + gfp_t flag)) { int pg; void *res; @@ -138,16 +142,18 @@ static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *d | __GFP_COMP /* compound page lets parts be mapped */ | __GFP_NORETRY /* don't trigger OOM-killer */ | __GFP_NOWARN; /* no stack trace print - this call is non-critical */ - res = dma_alloc_coherent(dev, PAGE_SIZE << pg, dma, gfp_flags); + res = func(dev, PAGE_SIZE << pg, dma, gfp_flags); if (res != NULL) inc_snd_pages(pg); return res; } -/* free the coherent DMA pages */ -static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr, - dma_addr_t dma) +static void __snd_free_dev_pages(struct device *dev, size_t size, void *ptr, + dma_addr_t dma, + void (*func)(struct device *dev, + size_t size, void *vaddr, + dma_addr_t dma_handle)) { int pg; @@ -155,8 +161,36 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr, return; pg = get_order(size); dec_snd_pages(pg); - dma_free_coherent(dev, PAGE_SIZE << pg, ptr, dma); + func(dev, PAGE_SIZE << pg, ptr, dma); +} + +/* allocate the coherent DMA pages */ +static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *dma) +{ + return __snd_malloc_dev_pages(dev, size, dma, dma_alloc_coherent); +} + +/* free the coherent DMA pages */ +static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr, + dma_addr_t dma) +{ + __snd_free_dev_pages(dev, ptr, dma, dma_free_coherent); } + +#ifdef CONFIG_ARM +/* allocate the writecombine DMA pages */ +static void *snd_malloc_dev_wc_pages(struct device *dev, size_t size, dma_addr_t *dma) +{ + return __snd_malloc_dev_pages(dev, size, dma, dma_alloc_writecombine); +} + +/* free the writecombine DMA pages */ +static void snd_free_dev_wc_pages(struct device *dev, size_t size, void *ptr, + dma_addr_t dma) +{ + __snd_free_dev_pages(dev, ptr, dma, dma_free_writecombine); +} +#endif /* CONFIG_ARM */ #endif /* CONFIG_HAS_DMA */ /* @@ -200,6 +234,11 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, case SNDRV_DMA_TYPE_DEV: dmab->area = snd_malloc_dev_pages(device, size, &dmab->addr); break; +#ifdef CONFIG_ARM + case SNDRV_DMA_TYPE_DEV_WC: + dmab->area = snd_malloc_dev_wc_pages(device, size, &dmab->addr); + break; +#endif #endif #ifdef CONFIG_SND_DMA_SGBUF case SNDRV_DMA_TYPE_DEV_SG: @@ -272,6 +311,11 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab) case SNDRV_DMA_TYPE_DEV: snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); break; +#ifdef CONFIG_ARM + case SNDRV_DMA_TYPE_DEV_WC: + snd_free_dev_wc_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); + break; +#endif #endif #ifdef CONFIG_SND_DMA_SGBUF case SNDRV_DMA_TYPE_DEV_SG: @@ -378,7 +422,7 @@ static int snd_mem_proc_read(struct seq_file *seq, void *offset) long pages = snd_allocated_pages >> (PAGE_SHIFT-12); struct snd_mem_list *mem; int devno; - static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG" }; + static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG", "WC" }; mutex_lock(&list_mutex); seq_printf(seq, "pages : %li bytes (%li pages per %likB)\n", diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 53b5ada..c499791 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3170,6 +3170,14 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream, struct vm_area_struct *area) { area->vm_flags |= VM_RESERVED; +#ifdef CONFIG_ARM + if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV_WC) + return dma_mmap_writecombine(substream->dma_buffer.dev.dev, + area, + substream->runtime->dma_area, + substream->runtime->dma_addr, + area->vm_end - area->vm_start); +#endif #ifdef ARCH_HAS_DMA_MMAP_COHERENT if (!substream->ops->page && substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)

1 0