On 2021-03-16 15:38, Christoph Hellwig wrote: [...]

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 f1e38526d5bd40..996dfdf9d375dd 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2017,7 +2017,7 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain, .iommu_dev = smmu->dev, };

• if (smmu_domain->non_strict)

• if (!iommu_get_dma_strict())

As Will raised, this also needs to be checking "domain->type == IOMMU_DOMAIN_DMA" to maintain equivalent behaviour to the attribute code below.

pgtbl_cfg.quirks |= IO_PGTABLE_QUIRK_NON_STRICT;

pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain); @@ -2449,52 +2449,6 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev) return group; }

-static int arm_smmu_domain_get_attr(struct iommu_domain *domain,

• 		    enum iommu_attr attr, void *data)
  

-{

• struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
• switch (domain->type) {
• case IOMMU_DOMAIN_DMA:

• switch (attr) {
  

• case DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE:
  

• 	*(int *)data = smmu_domain->non_strict;
  

• 	return 0;
  

• default:
  

• 	return -ENODEV;
  

• }
  

• break;
  

• default:

• return -EINVAL;
  

• }

-}

[...]

diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h index f985817c967a25..edb1de479dd1a7 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -668,7 +668,6 @@ struct arm_smmu_domain { struct mutex init_mutex; /* Protects smmu pointer */

struct io_pgtable_ops *pgtbl_ops;

• bool non_strict; atomic_t nr_ats_masters;

  enum arm_smmu_domain_stage stage;

diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c index 0aa6d667274970..3dde22b1f8ffb0 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -761,6 +761,9 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, .iommu_dev = smmu->dev, };

• if (!iommu_get_dma_strict())

Ditto here.

Sorry for not spotting that sooner :(

Robin.

• pgtbl_cfg.quirks |= IO_PGTABLE_QUIRK_NON_STRICT;
  

• if (smmu->impl && smmu->impl->init_context) { ret = smmu->impl->init_context(smmu_domain, &pgtbl_cfg, dev); if (ret)