iommu: Remove SVA related callbacks from iommu ops

These ops'es have been deprecated. There's no need for them anymore.
Remove them to avoid dead code.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Yi Liu <yi.l.liu@intel.com>
Tested-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Tested-by: Tony Zhu <tony.zhu@intel.com>
Link: https://lore.kernel.org/r/20221031005917.45690-11-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
index 2d188d12419ec6d5158921070ff4902e02e78868..9541afbba73c5687e4b6b9feaa64ff3ce87808ed 100644 (file)
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
@@ -344,11 +344,6 @@ __arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm)
        if (!bond)
                return ERR_PTR(-ENOMEM);
 
-       /* Allocate a PASID for this mm if necessary */
-       ret = iommu_sva_alloc_pasid(mm, 1, (1U << master->ssid_bits) - 1);
-       if (ret)
-               goto err_free_bond;
-
        bond->mm = mm;
        bond->sva.dev = dev;
        refcount_set(&bond->refs, 1);
@@ -367,41 +362,6 @@ err_free_bond:
        return ERR_PTR(ret);
 }
 
-struct iommu_sva *arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm)
-{
-       struct iommu_sva *handle;
-       struct iommu_domain *domain = iommu_get_domain_for_dev(dev);
-       struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
-
-       if (smmu_domain->stage != ARM_SMMU_DOMAIN_S1)
-               return ERR_PTR(-EINVAL);
-
-       mutex_lock(&sva_lock);
-       handle = __arm_smmu_sva_bind(dev, mm);
-       mutex_unlock(&sva_lock);
-       return handle;
-}
-
-void arm_smmu_sva_unbind(struct iommu_sva *handle)
-{
-       struct arm_smmu_bond *bond = sva_to_bond(handle);
-
-       mutex_lock(&sva_lock);
-       if (refcount_dec_and_test(&bond->refs)) {
-               list_del(&bond->list);
-               arm_smmu_mmu_notifier_put(bond->smmu_mn);
-               kfree(bond);
-       }
-       mutex_unlock(&sva_lock);
-}
-
-u32 arm_smmu_sva_get_pasid(struct iommu_sva *handle)
-{
-       struct arm_smmu_bond *bond = sva_to_bond(handle);
-
-       return bond->mm->pasid;
-}
-
 bool arm_smmu_sva_supported(struct arm_smmu_device *smmu)
 {
        unsigned long reg, fld;

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 eed2eb8effa3fcf7db206cb2227d5f21abf1ddb4..891e87ea54dbe238e6bfe0378badad8635351ddc 100644 (file)
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -2863,9 +2863,6 @@ static struct iommu_ops arm_smmu_ops = {
        .remove_dev_pasid       = arm_smmu_remove_dev_pasid,
        .dev_enable_feat        = arm_smmu_dev_enable_feature,
        .dev_disable_feat       = arm_smmu_dev_disable_feature,
-       .sva_bind               = arm_smmu_sva_bind,
-       .sva_unbind             = arm_smmu_sva_unbind,
-       .sva_get_pasid          = arm_smmu_sva_get_pasid,
        .page_response          = arm_smmu_page_response,
        .def_domain_type        = arm_smmu_def_domain_type,
        .pgsize_bitmap          = -1UL, /* Restricted during device attach */

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 5aa853e98d388fa00e4bc60a3b866042e289a185..8d772ea8a58367b690e91b2a7fbea251b11b93c2 100644 (file)
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
@@ -754,9 +754,6 @@ bool arm_smmu_master_sva_enabled(struct arm_smmu_master *master);
 int arm_smmu_master_enable_sva(struct arm_smmu_master *master);
 int arm_smmu_master_disable_sva(struct arm_smmu_master *master);
 bool arm_smmu_master_iopf_supported(struct arm_smmu_master *master);
-struct iommu_sva *arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm);
-void arm_smmu_sva_unbind(struct iommu_sva *handle);
-u32 arm_smmu_sva_get_pasid(struct iommu_sva *handle);
 void arm_smmu_sva_notifier_synchronize(void);
 struct iommu_domain *arm_smmu_sva_domain_alloc(void);
 void arm_smmu_sva_remove_dev_pasid(struct iommu_domain *domain,
@@ -792,19 +789,6 @@ static inline bool arm_smmu_master_iopf_supported(struct arm_smmu_master *master
        return false;
 }
 
-static inline struct iommu_sva *
-arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm)
-{
-       return ERR_PTR(-ENODEV);
-}
-
-static inline void arm_smmu_sva_unbind(struct iommu_sva *handle) {}
-
-static inline u32 arm_smmu_sva_get_pasid(struct iommu_sva *handle)
-{
-       return IOMMU_PASID_INVALID;
-}
-
 static inline void arm_smmu_sva_notifier_synchronize(void) {}
 
 static inline struct iommu_domain *arm_smmu_sva_domain_alloc(void)

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 7b67e431dd362cfd585215534e63c0204570eb8a..5a41b10593b7a5608729c479af219bebee938f40 100644 (file)
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -4751,9 +4751,6 @@ const struct iommu_ops intel_iommu_ops = {
        .remove_dev_pasid       = intel_iommu_remove_dev_pasid,
        .pgsize_bitmap          = SZ_4K,
 #ifdef CONFIG_INTEL_IOMMU_SVM
-       .sva_bind               = intel_svm_bind,
-       .sva_unbind             = intel_svm_unbind,
-       .sva_get_pasid          = intel_svm_get_pasid,
        .page_response          = intel_svm_page_response,
 #endif
        .default_domain_ops = &(const struct iommu_domain_ops) {

diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h
index 252fa344f88a266346598164c7ad1aa00ae84fcf..251a609fdce3279831f67005b0d11c12d9ac9e5b 100644 (file)
--- a/drivers/iommu/intel/iommu.h
+++ b/drivers/iommu/intel/iommu.h
@@ -748,9 +748,6 @@ struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfn);
 extern void intel_svm_check(struct intel_iommu *iommu);
 extern int intel_svm_enable_prq(struct intel_iommu *iommu);
 extern int intel_svm_finish_prq(struct intel_iommu *iommu);
-struct iommu_sva *intel_svm_bind(struct device *dev, struct mm_struct *mm);
-void intel_svm_unbind(struct iommu_sva *handle);
-u32 intel_svm_get_pasid(struct iommu_sva *handle);
 int intel_svm_page_response(struct device *dev, struct iommu_fault_event *evt,
                            struct iommu_page_response *msg);
 struct iommu_domain *intel_svm_domain_alloc(void);

diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c
index 86c8ea0d9635e3239171432c5292c72b83d25820..fceae93870189407ad715c022a96c14276b35eb3 100644 (file)
--- a/drivers/iommu/intel/svm.c
+++ b/drivers/iommu/intel/svm.c
@@ -296,14 +296,6 @@ out:
        return 0;
 }
 
-static int intel_svm_alloc_pasid(struct device *dev, struct mm_struct *mm)
-{
-       ioasid_t max_pasid = dev_is_pci(dev) ?
-                       pci_max_pasids(to_pci_dev(dev)) : intel_pasid_max_id;
-
-       return iommu_sva_alloc_pasid(mm, PASID_MIN, max_pasid - 1);
-}
-
 static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu,
                                           struct device *dev,
                                           struct mm_struct *mm)
