Commit 12bc3679 authored by Sai Prakash Ranjan's avatar Sai Prakash Ranjan Committed by Will Deacon
Browse files

iommu/arm-smmu: Move non-strict mode to use io_pgtable_domain_attr 



Now that we have a struct io_pgtable_domain_attr with quirks,
use that for non_strict mode as well thereby removing the need
for more members of arm_smmu_domain in the future.

Signed-off-by: default avatarSai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
Link: https://lore.kernel.org/r/c191265f3db1f6b3e136d4057ca917666680a066.1606287059.git.saiprakash.ranjan@codeaurora.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent c99110a8

drivers/iommu/arm/arm-smmu/arm-smmu.c

+9 −6
Original line number Diff line number Diff line
@@ -786,9 +786,6 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain, 
			goto out_clear_smmu;

	}



	if (smmu_domain->non_strict)

		pgtbl_cfg.quirks |= IO_PGTABLE_QUIRK_NON_STRICT;



	if (smmu_domain->pgtbl_cfg.quirks)

		pgtbl_cfg.quirks |= smmu_domain->pgtbl_cfg.quirks;
@@ -1526,9 +1523,12 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain, 
		break;

	case IOMMU_DOMAIN_DMA:

		switch (attr) {

		case DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE:

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

		case DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE: {

			bool non_strict = smmu_domain->pgtbl_cfg.quirks &

					  IO_PGTABLE_QUIRK_NON_STRICT;

			*(int *)data = non_strict;

			return 0;

		}

		default:

			return -ENODEV;

		}
@@ -1578,7 +1578,10 @@ static int arm_smmu_domain_set_attr(struct iommu_domain *domain, 
	case IOMMU_DOMAIN_DMA:

		switch (attr) {

		case DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE:

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

			if (*(int *)data)

				smmu_domain->pgtbl_cfg.quirks |= IO_PGTABLE_QUIRK_NON_STRICT;

			else

				smmu_domain->pgtbl_cfg.quirks &= ~IO_PGTABLE_QUIRK_NON_STRICT;

			break;

		default:

			ret = -ENODEV;

drivers/iommu/arm/arm-smmu/arm-smmu.h

+0 −1
Original line number Diff line number Diff line
@@ -368,7 +368,6 @@ struct arm_smmu_domain { 
	const struct iommu_flush_ops	*flush_ops;

	struct arm_smmu_cfg		cfg;

	enum arm_smmu_domain_stage	stage;

	bool				non_strict;

	struct mutex			init_mutex; /* Protects smmu pointer */

	spinlock_t			cb_lock; /* Serialises ATS1* ops and TLB syncs */

	struct iommu_domain		domain;

CRA Git | Maintained and supported by SUSTech CRA and CCSE