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

Commit 6666cc17 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Michael Ellerman
Browse files

powerpc/dma: remove dma_nommu_mmap_coherent 



The coherent cache version of this function already is functionally
identicall to the default version, and by defining the
arch_dma_coherent_to_pfn hook the same is ture for the noncoherent
version as well.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 18b53a2d

arch/powerpc/include/asm/dma-mapping.h

+0 −4
Original line number Diff line number Diff line
@@ -25,10 +25,6 @@ extern void *__dma_nommu_alloc_coherent(struct device *dev, size_t size, 
extern void __dma_nommu_free_coherent(struct device *dev, size_t size,

				       void *vaddr, dma_addr_t dma_handle,

				       unsigned long attrs);

extern int dma_nommu_mmap_coherent(struct device *dev,

				    struct vm_area_struct *vma,

				    void *cpu_addr, dma_addr_t handle,

				    size_t size, unsigned long attrs);

int dma_nommu_map_sg(struct device *dev, struct scatterlist *sgl,

		int nents, enum dma_data_direction direction,

		unsigned long attrs);

arch/powerpc/kernel/dma-iommu.c

+0 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ u64 dma_iommu_get_required_mask(struct device *dev) 
const struct dma_map_ops dma_iommu_ops = {

	.alloc			= dma_iommu_alloc_coherent,

	.free			= dma_iommu_free_coherent,

	.mmap			= dma_nommu_mmap_coherent,

	.map_sg			= dma_iommu_map_sg,

	.unmap_sg		= dma_iommu_unmap_sg,

	.dma_supported		= dma_iommu_dma_supported,

arch/powerpc/kernel/dma-swiotlb.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ unsigned int ppc_swiotlb_enable; 
const struct dma_map_ops powerpc_swiotlb_dma_ops = {

	.alloc = __dma_nommu_alloc_coherent,

	.free = __dma_nommu_free_coherent,

	.mmap = dma_nommu_mmap_coherent,

	.map_sg = dma_direct_map_sg,

	.unmap_sg = dma_direct_unmap_sg,

	.dma_supported = swiotlb_dma_supported,

arch/powerpc/kernel/dma.c

+0 −19
Original line number Diff line number Diff line
@@ -114,24 +114,6 @@ void __dma_nommu_free_coherent(struct device *dev, size_t size, 
}

#endif /* !CONFIG_NOT_COHERENT_CACHE */



int dma_nommu_mmap_coherent(struct device *dev, struct vm_area_struct *vma,

			     void *cpu_addr, dma_addr_t handle, size_t size,

			     unsigned long attrs)

{

	unsigned long pfn;



#ifdef CONFIG_NOT_COHERENT_CACHE

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

	pfn = __dma_get_coherent_pfn((unsigned long)cpu_addr);

#else

	pfn = page_to_pfn(virt_to_page(cpu_addr));

#endif

	return remap_pfn_range(vma, vma->vm_start,

			       pfn + vma->vm_pgoff,

			       vma->vm_end - vma->vm_start,

			       vma->vm_page_prot);

}



int dma_nommu_map_sg(struct device *dev, struct scatterlist *sgl,

		int nents, enum dma_data_direction direction,

		unsigned long attrs)
@@ -218,7 +200,6 @@ static inline void dma_nommu_sync_single(struct device *dev, 
const struct dma_map_ops dma_nommu_ops = {

	.alloc				= __dma_nommu_alloc_coherent,

	.free				= __dma_nommu_free_coherent,

	.mmap				= dma_nommu_mmap_coherent,

	.map_sg				= dma_nommu_map_sg,

	.unmap_sg			= dma_nommu_unmap_sg,

	.dma_supported			= dma_nommu_dma_supported,

arch/powerpc/mm/dma-noncoherent.c

+5 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/types.h>

#include <linux/highmem.h>

#include <linux/dma-direct.h>

#include <linux/dma-noncoherent.h>

#include <linux/export.h>



#include <asm/tlbflush.h>
@@ -400,14 +401,16 @@ EXPORT_SYMBOL(__dma_sync_page); 


/*

 * Return the PFN for a given cpu virtual address returned by

 * __dma_nommu_alloc_coherent. This is used by dma_mmap_coherent()

 * __dma_nommu_alloc_coherent.

 */

unsigned long __dma_get_coherent_pfn(unsigned long cpu_addr)

long arch_dma_coherent_to_pfn(struct device *dev, void *vaddr,

		dma_addr_t dma_addr)

{

	/* This should always be populated, so we don't test every

	 * level. If that fails, we'll have a nice crash which

	 * will be as good as a BUG_ON()

	 */

	unsigned long cpu_addr = (unsigned long)vaddr;

	pgd_t *pgd = pgd_offset_k(cpu_addr);

	pud_t *pud = pud_offset(pgd, cpu_addr);

	pmd_t *pmd = pmd_offset(pud, cpu_addr);