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

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

iommu/dma: Move __iommu_dma_map 



Moving this function up to its unmap counterpart helps to keep related
code together for the following changes.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 06d60728

drivers/iommu/dma-iommu.c

+23 −23
Original line number Diff line number Diff line
@@ -464,6 +464,29 @@ static void __iommu_dma_unmap(struct iommu_domain *domain, dma_addr_t dma_addr, 
	iommu_dma_free_iova(cookie, dma_addr, size);

}



static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys,

		size_t size, int prot, struct iommu_domain *domain)

{

	struct iommu_dma_cookie *cookie = domain->iova_cookie;

	size_t iova_off = 0;

	dma_addr_t iova;



	if (cookie->type == IOMMU_DMA_IOVA_COOKIE) {

		iova_off = iova_offset(&cookie->iovad, phys);

		size = iova_align(&cookie->iovad, size + iova_off);

	}



	iova = iommu_dma_alloc_iova(domain, size, dma_get_mask(dev), dev);

	if (!iova)

		return DMA_MAPPING_ERROR;



	if (iommu_map(domain, iova, phys - iova_off, size, prot)) {

		iommu_dma_free_iova(cookie, iova, size);

		return DMA_MAPPING_ERROR;

	}

	return iova + iova_off;

}



static void __iommu_dma_free_pages(struct page **pages, int count)

{

	while (count--)
@@ -692,29 +715,6 @@ static void iommu_dma_sync_sg_for_device(struct device *dev, 
		arch_sync_dma_for_device(dev, sg_phys(sg), sg->length, dir);

}



static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys,

		size_t size, int prot, struct iommu_domain *domain)

{

	struct iommu_dma_cookie *cookie = domain->iova_cookie;

	size_t iova_off = 0;

	dma_addr_t iova;



	if (cookie->type == IOMMU_DMA_IOVA_COOKIE) {

		iova_off = iova_offset(&cookie->iovad, phys);

		size = iova_align(&cookie->iovad, size + iova_off);

	}



	iova = iommu_dma_alloc_iova(domain, size, dma_get_mask(dev), dev);

	if (!iova)

		return DMA_MAPPING_ERROR;



	if (iommu_map(domain, iova, phys - iova_off, size, prot)) {

		iommu_dma_free_iova(cookie, iova, size);

		return DMA_MAPPING_ERROR;

	}

	return iova + iova_off;

}



static dma_addr_t __iommu_dma_map_page(struct device *dev, struct page *page,

		unsigned long offset, size_t size, int prot)

{