Commit 2406ff9b authored Nov 08, 2019 by Takashi Iwai

ALSA: pcm: Yet another missing check of non-cached buffer type

For non-x86 architectures, SNDRV_DMA_TYPE_DEV_UC should be treated
equivalent with SNDRV_DMA_TYPE_DEV, where the default mmap handler
still checks only about SNDRV_DMA_TYPE_DEV.  Make the check more
proper.

Note that all existing users of *_UC buffer types are x86-only, so
this doesn't fix any bug, but just for consistency.

Fixes: 42e748a0 ("ALSA: memalloc: Add non-cached buffer type")
Link: https://lore.kernel.org/r/20191108165626.5947-1-tiwai@suse.de


Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 6a34367e

sound/core/pcm_native.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3416,7 +3416,8 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream,
		#endif /* CONFIG_GENERIC_ALLOCATOR */
		#ifndef CONFIG_X86 /* for avoiding warnings arch/x86/mm/pat.c */
		if (IS_ENABLED(CONFIG_HAS_DMA) && !substream->ops->page &&
		substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)
		(substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV \|\|
		substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV_UC))
		return dma_mmap_coherent(substream->dma_buffer.dev.dev,
		area,
		substream->runtime->dma_area,

Admin message