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

Commit 6069d23c authored by Kefeng Wang's avatar Kefeng Wang Committed by Will Deacon
Browse files

iommu/arm-smmu: fix incorrect use of S2CR_TYPE_SHIFT 



There is already S2CR_TYPE_SHIFT in S2CR_TYPE_TRANS macro, so drop the
second shift. Note that, since S2CR_TYPE_SHIFT is 0x0, there is no
functional change introduced by this patch.

Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent c4430841

drivers/iommu/arm-smmu.c

+1 −1
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));

	}