diff mbox series

iommu/arm-smmu-v3: Restore prints in arm_smmu_attach_dev()

Message ID 20221109070713.9617-1-nicolinc@nvidia.com
State New
Headers
Series iommu/arm-smmu-v3: Restore prints in arm_smmu_attach_dev() |

Commit Message

Nicolin Chen Nov. 9, 2022, 7:07 a.m. UTC 
  The prints for incompatible failures in arm_smmu_attach_dev() might be
still useful for error diagnosis. As VFIO and IOMMUFD would do testing
attach() call, having previous dev_err() isn't ideal either.

Add the prints back using dev_dbg().

Suggested-by: Will Deacon <will@kernel.org>
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Jason Gunthorpe Nov. 9, 2022, 1:11 p.m. UTC | #1 
On Tue, Nov 08, 2022 at 11:07:13PM -0800, Nicolin Chen wrote:
> The prints for incompatible failures in arm_smmu_attach_dev() might be
> still useful for error diagnosis. As VFIO and IOMMUFD would do testing
> attach() call, having previous dev_err() isn't ideal either.
> 
> Add the prints back using dev_dbg().
> 
> Suggested-by: Will Deacon <will@kernel.org>
> Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
> ---
>  drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 7 +++++++
>  1 file changed, 7 insertions(+)

You should probably include a fixes line

Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>

Jason
Nicolin Chen Nov. 9, 2022, 6:47 p.m. UTC | #2 
On Wed, Nov 09, 2022 at 09:11:53AM -0400, Jason Gunthorpe wrote:
> On Tue, Nov 08, 2022 at 11:07:13PM -0800, Nicolin Chen wrote:
> > The prints for incompatible failures in arm_smmu_attach_dev() might be
> > still useful for error diagnosis. As VFIO and IOMMUFD would do testing
> > attach() call, having previous dev_err() isn't ideal either.
> > 
> > Add the prints back using dev_dbg().
> > 
> > Suggested-by: Will Deacon <will@kernel.org>
> > Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
> > ---
> >  drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 7 +++++++
> >  1 file changed, 7 insertions(+)
> 
> You should probably include a fixes line
> 
> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>

Just sent a v2 adding "Fixes" and "Reviewed-by". Thanks!
diff mbox series

Patch

diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index ab160198edd6..076d3710b1fe 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -2433,14 +2433,21 @@  static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
 			goto out_unlock;
 		}
 	} else if (smmu_domain->smmu != smmu) {
+		dev_dbg(dev, "cannot attach to SMMU %s (upstream of %s)\n",
+			dev_name(smmu_domain->smmu->dev), dev_name(smmu->dev));
 		ret = -EINVAL;
 		goto out_unlock;
 	} else if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1 &&
 		   master->ssid_bits != smmu_domain->s1_cfg.s1cdmax) {
+		dev_dbg(dev,
+			"cannot attach to incompatible domain (%u SSID bits != %u)\n",
+			smmu_domain->s1_cfg.s1cdmax, master->ssid_bits);
 		ret = -EINVAL;
 		goto out_unlock;
 	} else if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1 &&
 		   smmu_domain->stall_enabled != master->stall_enabled) {
+		dev_dbg(dev, "cannot attach to stall-%s domain\n",
+			smmu_domain->stall_enabled ? "enabled" : "disabled");
 		ret = -EINVAL;
 		goto out_unlock;
 	}