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

Commit 7f7f2549 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "iommu: Add gfp parameter to iommu_ops::map" 



This reverts commit fe4d7086 which is
commit 781ca2de89bae1b1d2c96df9ef33e9a324415995 upstream.

It breaks the Android kernel api and was added only because a RDMA/IB
change needed it, which is not needed for Android systems at all, so it
is safe to revert.

Bug: 161946584
Change-Id: I64d05d14206bd40c6453035833df3209c0c5e1b9
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 7f7f83ce

drivers/iommu/amd_iommu.c

+1 −2
Original line number Diff line number Diff line
@@ -3098,8 +3098,7 @@ static int amd_iommu_attach_device(struct iommu_domain *dom, 
}



static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova,

			 phys_addr_t paddr, size_t page_size, int iommu_prot,

			 gfp_t gfp)

			 phys_addr_t paddr, size_t page_size, int iommu_prot)

{

	struct protection_domain *domain = to_pdomain(dom);

	int prot = 0;

drivers/iommu/arm-smmu-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -2446,7 +2446,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) 
}



static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,

			phys_addr_t paddr, size_t size, int prot, gfp_t gfp)

			phys_addr_t paddr, size_t size, int prot)

{

	struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops;

drivers/iommu/arm-smmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1201,7 +1201,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) 
}



static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,

			phys_addr_t paddr, size_t size, int prot, gfp_t gfp)

			phys_addr_t paddr, size_t size, int prot)

{

	struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops;

	struct arm_smmu_device *smmu = to_smmu_domain(domain)->smmu;

drivers/iommu/dma-iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys, 
	if (!iova)

		return DMA_MAPPING_ERROR;



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

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

		iommu_dma_free_iova(cookie, iova, size);

		return DMA_MAPPING_ERROR;

	}
@@ -658,7 +658,7 @@ static void *iommu_dma_alloc_remap(struct device *dev, size_t size, 
			arch_dma_prep_coherent(sg_page(sg), sg->length);

	}



	if (iommu_map_sg_atomic(domain, iova, sgt.sgl, sgt.orig_nents, ioprot)

	if (iommu_map_sg(domain, iova, sgt.sgl, sgt.orig_nents, ioprot)

			< size)

		goto out_free_sg;
@@ -918,7 +918,7 @@ static int iommu_dma_map_sg(struct device *dev, struct scatterlist *sg, 
	 * We'll leave any physical concatenation to the IOMMU driver's

	 * implementation - it knows better than we do.

	 */

	if (iommu_map_sg_atomic(domain, iova, sg, nents, prot) < iova_len)

	if (iommu_map_sg(domain, iova, sg, nents, prot) < iova_len)

		goto out_free_iova;



	return __finalise_sg(dev, sg, nents, iova);

drivers/iommu/exynos-iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -1077,7 +1077,7 @@ static int lv2set_page(sysmmu_pte_t *pent, phys_addr_t paddr, size_t size, 
 */

static int exynos_iommu_map(struct iommu_domain *iommu_domain,

			    unsigned long l_iova, phys_addr_t paddr, size_t size,

			    int prot, gfp_t gfp)

			    int prot)

{

	struct exynos_iommu_domain *domain = to_exynos_domain(iommu_domain);

	sysmmu_pte_t *entry;