diff options
| author | Joerg Roedel <joro@8bytes.org> | 2014-05-12 18:32:06 (GMT) |
|---|---|---|
| committer | Joerg Roedel <joro@8bytes.org> | 2014-05-12 18:32:06 (GMT) |
| commit | 645d6c87229c91cb0d1e2ffcb42c576ec8058a35 (patch) | |
| tree | 98a84fc6249c643c3a49f8f8b5e08c956a8f6592 /drivers/iommu | |
| parent | d6d211db37e75de2ddc3a4f979038c40df7cc79c (diff) | |
| parent | 6069d23ce0e568909d847f28af0257b085e8e77a (diff) | |
| download | linux-645d6c87229c91cb0d1e2ffcb42c576ec8058a35.tar.xz | |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 647c3c7..1599354 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -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 |