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

Commit 4e04f3ba authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu/dma-iommu: Allow dma_info_to_prot to be used globally"

parents a234d6ce 4f869790

drivers/iommu/dma-iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base, 
 *

 * Return: corresponding IOMMU API page protection flags

 */

static int dma_info_to_prot(enum dma_data_direction dir, bool coherent,

int dma_info_to_prot(enum dma_data_direction dir, bool coherent,

		     unsigned long attrs)

{

	int prot = coherent ? IOMMU_CACHE : 0;

include/linux/dma-iommu.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ int iommu_get_dma_cookie(struct iommu_domain *domain); 
int iommu_get_msi_cookie(struct iommu_domain *domain, dma_addr_t base);

void iommu_put_dma_cookie(struct iommu_domain *domain);



int dma_info_to_prot(enum dma_data_direction dir, bool coherent,

		     unsigned long attrs);

size_t iommu_dma_prepare_map_sg(struct device *dev, struct iova_domain *iovad,

				struct scatterlist *sg, int nents);

int iommu_dma_finalise_sg(struct device *dev, struct scatterlist *sg,