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

Commit ce067de7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/dma: Implement dma_{map,unmap}_resource()" into msm-4.9

parents c51c4656 c84ed864

drivers/iommu/dma-iommu.c

+21 −3
Original line number Diff line number Diff line
@@ -432,13 +432,12 @@ int iommu_dma_mmap(struct page **pages, size_t size, struct vm_area_struct *vma) 
	return ret;

}



dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page,

		unsigned long offset, size_t size, int prot)

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

		size_t size, int prot)

{

	dma_addr_t dma_addr;

	struct iommu_domain *domain = iommu_get_domain_for_dev(dev);

	struct iova_domain *iovad = cookie_iovad(domain);

	phys_addr_t phys = page_to_phys(page) + offset;

	size_t iova_off = iova_offset(iovad, phys);

	size_t len = iova_align(iovad, size + iova_off);

	struct iova *iova = __alloc_iova(domain, len, dma_get_mask(dev));
@@ -454,6 +453,12 @@ dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, 
	return dma_addr + iova_off;

}



dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page,

		unsigned long offset, size_t size, int prot)

{

	return __iommu_dma_map(dev, page_to_phys(page) + offset, size, prot);

}



void iommu_dma_unmap_page(struct device *dev, dma_addr_t handle, size_t size,

		enum dma_data_direction dir, unsigned long attrs)

{
@@ -624,6 +629,19 @@ void iommu_dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, 
	__iommu_dma_unmap(iommu_get_domain_for_dev(dev), sg_dma_address(sg));

}



dma_addr_t iommu_dma_map_resource(struct device *dev, phys_addr_t phys,

		size_t size, enum dma_data_direction dir, unsigned long attrs)

{

	return __iommu_dma_map(dev, phys, size,

			dma_direction_to_prot(dir, false) | IOMMU_MMIO);

}



void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle,

		size_t size, enum dma_data_direction dir, unsigned long attrs)

{

	__iommu_dma_unmap(iommu_get_domain_for_dev(dev), handle);

}



int iommu_dma_supported(struct device *dev, u64 mask)

{

	/*

include/linux/dma-iommu.h

+4 −0
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@ void iommu_dma_unmap_page(struct device *dev, dma_addr_t handle, size_t size, 
		enum dma_data_direction dir, unsigned long attrs);

void iommu_dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,

		enum dma_data_direction dir, unsigned long attrs);

dma_addr_t iommu_dma_map_resource(struct device *dev, phys_addr_t phys,

		size_t size, enum dma_data_direction dir, unsigned long attrs);

void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle,

		size_t size, enum dma_data_direction dir, unsigned long attrs);

int iommu_dma_supported(struct device *dev, u64 mask);

int iommu_dma_mapping_error(struct device *dev, dma_addr_t dma_addr);