| From 903951e7f1446d9436ab98790ba1110ca469297e Mon Sep 17 00:00:00 2001 |
| From: Takashi Iwai <tiwai@suse.de> |
| Date: Fri, 8 Nov 2019 17:56:26 +0100 |
| Subject: [PATCH] ALSA: pcm: Yet another missing check of non-cached buffer |
| type |
| |
| commit 2406ff9b86aa1b77fe1a6d15f37195ac1fdb2a14 upstream. |
| |
| 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: 42e748a0b325 ("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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c |
| index 38541322ccec..84ff52fe8ea0 100644 |
| --- a/sound/core/pcm_native.c |
| +++ b/sound/core/pcm_native.c |
| @@ -3408,7 +3408,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, |
| -- |
| 2.7.4 |
| |