@@ -771,47 +763,6 @@ prq_advance:
        return IRQ_RETVAL(handled);
 }
 
-struct iommu_sva *intel_svm_bind(struct device *dev, struct mm_struct *mm)
-{
-       struct intel_iommu *iommu = device_to_iommu(dev, NULL, NULL);
-       struct iommu_sva *sva;
-       int ret;
-
-       mutex_lock(&pasid_mutex);
-       ret = intel_svm_alloc_pasid(dev, mm);
-       if (ret) {
-               mutex_unlock(&pasid_mutex);
-               return ERR_PTR(ret);
-       }
-
-       sva = intel_svm_bind_mm(iommu, dev, mm);
-       mutex_unlock(&pasid_mutex);
-
-       return sva;
-}
-
-void intel_svm_unbind(struct iommu_sva *sva)
-{
-       struct intel_svm_dev *sdev = to_intel_svm_dev(sva);
-
-       mutex_lock(&pasid_mutex);
-       intel_svm_unbind_mm(sdev->dev, sdev->pasid);
-       mutex_unlock(&pasid_mutex);
-}
-
-u32 intel_svm_get_pasid(struct iommu_sva *sva)
-{
-       struct intel_svm_dev *sdev;
-       u32 pasid;
-
-       mutex_lock(&pasid_mutex);
-       sdev = to_intel_svm_dev(sva);
-       pasid = sdev->pasid;
-       mutex_unlock(&pasid_mutex);
-
-       return pasid;
-}
-
 int intel_svm_page_response(struct device *dev,
                            struct iommu_fault_event *evt,
                            struct iommu_page_response *msg)

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index bee5659d07ebefc0f313748c9f5ba5b7b30957d7..c337ef1c97bc8da3d73d543bbd932938a0a5bf03 100644 (file)
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -227,9 +227,6 @@ struct iommu_iotlb_gather {
  *                      driver init to device driver init (default no)
  * @dev_enable/disable_feat: per device entries to enable/disable
  *                               iommu specific features.
- * @sva_bind: Bind process address space to device
- * @sva_unbind: Unbind process address space from device
- * @sva_get_pasid: Get PASID associated to a SVA handle
  * @page_response: handle page request response
  * @def_domain_type: device default domain type, return value:
  *             - IOMMU_DOMAIN_IDENTITY: must use an identity domain
@@ -263,10 +260,6 @@ struct iommu_ops {
        int (*dev_enable_feat)(struct device *dev, enum iommu_dev_features f);
        int (*dev_disable_feat)(struct device *dev, enum iommu_dev_features f);
 
-       struct iommu_sva *(*sva_bind)(struct device *dev, struct mm_struct *mm);
-       void (*sva_unbind)(struct iommu_sva *handle);
-       u32 (*sva_get_pasid)(struct iommu_sva *handle);
-
        int (*page_response)(struct device *dev,
                             struct iommu_fault_event *evt,
                             struct iommu_page_response *msg);