Commit cff22949 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-4.20' of git://git.infradead.org/users/hch/dma-mapping 

Pull dma mapping updates from Christoph Hellwig:
 "First batch of dma-mapping changes for 4.20.

  There will be a second PR as some big changes were only applied just
  before the end of the merge window, and I want to give them a few more
  days in linux-next.

  Summary:

   - mostly more consolidation of the direct mapping code, including
     converting over hexagon, and merging the coherent and non-coherent
     code into a single dma_map_ops instance (me)

   - cleanups for the dma_configure/dma_unconfigure callchains (me)

   - better handling of dma_masks in odd setups (me, Alexander Duyck)

   - better debugging of passing vmalloc address to the DMA API (Stephen
     Boyd)

   - CMA command line parsing fix (He Zhe)"

* tag 'dma-mapping-4.20' of git://git.infradead.org/users/hch/dma-mapping: (27 commits)
  dma-direct: respect DMA_ATTR_NO_WARN
  dma-mapping: translate __GFP_NOFAIL to DMA_ATTR_NO_WARN
  dma-direct: document the zone selection logic
  dma-debug: Check for drivers mapping invalid addresses in dma_map_single()
  dma-direct: fix return value of dma_direct_supported
  dma-mapping: move dma_default_get_required_mask under ifdef
  dma-direct: always allow dma mask <= physiscal memory size
  dma-direct: implement complete bus_dma_mask handling
  dma-direct: refine dma_direct_alloc zone selection
  dma-direct: add an explicit dma_direct_get_required_mask
  dma-mapping: make the get_required_mask method available unconditionally
  unicore32: remove swiotlb support
  Revert "dma-mapping: clear dev->dma_ops in arch_teardown_dma_ops"
  dma-mapping: support non-coherent devices in dma_common_get_sgtable
  dma-mapping: consolidate the dma mmap implementations
  dma-mapping: merge direct and noncoherent ops
  dma-mapping: move the dma_coherent flag to struct device
  MIPS: don't select DMA_MAYBE_COHERENT from DMA_PERDEV_COHERENT
  dma-mapping: add the missing ARCH_HAS_SYNC_DMA_FOR_CPU_ALL declaration
  dma-mapping: fix panic caused by passing empty cma command line argument
  ...
parents 13775dac b9fd0426

arch/arc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
config ARC

	def_bool y

	select ARC_TIMERS

	select ARCH_HAS_DMA_COHERENT_TO_PFN

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_SYNC_DMA_FOR_CPU

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE
@@ -17,8 +18,7 @@ config ARC 
	select BUILDTIME_EXTABLE_SORT

	select CLONE_BACKWARDS

	select COMMON_CLK

	select DMA_NONCOHERENT_OPS

	select DMA_NONCOHERENT_MMAP

	select DMA_DIRECT_OPS

	select GENERIC_ATOMIC64 if !ISA_ARCV2 || !(ARC_HAS_LL64 && ARC_HAS_LLSC)

	select GENERIC_CLOCKEVENTS

	select GENERIC_FIND_FIRST_BIT

arch/arc/mm/dma.c

+10 −31
Original line number Diff line number Diff line
@@ -84,29 +84,10 @@ void arch_dma_free(struct device *dev, size_t size, void *vaddr, 
	__free_pages(page, get_order(size));

}



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

		void *cpu_addr, dma_addr_t dma_addr, size_t size,

		unsigned long attrs)

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

		dma_addr_t dma_addr)

{

	unsigned long user_count = vma_pages(vma);

	unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT;

	unsigned long pfn = __phys_to_pfn(dma_addr);

	unsigned long off = vma->vm_pgoff;

	int ret = -ENXIO;



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



	if (dma_mmap_from_dev_coherent(dev, vma, cpu_addr, size, &ret))

		return ret;



	if (off < count && user_count <= (count - off)) {

		ret = remap_pfn_range(vma, vma->vm_start,

				      pfn + off,

				      user_count << PAGE_SHIFT,

				      vma->vm_page_prot);

	}



	return ret;

	return __phys_to_pfn(dma_addr);

}



/*
@@ -167,7 +148,7 @@ void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, 
}



/*

 * Plug in coherent or noncoherent dma ops

 * Plug in direct dma map ops.

 */

void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

			const struct iommu_ops *iommu, bool coherent)
@@ -175,13 +156,11 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, 
	/*

	 * IOC hardware snoops all DMA traffic keeping the caches consistent

	 * with memory - eliding need for any explicit cache maintenance of

	 * DMA buffers - so we can use dma_direct cache ops.

	 * DMA buffers.

	 */

	if (is_isa_arcv2() && ioc_enable && coherent) {

		set_dma_ops(dev, &dma_direct_ops);

		dev_info(dev, "use dma_direct_ops cache ops\n");

	} else {

		set_dma_ops(dev, &dma_noncoherent_ops);

		dev_info(dev, "use dma_noncoherent_ops cache ops\n");

	}

	if (is_isa_arcv2() && ioc_enable && coherent)

		dev->dma_coherent = true;



	dev_info(dev, "use %sncoherent DMA ops\n",

		 dev->dma_coherent ? "" : "non");

}

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

+2 −0
Original line number Diff line number Diff line
@@ -100,8 +100,10 @@ static inline unsigned long dma_max_pfn(struct device *dev) 
extern void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,

			       const struct iommu_ops *iommu, bool coherent);



#ifdef CONFIG_MMU

#define arch_teardown_dma_ops arch_teardown_dma_ops

extern void arch_teardown_dma_ops(struct device *dev);

#endif



/* do not use this function in a driver */

static inline bool is_device_dma_coherent(struct device *dev)

arch/arm/mm/dma-mapping-nommu.c

+4 −7
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ static void *arm_nommu_dma_alloc(struct device *dev, size_t size, 
	 */



	if (attrs & DMA_ATTR_NON_CONSISTENT)

		return dma_direct_alloc(dev, size, dma_handle, gfp, attrs);

		return dma_direct_alloc_pages(dev, size, dma_handle, gfp,

				attrs);



	ret = dma_alloc_from_global_coherent(size, dma_handle);
@@ -70,7 +71,7 @@ static void arm_nommu_dma_free(struct device *dev, size_t size, 
			       unsigned long attrs)

{

	if (attrs & DMA_ATTR_NON_CONSISTENT) {

		dma_direct_free(dev, size, cpu_addr, dma_addr, attrs);

		dma_direct_free_pages(dev, size, cpu_addr, dma_addr, attrs);

	} else {

		int ret = dma_release_from_global_coherent(get_order(size),

							   cpu_addr);
@@ -90,7 +91,7 @@ static int arm_nommu_dma_mmap(struct device *dev, struct vm_area_struct *vma, 
	if (dma_mmap_from_global_coherent(vma, cpu_addr, size, &ret))

		return ret;



	return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size);

	return dma_common_mmap(dev, vma, cpu_addr, dma_addr, size, attrs);

}
@@ -237,7 +238,3 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, 


	set_dma_ops(dev, dma_ops);

}
 


void arch_teardown_dma_ops(struct device *dev)

{

}

arch/c6x/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ config C6X 
	select ARCH_HAS_SYNC_DMA_FOR_CPU

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE

	select CLKDEV_LOOKUP

	select DMA_NONCOHERENT_OPS

	select DMA_DIRECT_OPS

	select GENERIC_ATOMIC64

	select GENERIC_IRQ_SHOW

	select HAVE_ARCH_TRACEHOOK