Commit 4dc6376a authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Joerg Roedel
Browse files

iommu: Remove iommu_map_atomic() 



There is only one call site and it can now just pass the GFP_ATOMIC to the
normal iommu_map().

Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/2-v3-76b587fe28df+6e3-iommu_map_gfp_jgg@nvidia.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 1369459b

drivers/iommu/dma-iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,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, GFP_ATOMIC)) {

		iommu_dma_free_iova(cookie, iova, size, NULL);

		return DMA_MAPPING_ERROR;

	}

drivers/iommu/iommu.c

+0 −7
Original line number Diff line number Diff line
@@ -2381,13 +2381,6 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova, 
}

EXPORT_SYMBOL_GPL(iommu_map);



int iommu_map_atomic(struct iommu_domain *domain, unsigned long iova,

	      phys_addr_t paddr, size_t size, int prot)

{

	return iommu_map(domain, iova, paddr, size, prot, GFP_ATOMIC);

}

EXPORT_SYMBOL_GPL(iommu_map_atomic);



static size_t __iommu_unmap_pages(struct iommu_domain *domain,

				  unsigned long iova, size_t size,

				  struct iommu_iotlb_gather *iotlb_gather)

include/linux/iommu.h

+0 −9
Original line number Diff line number Diff line
@@ -468,8 +468,6 @@ extern struct iommu_domain *iommu_get_domain_for_dev(struct device *dev); 
extern struct iommu_domain *iommu_get_dma_domain(struct device *dev);

extern int iommu_map(struct iommu_domain *domain, unsigned long iova,

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

extern int iommu_map_atomic(struct iommu_domain *domain, unsigned long iova,

			    phys_addr_t paddr, size_t size, int prot);

extern size_t iommu_unmap(struct iommu_domain *domain, unsigned long iova,

			  size_t size);

extern size_t iommu_unmap_fast(struct iommu_domain *domain,
@@ -778,13 +776,6 @@ static inline int iommu_map(struct iommu_domain *domain, unsigned long iova, 
	return -ENODEV;

}



static inline int iommu_map_atomic(struct iommu_domain *domain,

				   unsigned long iova, phys_addr_t paddr,

				   size_t size, int prot)

{

	return -ENODEV;

}



static inline size_t iommu_unmap(struct iommu_domain *domain,

				 unsigned long iova, size_t size)

{