| Message ID | 1492765416-30835-1-git-send-email-peng.fan@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Apr 21, 2017 at 05:03:36PM +0800, Peng Fan wrote: > From code "SMR mask 0x%x out of range for SMMU", > so, we need to use mask, not sid. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > Cc: Will Deacon <will.deacon@arm.com> > Cc: Robin Murphy <robin.murphy@arm.com> > --- > drivers/iommu/arm-smmu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c > index b493c99..5a06de2 100644 > --- a/drivers/iommu/arm-smmu.c > +++ b/drivers/iommu/arm-smmu.c > @@ -1467,7 +1467,7 @@ static int arm_smmu_add_device(struct device *dev) > } > if (mask & ~smmu->smr_mask_mask) { > dev_err(dev, "SMR mask 0x%x out of range for SMMU (0x%x)\n", > - sid, smmu->smr_mask_mask); > + mask, smmu->smr_mask_mask); > goto out_free; Looks like a copy-paste error to me: Acked-by: Will Deacon <will.deacon@arm.com> Joerg: do you mind picking this one up, please? Thanks, Will
On Mon, Apr 24, 2017 at 04:54:54PM +0100, Will Deacon wrote: > On Fri, Apr 21, 2017 at 05:03:36PM +0800, Peng Fan wrote: > > - sid, smmu->smr_mask_mask); > > + mask, smmu->smr_mask_mask); > > goto out_free; > > Looks like a copy-paste error to me: > > Acked-by: Will Deacon <will.deacon@arm.com> > > Joerg: do you mind picking this one up, please? Applied, thanks.
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index b493c99..5a06de2 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1467,7 +1467,7 @@ static int arm_smmu_add_device(struct device *dev) } if (mask & ~smmu->smr_mask_mask) { dev_err(dev, "SMR mask 0x%x out of range for SMMU (0x%x)\n", - sid, smmu->smr_mask_mask); + mask, smmu->smr_mask_mask); goto out_free; } }
From code "SMR mask 0x%x out of range for SMMU", so, we need to use mask, not sid. Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Robin Murphy <robin.murphy@arm.com> --- drivers/iommu/arm-smmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)