evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "iommu: msm: add barrier call on coherent lazy map"

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-11 01:16:57 -07:00 • committed by Gerrit - the friendly Code Review server
commit f9e72fc169
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/iommu/msm_dma_iommu_mapping.c
View file

@ -17,6 +17,7 @@
#include <linux/rbtree.h> #include <linux/rbtree.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/err.h> #include <linux/err.h>
#include <asm/barrier.h>
#include <linux/msm_dma_iommu_mapping.h> #include <linux/msm_dma_iommu_mapping.h>
@ -216,10 +217,13 @@ static inline int __msm_dma_map_sg(struct device *dev, struct scatterlist *sg,
sg->dma_length = iommu_map->sgl.dma_length; sg->dma_length = iommu_map->sgl.dma_length;
kref_get(&iommu_map->ref); kref_get(&iommu_map->ref);
/* if (is_device_dma_coherent(dev))
* Need to do cache operations here based on "dir" in the /*
* future if we go with coherent mappings. * Ensure all outstanding changes for coherent
*/ * buffers are applied to the cache before any
* DMA occurs.
*/
dmb(ish);
ret = nents; ret = nents;
} }
mutex_unlock(&iommu_meta->lock); mutex_unlock(&iommu_meta->lock);