Commit 8553f6e6 authored by Robin Murphy's avatar Robin Murphy Committed by Joerg Roedel
Browse files

iommu/dma: Split iommu_dma_free 



Most of it can double up to serve the failure cleanup path for
iommu_dma_alloc().

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 9a4ab94a

drivers/iommu/dma-iommu.c

+8 −4
Original line number Diff line number Diff line
@@ -935,15 +935,12 @@ static void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle, 
	__iommu_dma_unmap(dev, handle, size);

}



static void iommu_dma_free(struct device *dev, size_t size, void *cpu_addr,

		dma_addr_t handle, unsigned long attrs)

static void __iommu_dma_free(struct device *dev, size_t size, void *cpu_addr)

{

	size_t alloc_size = PAGE_ALIGN(size);

	int count = alloc_size >> PAGE_SHIFT;

	struct page *page = NULL, **pages = NULL;



	__iommu_dma_unmap(dev, handle, size);



	/* Non-coherent atomic allocation? Easy */

	if (dma_free_from_pool(cpu_addr, alloc_size))

		return;
@@ -968,6 +965,13 @@ static void iommu_dma_free(struct device *dev, size_t size, void *cpu_addr, 
		__free_pages(page, get_order(alloc_size));

}



static void iommu_dma_free(struct device *dev, size_t size, void *cpu_addr,

		dma_addr_t handle, unsigned long attrs)

{

	__iommu_dma_unmap(dev, handle, size);

	__iommu_dma_free(dev, size, cpu_addr);

}



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

		dma_addr_t *handle, gfp_t gfp, unsigned long attrs)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE