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

Commit 645d6c87 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branch 'for-joerg/arm-smmu/updates' of... 

Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
parents d6d211db 6069d23c

drivers/iommu/arm-smmu.c

+2 −2
Original line number Diff line number Diff line
@@ -1167,7 +1167,7 @@ static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain, 
	for (i = 0; i < master->num_streamids; ++i) {

		u32 idx, s2cr;

		idx = master->smrs ? master->smrs[i].idx : master->streamids[i];

		s2cr = (S2CR_TYPE_TRANS << S2CR_TYPE_SHIFT) |

		s2cr = S2CR_TYPE_TRANS |

		       (smmu_domain->root_cfg.cbndx << S2CR_CBNDX_SHIFT);

		writel_relaxed(s2cr, gr0_base + ARM_SMMU_GR0_S2CR(idx));

	}
@@ -1804,7 +1804,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) 
	 * allocation (PTRS_PER_PGD).

	 */

#ifdef CONFIG_64BIT

	smmu->s1_output_size = min(39UL, size);

	smmu->s1_output_size = min((unsigned long)VA_BITS, size);

#else

	smmu->s1_output_size = min(32UL, size);

#endif