Commit 7c8896dd authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Joerg Roedel
Browse files

iommu: Remove IOMMU_DEV_FEAT_SVA 



None of the drivers implement anything here anymore, remove the dead code.

Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarYi Liu <yi.l.liu@intel.com>
Tested-by: default avatarZhangfei Gao <zhangfei.gao@linaro.org>
Link: https://lore.kernel.org/r/20250418080130.1844424-3-baolu.lu@linux.intel.com


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

drivers/accel/amdxdna/aie2_pci.c

+2 −11
Original line number Diff line number Diff line
@@ -512,12 +512,6 @@ static int aie2_init(struct amdxdna_dev *xdna) 
		goto release_fw;

	}



	ret = iommu_dev_enable_feature(&pdev->dev, IOMMU_DEV_FEAT_SVA);

	if (ret) {

		XDNA_ERR(xdna, "Enable PASID failed, ret %d", ret);

		goto free_irq;

	}



	psp_conf.fw_size = fw->size;

	psp_conf.fw_buf = fw->data;

	for (i = 0; i < PSP_MAX_REGS; i++)
@@ -526,14 +520,14 @@ static int aie2_init(struct amdxdna_dev *xdna) 
	if (!ndev->psp_hdl) {

		XDNA_ERR(xdna, "failed to create psp");

		ret = -ENOMEM;

		goto disable_sva;

		goto free_irq;

	}

	xdna->dev_handle = ndev;



	ret = aie2_hw_start(xdna);

	if (ret) {

		XDNA_ERR(xdna, "start npu failed, ret %d", ret);

		goto disable_sva;

		goto free_irq;

	}



	ret = aie2_mgmt_fw_query(ndev);
@@ -584,8 +578,6 @@ static int aie2_init(struct amdxdna_dev *xdna) 
	aie2_error_async_events_free(ndev);

stop_hw:

	aie2_hw_stop(xdna);

disable_sva:

	iommu_dev_disable_feature(&pdev->dev, IOMMU_DEV_FEAT_SVA);

free_irq:

	pci_free_irq_vectors(pdev);

release_fw:
@@ -601,7 +593,6 @@ static void aie2_fini(struct amdxdna_dev *xdna) 


	aie2_hw_stop(xdna);

	aie2_error_async_events_free(ndev);

	iommu_dev_disable_feature(&pdev->dev, IOMMU_DEV_FEAT_SVA);

	pci_free_irq_vectors(pdev);

}

drivers/dma/idxd/init.c

+1 −7
Original line number Diff line number Diff line
@@ -633,17 +633,11 @@ static int idxd_enable_sva(struct pci_dev *pdev) 
	ret = iommu_dev_enable_feature(&pdev->dev, IOMMU_DEV_FEAT_IOPF);

	if (ret)

		return ret;



	ret = iommu_dev_enable_feature(&pdev->dev, IOMMU_DEV_FEAT_SVA);

	if (ret)

		iommu_dev_disable_feature(&pdev->dev, IOMMU_DEV_FEAT_IOPF);



	return ret;

	return 0;

}



static void idxd_disable_sva(struct pci_dev *pdev)

{

	iommu_dev_disable_feature(&pdev->dev, IOMMU_DEV_FEAT_SVA);

	iommu_dev_disable_feature(&pdev->dev, IOMMU_DEV_FEAT_IOPF);

}

drivers/iommu/amd/iommu.c

+0 −2
Original line number Diff line number Diff line
@@ -2991,7 +2991,6 @@ static int amd_iommu_dev_enable_feature(struct device *dev, 


	switch (feat) {

	case IOMMU_DEV_FEAT_IOPF:

	case IOMMU_DEV_FEAT_SVA:

		break;

	default:

		ret = -EINVAL;
@@ -3007,7 +3006,6 @@ static int amd_iommu_dev_disable_feature(struct device *dev, 


	switch (feat) {

	case IOMMU_DEV_FEAT_IOPF:

	case IOMMU_DEV_FEAT_SVA:

		break;

	default:

		ret = -EINVAL;

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

+0 −2
Original line number Diff line number Diff line
@@ -3653,7 +3653,6 @@ static int arm_smmu_dev_enable_feature(struct device *dev, 


	switch (feat) {

	case IOMMU_DEV_FEAT_IOPF:

	case IOMMU_DEV_FEAT_SVA:

		return 0;

	default:

		return -EINVAL;
@@ -3670,7 +3669,6 @@ static int arm_smmu_dev_disable_feature(struct device *dev, 


	switch (feat) {

	case IOMMU_DEV_FEAT_IOPF:

	case IOMMU_DEV_FEAT_SVA:

		return 0;

	default:

		return -EINVAL;

drivers/iommu/intel/iommu.c

+0 −6
Original line number Diff line number Diff line
@@ -3950,9 +3950,6 @@ intel_iommu_dev_enable_feat(struct device *dev, enum iommu_dev_features feat) 
	case IOMMU_DEV_FEAT_IOPF:

		return intel_iommu_enable_iopf(dev);



	case IOMMU_DEV_FEAT_SVA:

		return 0;



	default:

		return -ENODEV;

	}
@@ -3966,9 +3963,6 @@ intel_iommu_dev_disable_feat(struct device *dev, enum iommu_dev_features feat) 
		intel_iommu_disable_iopf(dev);

		return 0;



	case IOMMU_DEV_FEAT_SVA:

		return 0;



	default:

		return -ENODEV;

	}