[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230822185632.RFC.v2.9.I5d374dbc818b209e911ef5fbf43de6df0d7ac40b@changeid>
Date: Tue, 22 Aug 2023 18:57:05 +0800
From: Michael Shavit <mshavit@...gle.com>
To: iommu@...ts.linux.dev, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org
Cc: nicolinc@...dia.com, tina.zhang@...el.com,
jean-philippe@...aro.org, will@...nel.org, robin.murphy@....com,
jgg@...dia.com, Michael Shavit <mshavit@...gle.com>,
Dawei Li <set_pte_at@...look.com>,
Jason Gunthorpe <jgg@...pe.ca>, Joerg Roedel <joro@...tes.org>,
"Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>,
Lu Baolu <baolu.lu@...ux.intel.com>,
Mark Brown <broonie@...nel.org>
Subject: [RFC PATCH v2 9/9] iommu/arm-smmu-v3: allow multi-SMMU domain installs.
Remove the arm_smmu_domain->smmu handle now that a domain may be
attached to devices with different upstream SMMUs.
Signed-off-by: Michael Shavit <mshavit@...gle.com>
---
(no changes since v1)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 10 +++-------
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 3 +--
2 files changed, 4 insertions(+), 9 deletions(-)
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 9f8b701771fc3..55c0b8aecfb0a 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -2564,13 +2564,9 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
mutex_lock(&smmu_domain->init_mutex);
- if (!smmu_domain->smmu) {
- smmu_domain->smmu = smmu;
- ret = arm_smmu_domain_finalise(domain, smmu);
- if (ret)
- smmu_domain->smmu = NULL;
- } else if (smmu_domain->smmu != smmu ||
- !arm_smmu_verify_domain_compatible(smmu, smmu_domain))
+ if (!smmu_domain->pgtbl_ops)
+ ret = arm_smmu_domain_finalise(&smmu_domain->domain, smmu);
+ else if (!arm_smmu_verify_domain_compatible(smmu, smmu_domain))
ret = -EINVAL;
mutex_unlock(&smmu_domain->init_mutex);
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 1661d3252bac5..fcf3845f4659c 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
@@ -716,8 +716,7 @@ enum arm_smmu_domain_stage {
};
struct arm_smmu_domain {
- struct arm_smmu_device *smmu;
- struct mutex init_mutex; /* Protects smmu pointer */
+ struct mutex init_mutex; /* Protects pgtbl_ops pointer */
struct io_pgtable_ops *pgtbl_ops;
atomic_t nr_ats_masters;
--
2.42.0.rc1.204.g551eb34607-goog
Powered by blists - more mailing lists