mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-08 04:42:04 -04:00
Merge "iommu/dma-iommu: Allow dma_info_to_prot to be used globally"
This commit is contained in:
commit
4e04f3ba8f
2 changed files with 3 additions and 1 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Reference in a new issue