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

Commit 278cf141 authored by Olav Haugan's avatar Olav Haugan Committed by Stephen Boyd
Browse files

Revert "msm: iommu: remove tlb_invalidate from the map calls" 



This might cause TLB invalidate to hang on unmap calls.

This reverts commit 8da8a5a49ce5dcbb5b5f97da8d66b34129562e80.

Change-Id: Ibbe373d448a3bea5e75bc45dd0a16e79f57c092b
Signed-off-by: default avatarOlav Haugan <ohaugan@codeaurora.org>
parent 65fa58ef

drivers/iommu/msm_iommu-v1.c

+2 −0
Original line number Diff line number Diff line
@@ -704,6 +704,7 @@ static int msm_iommu_map(struct iommu_domain *domain, unsigned long va, 
	if (ret)

		goto fail;



	ret = __flush_iotlb_va(domain, va);

fail:

	mutex_unlock(&msm_iommu_lock);

	return ret;
@@ -753,6 +754,7 @@ static int msm_iommu_map_range(struct iommu_domain *domain, unsigned int va, 
	if (ret)

		goto fail;



	__flush_iotlb(domain);

fail:

	mutex_unlock(&msm_iommu_lock);

	return ret;

drivers/iommu/msm_iommu_sec.c

+2 −2
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static int msm_iommu_sec_ptbl_map(struct msm_iommu_drvdata *iommu_drvdata, 
	map.info.ctx_id = ctx_drvdata->num;

	map.info.va = va;

	map.info.size = len;

	map.flags = 0;

	map.flags = IOMMU_TLBINVAL_FLAG;

	flush_va = &pa;

	flush_pa = virt_to_phys(&pa);
@@ -421,7 +421,7 @@ static int msm_iommu_sec_ptbl_map_range(struct msm_iommu_drvdata *iommu_drvdata, 
	map.info.ctx_id = ctx_drvdata->num;

	map.info.va = va;

	map.info.size = len;

	map.flags = 0;

	map.flags = IOMMU_TLBINVAL_FLAG;



	if (sg->length == len) {

		pa = get_phys_addr(sg);