Merge branch 'iommu-for-tony' of git://github.com/ohadbc/omap-iommu into devel-fixes (fdcc205f) · Commits · e / devices / android_kernel_xiaomi_sm6125

arch/arm/mach-omap2/iommu2.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -225,8 +225,8 @@ static u32 omap2_get_pte_attr(struct iotlb_entry *e)
		attr = e->mixed << 5;
		attr \|= e->endian;
		attr \|= e->elsz >> 3;
		attr <<= ((e->pgsz & MMU_CAM_PGSZ_4K) ? 0 : 6);

		attr <<= (((e->pgsz == MMU_CAM_PGSZ_4K) \|\|
		(e->pgsz == MMU_CAM_PGSZ_64K)) ? 0 : 6);
		return attr;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ static struct iommu_device omap4_devices[] = {
		.pdata = {
		.name = "ducati",
		.nr_tlb_entries = 32,
		.clk_name = "ducati_ick",
		.clk_name = "ipu_fck",
		.da_start = 0x0,
		.da_end = 0xFFFFF000,
		},

+3 −3

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ static size_t sgtable_len(const struct sg_table *sgt)
		for_each_sg(sgt->sgl, sg, sgt->nents, i) {
		size_t bytes;

		bytes = sg_dma_len(sg);
		bytes = sg->length;

		if (!iopgsz_ok(bytes)) {
		pr_err("%s: sg[%d] not iommu pagesize(%x)\n",
		@@ -198,7 +198,7 @@ static void vmap_sg(const struct sg_table sgt)
		int err;

		pa = sg_phys(sg);
		bytes = sg_dma_len(sg);
		bytes = sg->length;

		BUG_ON(bytes != PAGE_SIZE);

		@@ -476,7 +476,7 @@ static int map_iovm_area(struct iommu obj, struct iovm_struct new,
		struct iotlb_entry e;

		pa = sg_phys(sg);
		bytes = sg_dma_len(sg);
		bytes = sg->length;

		flags &= ~IOVMF_PGSZ_MASK;
		pgsz = bytes_to_iopgsz(bytes);