Commit 1c263576 authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel
Browse files

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: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarJean-Philippe Brucker <jean-philippe@linaro.org>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarYi Liu <yi.l.liu@intel.com>
Tested-by: default avatarZhangfei Gao <zhangfei.gao@linaro.org>
Tested-by: default avatarTony Zhu <tony.zhu@intel.com>
Link: https://lore.kernel.org/r/20221031005917.45690-11-baolu.lu@linux.intel.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent be51b1d6

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

+0 −40
Original line number Diff line number Diff line
@@ -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 @@ __arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm) 
	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;

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

+0 −3
Original line number Diff line number Diff line
@@ -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 */

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

+0 −16
Original line number Diff line number Diff line
@@ -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)

drivers/iommu/intel/iommu.c

+0 −3
Original line number Diff line number Diff line
@@ -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) {

drivers/iommu/intel/iommu.h

+0 −3
Original line number Diff line number Diff line
@@ -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);