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

Commit af751d43 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Joerg Roedel
Browse files

iommu/dma: Remove the flush_page callback 



We now have a arch_dma_prep_coherent architecture hook that is used
for the generic DMA remap allocator, and we should use the same
interface for the dma-iommu code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 185da893

arch/arm64/mm/dma-mapping.c

+1 −7
Original line number Diff line number Diff line
@@ -104,12 +104,6 @@ arch_initcall(arm64_dma_init); 
#include <linux/platform_device.h>

#include <linux/amba/bus.h>



/* Thankfully, all cache ops are by VA so we can ignore phys here */

static void flush_page(struct device *dev, const void *virt, phys_addr_t phys)

{

	__dma_flush_area(virt, PAGE_SIZE);

}



static void *__iommu_alloc_attrs(struct device *dev, size_t size,

				 dma_addr_t *handle, gfp_t gfp,

				 unsigned long attrs)
@@ -186,7 +180,7 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size, 
		struct page **pages;



		pages = iommu_dma_alloc(dev, iosize, gfp, attrs, ioprot,

					handle, flush_page);

					handle);

		if (!pages)

			return NULL;

drivers/iommu/dma-iommu.c

+3 −5
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/acpi_iort.h>

#include <linux/device.h>

#include <linux/dma-iommu.h>

#include <linux/dma-noncoherent.h>

#include <linux/gfp.h>

#include <linux/huge_mm.h>

#include <linux/iommu.h>
@@ -560,8 +561,6 @@ void iommu_dma_free(struct device *dev, struct page **pages, size_t size, 
 * @attrs: DMA attributes for this allocation

 * @prot: IOMMU mapping flags

 * @handle: Out argument for allocated DMA handle

 * @flush_page: Arch callback which must ensure PAGE_SIZE bytes from the

 *		given VA/PA are visible to the given non-coherent device.

 *

 * If @size is less than PAGE_SIZE, then a full CPU page will be allocated,

 * but an IOMMU which supports smaller pages might not map the whole thing.
@@ -570,8 +569,7 @@ void iommu_dma_free(struct device *dev, struct page **pages, size_t size, 
 *	   or NULL on failure.

 */

struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp,

		unsigned long attrs, int prot, dma_addr_t *handle,

		void (*flush_page)(struct device *, const void *, phys_addr_t))

		unsigned long attrs, int prot, dma_addr_t *handle)

{

	struct iommu_domain *domain = iommu_get_dma_domain(dev);

	struct iommu_dma_cookie *cookie = domain->iova_cookie;
@@ -615,7 +613,7 @@ struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp, 
		 */

		sg_miter_start(&miter, sgt.sgl, sgt.orig_nents, SG_MITER_FROM_SG);

		while (sg_miter_next(&miter))

			flush_page(dev, miter.addr, page_to_phys(miter.page));

			arch_dma_prep_coherent(miter.page, PAGE_SIZE);

		sg_miter_stop(&miter);

	}

include/linux/dma-iommu.h

+1 −2
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ int dma_info_to_prot(enum dma_data_direction dir, bool coherent, 
 * the arch code to take care of attributes and cache maintenance

 */

struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp,

		unsigned long attrs, int prot, dma_addr_t *handle,

		void (*flush_page)(struct device *, const void *, phys_addr_t));

		unsigned long attrs, int prot, dma_addr_t *handle);

void iommu_dma_free(struct device *dev, struct page **pages, size_t size,

		dma_addr_t *handle);