1 files changed, 61 insertions, 0 deletions

diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index bdf826f4fe0c..9d93f02c6285 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,51 @@ 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_GENERIC_ALLOCATOR
+/**
+ * snd_malloc_dev_iram - allocate memory from on-chip internal ram
+ * @dmab: buffer allocation record to store the allocated data
+ * @size: number of bytes to allocate from the iram
+ *
+ * This function requires iram phandle provided via of_node
+ */
+static void snd_malloc_dev_iram(struct snd_dma_buffer *dmab, size_t size)
+{
+        struct device *dev = dmab->dev.dev;
+        struct gen_pool *pool = NULL;
+
+        dmab->area = NULL;
+        dmab->addr = 0;
+
+        if (dev->of_node)
+                pool = of_get_named_gen_pool(dev->of_node, "iram", 0);
+
+        if (!pool)
+                return;
+
+        /* Assign the pool into private_data field */
+        dmab->private_data = pool;
+
+        dmab->area = (void *)gen_pool_alloc(pool, size);
+        if (!dmab->area)
+                return;
+
+        dmab->addr = gen_pool_virt_to_phys(pool, (unsigned long)dmab->area);
+}
+
+/**
+ * snd_free_dev_iram - free allocated specific memory from on-chip internal ram
+ * @dmab: buffer allocation record to store the allocated data
+ */
+static void snd_free_dev_iram(struct snd_dma_buffer *dmab)
+{
+        struct gen_pool *pool = dmab->private_data;
+
+        if (pool && dmab->area)
+                gen_pool_free(pool, (unsigned long)dmab->area, dmab->bytes);
+}
+#endif /* CONFIG_GENERIC_ALLOCATOR */
 #endif /* CONFIG_HAS_DMA */
 
 /*
@@ -197,6 +243,16 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,
                 dmab->addr = 0;
                 break;
 #ifdef CONFIG_HAS_DMA
+#ifdef CONFIG_GENERIC_ALLOCATOR
+        case SNDRV_DMA_TYPE_DEV_IRAM:
+                snd_malloc_dev_iram(dmab, size);
+                if (dmab->area)
+                        break;
+                /* 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;
+#endif /* CONFIG_GENERIC_ALLOCATOR */
         case SNDRV_DMA_TYPE_DEV:
                 dmab->area = snd_malloc_dev_pages(device, size, &dmab->addr);
                 break;
@@ -269,6 +325,11 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab)
                 snd_free_pages(dmab->area, dmab->bytes);
                 break;
 #ifdef CONFIG_HAS_DMA
+#ifdef CONFIG_GENERIC_ALLOCATOR
+        case SNDRV_DMA_TYPE_DEV_IRAM:
+                snd_free_dev_iram(dmab);
+                break;
+#endif /* CONFIG_GENERIC_ALLOCATOR */
         case SNDRV_DMA_TYPE_DEV:
                 snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
                 break;