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

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

Merge branch 'topic/pcm-mmap-cleanup' into for-next 

This drags a few post-3.18 mmap fixes, a cleanup of dma_mmap_coherent()
usages and additional fixups for some architectures.
parents 93035286 63825f3a

sound/core/pcm_native.c

+21 −32
Original line number Diff line number Diff line
@@ -35,9 +35,6 @@ 
#include <sound/timer.h>

#include <sound/minors.h>

#include <asm/io.h>

#if defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT)

#include <dma-coherence.h>

#endif



/*

 *  Compatibility
@@ -195,6 +192,21 @@ int snd_pcm_info_user(struct snd_pcm_substream *substream, 
	return err;

}



static bool hw_support_mmap(struct snd_pcm_substream *substream)

{

	if (!(substream->runtime->hw.info & SNDRV_PCM_INFO_MMAP))

		return false;

	/* check architectures that return -EINVAL from dma_mmap_coherent() */

	/* FIXME: this should be some global flag */

#if defined(CONFIG_C6X) || defined(CONFIG_FRV) || defined(CONFIG_MN10300) ||\

	defined(CONFIG_PARISC) || defined(CONFIG_XTENSA)

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

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

		return false;

#endif

	return true;

}



#undef RULES_DEBUG



#ifdef RULES_DEBUG
@@ -372,8 +384,12 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, 
	}



	hw = &substream->runtime->hw;

	if (!params->info)

	if (!params->info) {

		params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES;

		if (!hw_support_mmap(substream))

			params->info &= ~(SNDRV_PCM_INFO_MMAP |

					  SNDRV_PCM_INFO_MMAP_VALID);

	}

	if (!params->fifo_size) {

		m = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);

		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
@@ -2072,7 +2088,7 @@ int snd_pcm_hw_constraints_complete(struct snd_pcm_substream *substream) 
		mask |= 1 << SNDRV_PCM_ACCESS_RW_INTERLEAVED;

        if (hw->info & SNDRV_PCM_INFO_NONINTERLEAVED)

		mask |= 1 << SNDRV_PCM_ACCESS_RW_NONINTERLEAVED;

	if (hw->info & SNDRV_PCM_INFO_MMAP) {

	if (hw_support_mmap(substream)) {

		if (hw->info & SNDRV_PCM_INFO_INTERLEAVED)

			mask |= 1 << SNDRV_PCM_ACCESS_MMAP_INTERLEAVED;

		if (hw->info & SNDRV_PCM_INFO_NONINTERLEAVED)
@@ -3251,20 +3267,6 @@ static inline struct page * 
snd_pcm_default_page_ops(struct snd_pcm_substream *substream, unsigned long ofs)

{

	void *vaddr = substream->runtime->dma_area + ofs;

#if defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT)

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

		return virt_to_page(CAC_ADDR(vaddr));

#endif

#if defined(CONFIG_PPC32) && defined(CONFIG_NOT_COHERENT_CACHE)

	if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) {

		dma_addr_t addr = substream->runtime->dma_addr + ofs;

		addr -= get_dma_offset(substream->dma_buffer.dev.dev);

		/* assume dma_handle set via pfn_to_phys() in

		 * mm/dma-noncoherent.c

		 */

		return pfn_to_page(addr >> PAGE_SHIFT);

	}

#endif

	return virt_to_page(vaddr);

}
@@ -3309,13 +3311,6 @@ static const struct vm_operations_struct snd_pcm_vm_ops_data_fault = { 
	.fault =	snd_pcm_mmap_data_fault,

};



#ifndef ARCH_HAS_DMA_MMAP_COHERENT

/* This should be defined / handled globally! */

#if defined(CONFIG_ARM) || defined(CONFIG_ARM64)

#define ARCH_HAS_DMA_MMAP_COHERENT

#endif

#endif



/*

 * mmap the DMA buffer on RAM

 */
@@ -3331,7 +3326,6 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream, 
				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)

		return dma_mmap_coherent(substream->dma_buffer.dev.dev,
@@ -3339,11 +3333,6 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream, 
					 substream->runtime->dma_area,

					 substream->runtime->dma_addr,

					 area->vm_end - area->vm_start);

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

		area->vm_page_prot = pgprot_noncached(area->vm_page_prot);

#endif /* ARCH_HAS_DMA_MMAP_COHERENT */

	/* mmap with fault handler */

	area->vm_ops = &snd_pcm_vm_ops_data_fault;

	return 0;