* [PATCH 1/2] ALSA: Add SoC on-chip internal memory support for DMA buffer allocation
@ 2013-10-16 8:18 Nicolin Chen
2013-10-16 8:18 ` [PATCH 2/2] ASoC: generic-dmaengine-pcm: Support on-chip internal memory for DMA buffer Nicolin Chen
2013-10-16 8:55 ` [PATCH 1/2] ALSA: Add SoC on-chip internal memory support for DMA buffer allocation Lars-Peter Clausen
0 siblings, 2 replies; 6+ messages in thread
From: Nicolin Chen @ 2013-10-16 8:18 UTC (permalink / raw)
To: lars, broonie, lgirdwood, tiwai, perex; +Cc: alsa-devel
Now it's quite common that an SoC contains its on-chip internal memory.
By using this memory space for DMA buffer during audio playback/record,
we can shutdown the voltage for external memory to save power.
Thus add new DEV type with iram malloc()/free() and accordingly modify
current default mmap() for the iram circumstance.
Signed-off-by: Nicolin Chen <b42378@freescale.com>
---
include/sound/memalloc.h | 5 ++++
sound/core/memalloc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++
sound/core/pcm_native.c | 8 +++++-
3 files changed, 83 insertions(+), 1 deletion(-)
diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h
index cf15b82..b53443e 100644
--- a/include/sound/memalloc.h
+++ b/include/sound/memalloc.h
@@ -52,6 +52,11 @@ struct snd_dma_device {
#else
#define SNDRV_DMA_TYPE_DEV_SG SNDRV_DMA_TYPE_DEV /* no SG-buf support */
#endif
+#ifdef CONFIG_OF
+#define SNDRV_DMA_TYPE_DEV_IRAM 4 /* generic device iram-buffer */
+#else
+#define SNDRV_DMA_TYPE_DEV_IRAM SNDRV_DMA_TYPE_DEV
+#endif
/*
* info for buffer allocation
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index bdf826f..9136d5d 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -30,6 +30,7 @@
#include <linux/seq_file.h>
#include <asm/uaccess.h>
#include <linux/dma-mapping.h>
+#include <linux/genalloc.h>
#include <linux/moduleparam.h>
#include <linux/mutex.h>
#include <sound/memalloc.h>
@@ -157,6 +158,59 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr,
dec_snd_pages(pg);
dma_free_coherent(dev, PAGE_SIZE << pg, ptr, dma);
}
+
+#ifdef CONFIG_OF
+/**
+ * snd_malloc_dev_iram - allocate memory from on-chip internal memory
+ * @dev: DMA device pointer
+ * @size: number of bytes to allocate from the iram
+ * @dma: dma-view physical address
+ *
+ * Return cpu-view address or NULL indicating allocating failure
+ *
+ * This function requires iram phandle provided via of_node
+ */
+void *snd_malloc_dev_iram(struct device *dev, size_t size, dma_addr_t *dma)
+{
+ struct gen_pool *pool = of_get_named_gen_pool(dev->of_node, "iram", 0);
+ unsigned long vaddr;
+
+ if (!pool)
+ return NULL;
+
+ vaddr = gen_pool_alloc(pool, size);
+ if (!vaddr)
+ return NULL;
+
+ if (dma)
+ *dma = gen_pool_virt_to_phys(pool, vaddr);
+
+ return (void *)vaddr;
+}
+
+/**
+ * snd_free_dev_iram - free allocated specific memory from on-chip internal memory
+ * @dev: DMA device pointer
+ * @size: size in bytes of memory to free
+ * @ptr: cpu-view address returned from snd_malloc_dev_iram
+ * @dma: dma-view address returned from snd_malloc_dev_iram
+ *
+ * This function requires iram phandle provided via of_node
+ */
+void snd_free_dev_iram(struct device *dev, size_t size, void *ptr, dma_addr_t dma)
+{
+ struct gen_pool *pool = of_get_named_gen_pool(dev->of_node, "iram", 0);
+ if (!pool)
+ return;
+
+ gen_pool_free(pool, (unsigned long)ptr, size);
+
+ ptr = NULL;
+
+ if (dma)
+ dma = 0;
+}
+#endif /* CONFIG_OF */
#endif /* CONFIG_HAS_DMA */
/*
@@ -197,6 +251,17 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,
dmab->addr = 0;
break;
#ifdef CONFIG_HAS_DMA
+ case SNDRV_DMA_TYPE_DEV_IRAM:
+#ifdef CONFIG_OF
+ dmab->area = snd_malloc_dev_iram(device, size, &dmab->addr);
+ if (dmab->area)
+ break;
+#endif
+ /*
+ * Internal memory might have limited size and no enough space,
+ * so if we fail to malloc, try to fetch memory traditionally.
+ */
+ dmab->dev.type = SNDRV_DMA_TYPE_DEV;
case SNDRV_DMA_TYPE_DEV:
dmab->area = snd_malloc_dev_pages(device, size, &dmab->addr);
break;
@@ -269,6 +334,12 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab)
snd_free_pages(dmab->area, dmab->bytes);
break;
#ifdef CONFIG_HAS_DMA
+ case SNDRV_DMA_TYPE_DEV_IRAM:
+#ifdef CONFIG_OF
+ snd_free_dev_iram(dmab->dev.dev, dmab->bytes,
+ dmab->area, dmab->addr);
+ break;
+#endif
case SNDRV_DMA_TYPE_DEV:
snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
break;
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index a68d4c6..5578bd0 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3201,12 +3201,18 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream,
area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
#ifdef ARCH_HAS_DMA_MMAP_COHERENT
if (!substream->ops->page &&
- substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)
+ substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) {
return dma_mmap_coherent(substream->dma_buffer.dev.dev,
area,
substream->runtime->dma_area,
substream->runtime->dma_addr,
area->vm_end - area->vm_start);
+ } else if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV_IRAM) {
+ area->vm_page_prot = pgprot_writecombine(area->vm_page_prot);
+ return remap_pfn_range(area, area->vm_start,
+ substream->dma_buffer.addr >> PAGE_SHIFT,
+ area->vm_end - area->vm_start, area->vm_page_prot);
+ }
#elif defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT)
if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV &&
!plat_device_is_coherent(substream->dma_buffer.dev.dev))
--
1.8.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ASoC: generic-dmaengine-pcm: Support on-chip internal memory for DMA buffer
2013-10-16 8:18 [PATCH 1/2] ALSA: Add SoC on-chip internal memory support for DMA buffer allocation Nicolin Chen
@ 2013-10-16 8:18 ` Nicolin Chen
2013-10-16 8:56 ` Lars-Peter Clausen
2013-10-16 8:55 ` [PATCH 1/2] ALSA: Add SoC on-chip internal memory support for DMA buffer allocation Lars-Peter Clausen
1 sibling, 1 reply; 6+ messages in thread
From: Nicolin Chen @ 2013-10-16 8:18 UTC (permalink / raw)
To: lars, broonie, lgirdwood, tiwai, perex; +Cc: alsa-devel
Add type check when allocating memory space for DMA buffer.
Signed-off-by: Nicolin Chen <b42378@freescale.com>
---
include/sound/dmaengine_pcm.h | 4 ++++
sound/soc/soc-generic-dmaengine-pcm.c | 8 +++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h
index f11c35c..587f091 100644
--- a/include/sound/dmaengine_pcm.h
+++ b/include/sound/dmaengine_pcm.h
@@ -96,6 +96,10 @@ void snd_dmaengine_pcm_set_config_from_dai_data(
* playback.
*/
#define SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX BIT(3)
+/*
+ * The memory space used by DMA is allocated from SoC on-chip internal memory
+ */
+#define SND_DMAENGINE_PCM_FLAG_DMA_IRAM BIT(4)
/**
* struct snd_dmaengine_pcm_config - Configuration data for dmaengine based PCM
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index e29ec3c..dd72964 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -142,7 +142,7 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
const struct snd_dmaengine_pcm_config *config = pcm->config;
struct snd_pcm_substream *substream;
- unsigned int i;
+ unsigned int i, type = SNDRV_DMA_TYPE_DEV;
int ret;
for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {
@@ -162,8 +162,10 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
goto err_free;
}
- ret = snd_pcm_lib_preallocate_pages(substream,
- SNDRV_DMA_TYPE_DEV,
+ if (pcm->flags & SND_DMAENGINE_PCM_FLAG_DMA_IRAM)
+ type = SNDRV_DMA_TYPE_DEV_IRAM;
+
+ ret = snd_pcm_lib_preallocate_pages(substream, type,
dmaengine_dma_dev(pcm, substream),
config->prealloc_buffer_size,
config->pcm_hardware->buffer_bytes_max);
--
1.8.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ALSA: Add SoC on-chip internal memory support for DMA buffer allocation
2013-10-16 8:55 ` [PATCH 1/2] ALSA: Add SoC on-chip internal memory support for DMA buffer allocation Lars-Peter Clausen
@ 2013-10-16 8:48 ` Nicolin Chen
0 siblings, 0 replies; 6+ messages in thread
From: Nicolin Chen @ 2013-10-16 8:48 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: tiwai, alsa-devel, broonie, lgirdwood
Hi Lars,
On Wed, Oct 16, 2013 at 10:55:03AM +0200, Lars-Peter Clausen wrote:
> > +void *snd_malloc_dev_iram(struct device *dev, size_t size, dma_addr_t *dma)
> > +{
> > + struct gen_pool *pool = of_get_named_gen_pool(dev->of_node, "iram", 0);
>
> dev will be the dma controller device not the audio controller device. This
> means the iram property needs to be specified on dma controller node and
> will be shared by all users of that controller. Is this the intention?
True.
> Also I think you need to check whether of_node is NULL before passing it to
> of_get_named_gen_pool.
Oh, you're right.
>
> > + unsigned long vaddr;
> > +
> > + if (!pool)
> > + return NULL;
> > +
> > + vaddr = gen_pool_alloc(pool, size);
> > + if (!vaddr)
> > + return NULL;
> > +
> > + if (dma)
>
> This check will always be true.
I'll drop it and below as well.
Thank you.
Nicolin Chen
>
> > + *dma = gen_pool_virt_to_phys(pool, vaddr);
> > +
> > + return (void *)vaddr;
> > +}
> > +
> > +/**
> > + * snd_free_dev_iram - free allocated specific memory from on-chip internal memory
> > + * @dev: DMA device pointer
> > + * @size: size in bytes of memory to free
> > + * @ptr: cpu-view address returned from snd_malloc_dev_iram
> > + * @dma: dma-view address returned from snd_malloc_dev_iram
> > + *
> > + * This function requires iram phandle provided via of_node
> > + */
> > +void snd_free_dev_iram(struct device *dev, size_t size, void *ptr, dma_addr_t dma)
> > +{
> > + struct gen_pool *pool = of_get_named_gen_pool(dev->of_node, "iram", 0);
> > + if (!pool)
> > + return;
> > +
> > + gen_pool_free(pool, (unsigned long)ptr, size);
> > +
> > + ptr = NULL;
>
> This ...
>
> > +
> > + if (dma)
> > + dma = 0;
>
> ... and this assignment are noops
>
> > +}
> > +#endif /* CONFIG_OF */
> > #endif /* CONFIG_HAS_DMA */
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ASoC: generic-dmaengine-pcm: Support on-chip internal memory for DMA buffer
2013-10-16 8:56 ` Lars-Peter Clausen
@ 2013-10-16 8:51 ` Nicolin Chen
0 siblings, 0 replies; 6+ messages in thread
From: Nicolin Chen @ 2013-10-16 8:51 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: tiwai, alsa-devel, broonie, lgirdwood
On Wed, Oct 16, 2013 at 10:56:06AM +0200, Lars-Peter Clausen wrote:
> On 10/16/2013 10:18 AM, Nicolin Chen wrote:
> [...]
> > * struct snd_dmaengine_pcm_config - Configuration data for dmaengine based PCM
> > diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
> > index e29ec3c..dd72964 100644
> > --- a/sound/soc/soc-generic-dmaengine-pcm.c
> > +++ b/sound/soc/soc-generic-dmaengine-pcm.c
> > @@ -142,7 +142,7 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
> > struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
> > const struct snd_dmaengine_pcm_config *config = pcm->config;
> > struct snd_pcm_substream *substream;
> > - unsigned int i;
> > + unsigned int i, type = SNDRV_DMA_TYPE_DEV;
> > int ret;
> >
> > for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {
> > @@ -162,8 +162,10 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
> > goto err_free;
> > }
> >
> > - ret = snd_pcm_lib_preallocate_pages(substream,
> > - SNDRV_DMA_TYPE_DEV,
> > + if (pcm->flags & SND_DMAENGINE_PCM_FLAG_DMA_IRAM)
> > + type = SNDRV_DMA_TYPE_DEV_IRAM;
>
> Should we just make this the default, after all it will fallback to normal
> memory if no iram region has been specified.
If you said so, I would definitely like to do this. I was..eh..just not sure
others might have concerns about it because it changed the default solution.
Thank you,
Nicolin Chen
>
> > +
> > + ret = snd_pcm_lib_preallocate_pages(substream, type,
> > dmaengine_dma_dev(pcm, substream),
> > config->prealloc_buffer_size,
> > config->pcm_hardware->buffer_bytes_max);
> >
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ALSA: Add SoC on-chip internal memory support for DMA buffer allocation
2013-10-16 8:18 [PATCH 1/2] ALSA: Add SoC on-chip internal memory support for DMA buffer allocation Nicolin Chen
2013-10-16 8:18 ` [PATCH 2/2] ASoC: generic-dmaengine-pcm: Support on-chip internal memory for DMA buffer Nicolin Chen
@ 2013-10-16 8:55 ` Lars-Peter Clausen
2013-10-16 8:48 ` Nicolin Chen
1 sibling, 1 reply; 6+ messages in thread
From: Lars-Peter Clausen @ 2013-10-16 8:55 UTC (permalink / raw)
To: Nicolin Chen; +Cc: tiwai, alsa-devel, broonie, lgirdwood
On 10/16/2013 10:18 AM, Nicolin Chen wrote:
> Now it's quite common that an SoC contains its on-chip internal memory.
> By using this memory space for DMA buffer during audio playback/record,
> we can shutdown the voltage for external memory to save power.
>
> Thus add new DEV type with iram malloc()/free() and accordingly modify
> current default mmap() for the iram circumstance.
>
> Signed-off-by: Nicolin Chen <b42378@freescale.com>
I think this is much better then having each machine add custom callbacks
for it.
[...]
> +
> +#ifdef CONFIG_OF
> +/**
> + * snd_malloc_dev_iram - allocate memory from on-chip internal memory
> + * @dev: DMA device pointer
> + * @size: number of bytes to allocate from the iram
> + * @dma: dma-view physical address
> + *
> + * Return cpu-view address or NULL indicating allocating failure
> + *
> + * This function requires iram phandle provided via of_node
> + */
> +void *snd_malloc_dev_iram(struct device *dev, size_t size, dma_addr_t *dma)
> +{
> + struct gen_pool *pool = of_get_named_gen_pool(dev->of_node, "iram", 0);
dev will be the dma controller device not the audio controller device. This
means the iram property needs to be specified on dma controller node and
will be shared by all users of that controller. Is this the intention?
Also I think you need to check whether of_node is NULL before passing it to
of_get_named_gen_pool.
> + unsigned long vaddr;
> +
> + if (!pool)
> + return NULL;
> +
> + vaddr = gen_pool_alloc(pool, size);
> + if (!vaddr)
> + return NULL;
> +
> + if (dma)
This check will always be true.
> + *dma = gen_pool_virt_to_phys(pool, vaddr);
> +
> + return (void *)vaddr;
> +}
> +
> +/**
> + * snd_free_dev_iram - free allocated specific memory from on-chip internal memory
> + * @dev: DMA device pointer
> + * @size: size in bytes of memory to free
> + * @ptr: cpu-view address returned from snd_malloc_dev_iram
> + * @dma: dma-view address returned from snd_malloc_dev_iram
> + *
> + * This function requires iram phandle provided via of_node
> + */
> +void snd_free_dev_iram(struct device *dev, size_t size, void *ptr, dma_addr_t dma)
> +{
> + struct gen_pool *pool = of_get_named_gen_pool(dev->of_node, "iram", 0);
> + if (!pool)
> + return;
> +
> + gen_pool_free(pool, (unsigned long)ptr, size);
> +
> + ptr = NULL;
This ...
> +
> + if (dma)
> + dma = 0;
... and this assignment are noops
> +}
> +#endif /* CONFIG_OF */
> #endif /* CONFIG_HAS_DMA */
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ASoC: generic-dmaengine-pcm: Support on-chip internal memory for DMA buffer
2013-10-16 8:18 ` [PATCH 2/2] ASoC: generic-dmaengine-pcm: Support on-chip internal memory for DMA buffer Nicolin Chen
@ 2013-10-16 8:56 ` Lars-Peter Clausen
2013-10-16 8:51 ` Nicolin Chen
0 siblings, 1 reply; 6+ messages in thread
From: Lars-Peter Clausen @ 2013-10-16 8:56 UTC (permalink / raw)
To: Nicolin Chen; +Cc: tiwai, alsa-devel, broonie, lgirdwood
On 10/16/2013 10:18 AM, Nicolin Chen wrote:
[...]
> * struct snd_dmaengine_pcm_config - Configuration data for dmaengine based PCM
> diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
> index e29ec3c..dd72964 100644
> --- a/sound/soc/soc-generic-dmaengine-pcm.c
> +++ b/sound/soc/soc-generic-dmaengine-pcm.c
> @@ -142,7 +142,7 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
> struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
> const struct snd_dmaengine_pcm_config *config = pcm->config;
> struct snd_pcm_substream *substream;
> - unsigned int i;
> + unsigned int i, type = SNDRV_DMA_TYPE_DEV;
> int ret;
>
> for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {
> @@ -162,8 +162,10 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
> goto err_free;
> }
>
> - ret = snd_pcm_lib_preallocate_pages(substream,
> - SNDRV_DMA_TYPE_DEV,
> + if (pcm->flags & SND_DMAENGINE_PCM_FLAG_DMA_IRAM)
> + type = SNDRV_DMA_TYPE_DEV_IRAM;
Should we just make this the default, after all it will fallback to normal
memory if no iram region has been specified.
> +
> + ret = snd_pcm_lib_preallocate_pages(substream, type,
> dmaengine_dma_dev(pcm, substream),
> config->prealloc_buffer_size,
> config->pcm_hardware->buffer_bytes_max);
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-10-16 9:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-16 8:18 [PATCH 1/2] ALSA: Add SoC on-chip internal memory support for DMA buffer allocation Nicolin Chen
2013-10-16 8:18 ` [PATCH 2/2] ASoC: generic-dmaengine-pcm: Support on-chip internal memory for DMA buffer Nicolin Chen
2013-10-16 8:56 ` Lars-Peter Clausen
2013-10-16 8:51 ` Nicolin Chen
2013-10-16 8:55 ` [PATCH 1/2] ALSA: Add SoC on-chip internal memory support for DMA buffer allocation Lars-Peter Clausen
2013-10-16 8:48 ` Nicolin Chen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.