Merge "iommu: msm: use phys_addr_t for PA in secure mapping" (c50cd616) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/iommu/msm_iommu_sec.c

+8 −7

Original line number	Original line	Diff line number	Diff line
	@@ -75,7 +75,7 @@ static const struct of_device_id msm_smmu_list[] = {
	};		};

	struct msm_scm_paddr_list {		struct msm_scm_paddr_list {
	unsigned int list;		phys_addr_t list;
	unsigned int list_size;		unsigned int list_size;
	unsigned int size;		unsigned int size;
	};		};
	@@ -267,8 +267,8 @@ static void print_iova_to_phys(struct msm_iommu_ctx_drvdata *ctx_drvdata,
	pagetable_phys = msm_iommu_iova_to_phys_soft(		pagetable_phys = msm_iommu_iova_to_phys_soft(
	ctx_drvdata->attached_domain,		ctx_drvdata->attached_domain,
	faulty_iova);		faulty_iova);
	pr_err("Page table in DDR shows PA = %lx\n",		pr_err("Page table in DDR shows PA = %pa\n",
	(unsigned long) pagetable_phys);		&pagetable_phys);
	}		}
	}		}

	@@ -571,14 +571,14 @@ static int msm_iommu_sec_ptbl_map(struct msm_iommu_drvdata *iommu_drvdata,
	return 0;		return 0;
	}		}

	static unsigned int get_phys_addr(struct scatterlist *sg)		static phys_addr_t get_phys_addr(struct scatterlist *sg)
	{		{
	/*		/*
	* Try sg_dma_address first so that we can		* Try sg_dma_address first so that we can
	* map carveout regions that do not have a		* map carveout regions that do not have a
	* struct page associated with them.		* struct page associated with them.
	*/		*/
	unsigned int pa = sg_dma_address(sg);		phys_addr_t pa = sg_dma_address(sg);

	if (pa == 0)		if (pa == 0)
	pa = sg_phys(sg);		pa = sg_phys(sg);
	@@ -591,8 +591,9 @@ static int msm_iommu_sec_ptbl_map_range(struct msm_iommu_drvdata *iommu_drvdata,
	{		{
	struct scatterlist *sgiter;		struct scatterlist *sgiter;
	struct msm_scm_map2_req map;		struct msm_scm_map2_req map;
	unsigned int *pa_list = 0;		phys_addr_t *pa_list = 0;
	unsigned int pa, cnt;		unsigned int cnt;
			phys_addr_t pa;
	void flush_va, flush_va_end;		void flush_va, flush_va_end;
	unsigned int offset = 0, chunk_offset = 0;		unsigned int offset = 0, chunk_offset = 0;
	int ret;		int ret;