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

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

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

Pull dma mapping fixes from Christoph Hellwig:
 "split the global dma coherent pool from the per-device pool.

  This fixes a regression in the earlier 4.13 pull requests where the
  global pool would override a per-device CMA pool (Vladimir Murzin)"

* tag 'dma-mapping-4.13-2' of git://git.infradead.org/users/hch/dma-mapping:
  ARM: NOMMU: Wire-up default DMA interface
  dma-coherent: introduce interface for default DMA pool
parents 25f6a537 878ec367

arch/arc/mm/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int arc_dma_mmap(struct device *dev, struct vm_area_struct *vma, 


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



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

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

		return ret;



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

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

+36 −9
Original line number Diff line number Diff line
@@ -40,9 +40,21 @@ static void *arm_nommu_dma_alloc(struct device *dev, size_t size, 


{

	const struct dma_map_ops *ops = &dma_noop_ops;

	void *ret;



	/*

	 * We are here because:

	 * Try generic allocator first if we are advertised that

	 * consistency is not required.

	 */



	if (attrs & DMA_ATTR_NON_CONSISTENT)

		return ops->alloc(dev, size, dma_handle, gfp, attrs);



	ret = dma_alloc_from_global_coherent(size, dma_handle);



	/*

	 * dma_alloc_from_global_coherent() may fail because:

	 *

	 * - no consistent DMA region has been defined, so we can't

	 *   continue.

	 * - there is no space left in consistent DMA region, so we
@@ -50,11 +62,8 @@ static void *arm_nommu_dma_alloc(struct device *dev, size_t size, 
	 *   advertised that consistency is not required.

	 */



	if (attrs & DMA_ATTR_NON_CONSISTENT)

		return ops->alloc(dev, size, dma_handle, gfp, attrs);



	WARN_ON_ONCE(1);

	return NULL;

	WARN_ON_ONCE(ret == NULL);

	return ret;

}



static void arm_nommu_dma_free(struct device *dev, size_t size,
@@ -63,14 +72,31 @@ static void arm_nommu_dma_free(struct device *dev, size_t size, 
{

	const struct dma_map_ops *ops = &dma_noop_ops;



	if (attrs & DMA_ATTR_NON_CONSISTENT)

	if (attrs & DMA_ATTR_NON_CONSISTENT) {

		ops->free(dev, size, cpu_addr, dma_addr, attrs);

	else

		WARN_ON_ONCE(1);

	} else {

		int ret = dma_release_from_global_coherent(get_order(size),

							   cpu_addr);



		WARN_ON_ONCE(ret == 0);

	}



	return;

}



static int arm_nommu_dma_mmap(struct device *dev, struct vm_area_struct *vma,

			      void *cpu_addr, dma_addr_t dma_addr, size_t size,

			      unsigned long attrs)

{

	int ret;



	if (dma_mmap_from_global_coherent(vma, cpu_addr, size, &ret))

		return ret;



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

}





static void __dma_page_cpu_to_dev(phys_addr_t paddr, size_t size,

				  enum dma_data_direction dir)

{
@@ -173,6 +199,7 @@ static void arm_nommu_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist 
const struct dma_map_ops arm_nommu_dma_ops = {

	.alloc			= arm_nommu_dma_alloc,

	.free			= arm_nommu_dma_free,

	.mmap			= arm_nommu_dma_mmap,

	.map_page		= arm_nommu_dma_map_page,

	.unmap_page		= arm_nommu_dma_unmap_page,

	.map_sg			= arm_nommu_dma_map_sg,

arch/arm/mm/dma-mapping.c

+1 −1
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ static int __arm_dma_mmap(struct device *dev, struct vm_area_struct *vma, 
	unsigned long pfn = dma_to_pfn(dev, dma_addr);

	unsigned long off = vma->vm_pgoff;



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

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

		return ret;



	if (off < nr_pages && nr_vma_pages <= (nr_pages - off)) {

arch/arm64/mm/dma-mapping.c

+2 −2
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static int __swiotlb_mmap(struct device *dev, 
	vma->vm_page_prot = __get_dma_pgprot(attrs, vma->vm_page_prot,

					     is_device_dma_coherent(dev));



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

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

		return ret;



	return __swiotlb_mmap_pfn(vma, pfn, size);
@@ -706,7 +706,7 @@ static int __iommu_mmap_attrs(struct device *dev, struct vm_area_struct *vma, 
	vma->vm_page_prot = __get_dma_pgprot(attrs, vma->vm_page_prot,

					     is_device_dma_coherent(dev));



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

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

		return ret;



	if (attrs & DMA_ATTR_FORCE_CONTIGUOUS) {

arch/mips/mm/dma-default.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static int mips_dma_mmap(struct device *dev, struct vm_area_struct *vma, 
	else

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



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

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

		return ret;



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