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>
This commit is contained in:
@@ -344,11 +344,6 @@ __arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm)
|
|||||||
if (!bond)
|
if (!bond)
|
||||||
return ERR_PTR(-ENOMEM);
|
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->mm = mm;
|
||||||
bond->sva.dev = dev;
|
bond->sva.dev = dev;
|
||||||
refcount_set(&bond->refs, 1);
|
refcount_set(&bond->refs, 1);
|
||||||
@@ -367,41 +362,6 @@ err_free_bond:
|
|||||||
return ERR_PTR(ret);
|
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)
|
bool arm_smmu_sva_supported(struct arm_smmu_device *smmu)
|
||||||
{
|
{
|
||||||
unsigned long reg, fld;
|
unsigned long reg, fld;
|
||||||
|
|||||||
@@ -2863,9 +2863,6 @@ static struct iommu_ops arm_smmu_ops = {
|
|||||||
.remove_dev_pasid = arm_smmu_remove_dev_pasid,
|
.remove_dev_pasid = arm_smmu_remove_dev_pasid,
|
||||||
.dev_enable_feat = arm_smmu_dev_enable_feature,
|
.dev_enable_feat = arm_smmu_dev_enable_feature,
|
||||||
.dev_disable_feat = arm_smmu_dev_disable_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,
|
.page_response = arm_smmu_page_response,
|
||||||
.def_domain_type = arm_smmu_def_domain_type,
|
.def_domain_type = arm_smmu_def_domain_type,
|
||||||
.pgsize_bitmap = -1UL, /* Restricted during device attach */
|
.pgsize_bitmap = -1UL, /* Restricted during device attach */
|
||||||
|
|||||||
@@ -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_enable_sva(struct arm_smmu_master *master);
|
||||||
int arm_smmu_master_disable_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);
|
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);
|
void arm_smmu_sva_notifier_synchronize(void);
|
||||||
struct iommu_domain *arm_smmu_sva_domain_alloc(void);
|
struct iommu_domain *arm_smmu_sva_domain_alloc(void);
|
||||||
void arm_smmu_sva_remove_dev_pasid(struct iommu_domain *domain,
|
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;
|
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 void arm_smmu_sva_notifier_synchronize(void) {}
|
||||||
|
|
||||||
static inline struct iommu_domain *arm_smmu_sva_domain_alloc(void)
|
static inline struct iommu_domain *arm_smmu_sva_domain_alloc(void)
|
||||||
|
|||||||
@@ -4751,9 +4751,6 @@ const struct iommu_ops intel_iommu_ops = {
|
|||||||
.remove_dev_pasid = intel_iommu_remove_dev_pasid,
|
.remove_dev_pasid = intel_iommu_remove_dev_pasid,
|
||||||
.pgsize_bitmap = SZ_4K,
|
.pgsize_bitmap = SZ_4K,
|
||||||
#ifdef CONFIG_INTEL_IOMMU_SVM
|
#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,
|
.page_response = intel_svm_page_response,
|
||||||
#endif
|
#endif
|
||||||
.default_domain_ops = &(const struct iommu_domain_ops) {
|
.default_domain_ops = &(const struct iommu_domain_ops) {
|
||||||
|
|||||||
@@ -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 void intel_svm_check(struct intel_iommu *iommu);
|
||||||
extern int intel_svm_enable_prq(struct intel_iommu *iommu);
|
extern int intel_svm_enable_prq(struct intel_iommu *iommu);
|
||||||
extern int intel_svm_finish_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,
|
int intel_svm_page_response(struct device *dev, struct iommu_fault_event *evt,
|
||||||
struct iommu_page_response *msg);
|
struct iommu_page_response *msg);
|
||||||
struct iommu_domain *intel_svm_domain_alloc(void);
|
struct iommu_domain *intel_svm_domain_alloc(void);
|
||||||
|
|||||||
@@ -296,14 +296,6 @@ out:
|
|||||||
return 0;
|
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,
|
static struct iommu_sva *intel_svm_bind_mm(struct intel_iommu *iommu,
|
||||||
struct device *dev,
|
struct device *dev,
|
||||||
struct mm_struct *mm)
|
struct mm_struct *mm)
|
||||||
@@ -771,47 +763,6 @@ prq_advance:
|
|||||||
return IRQ_RETVAL(handled);
|
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,
|
int intel_svm_page_response(struct device *dev,
|
||||||
struct iommu_fault_event *evt,
|
struct iommu_fault_event *evt,
|
||||||
struct iommu_page_response *msg)
|
struct iommu_page_response *msg)
|
||||||
|
|||||||
@@ -227,9 +227,6 @@ struct iommu_iotlb_gather {
|
|||||||
* driver init to device driver init (default no)
|
* driver init to device driver init (default no)
|
||||||
* @dev_enable/disable_feat: per device entries to enable/disable
|
* @dev_enable/disable_feat: per device entries to enable/disable
|
||||||
* iommu specific features.
|
* 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
|
* @page_response: handle page request response
|
||||||
* @def_domain_type: device default domain type, return value:
|
* @def_domain_type: device default domain type, return value:
|
||||||
* - IOMMU_DOMAIN_IDENTITY: must use an identity domain
|
* - 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_enable_feat)(struct device *dev, enum iommu_dev_features f);
|
||||||
int (*dev_disable_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,
|
int (*page_response)(struct device *dev,
|
||||||
struct iommu_fault_event *evt,
|
struct iommu_fault_event *evt,
|
||||||
struct iommu_page_response *msg);
|
struct iommu_page_response *msg);
|
||||||
|
|||||||
Reference in New Issue
Block a user