Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5606f85 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: Add ifdef CONFIG_GENERIC_ALLOCATOR for SNDRV_DMA_TYPE_IRAM code 



It turned out that we can't use gen_pool_*() functions on archs
without CONFIG_GENERIC_ALLOCATOR (resulting in missing symbols), since
linux/genalloc.h doesn't provide dummy functions for all.  We'd be
able to fix linux/genalloc.h size, but I take an easier path for
now...

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 95f74c41

include/sound/memalloc.h

+4 −0
Original line number Diff line number Diff line
@@ -52,7 +52,11 @@ struct snd_dma_device { 
#else

#define SNDRV_DMA_TYPE_DEV_SG	SNDRV_DMA_TYPE_DEV /* no SG-buf support */

#endif

#ifdef CONFIG_GENERIC_ALLOCATOR

#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

sound/core/memalloc.c

+4 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ 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)
@@ -246,6 +247,7 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, 
		 * 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;
@@ -318,9 +320,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;

sound/core/pcm_native.c

+2 −0
Original line number Diff line number Diff line
@@ -3199,12 +3199,14 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream, 
			     struct vm_area_struct *area)

{

	area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;

#ifdef CONFIG_GENERIC_ALLOCATOR

	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);

	}

#endif /* CONFIG_GENERIC_ALLOCATOR */

#ifdef ARCH_HAS_DMA_MMAP_COHERENT

	if (!substream->ops->page &&

	    substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)