Merge "msm: iommu: Correct the size passed to dmac_clean_range()" (dee6e198) · Commits · e / devices / android_kernel_sony_msm8994

drivers/iommu/msm_iommu_sec.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -567,7 +567,7 @@ static int msm_iommu_sec_ptbl_map_range(struct msm_iommu_drvdata *iommu_drvdata,
		struct msm_scm_map2_req map;
		unsigned int *pa_list = 0;
		unsigned int pa, cnt;
		void *flush_va;
		void flush_va, flush_va_end;
		unsigned int offset = 0, chunk_offset = 0;
		int ret;

		@@ -639,7 +639,9 @@ static int msm_iommu_sec_ptbl_map_range(struct msm_iommu_drvdata *iommu_drvdata,
		/*
		* Ensure that the buffer is in RAM by the time it gets to TZ
		*/
		dmac_clean_range(flush_va, flush_va + map.plist.list_size);
		flush_va_end = (void *) (((unsigned long) flush_va) +
		(map.plist.list_size * sizeof(*pa_list)));
		dmac_clean_range(flush_va, flush_va_end);

		ret = msm_iommu_sec_map2(&map);
		kfree(pa_list);