iommu/vt-d: Delete dev_has_feat callback
Subsystems (2)
Lu Baolu
maintainerPATCH 1/1 iommu/vt-d: Delete dev_has_feat callback
The commit 262948f8ba573 ("iommu: Delete iommu_dev_has_feature()") has deleted the iommu_dev_has_feature() interface. Remove the dev_has_feat callback to avoid dead code.
Signed-off-by Lu Baolu <[email protected]>
--- drivers/iommu/intel/iommu.c | 59 ++++--------------------------------- 1 file changed, 5 insertions(+), 54 deletions(-)
drivers/iommu/intel/iommu.c +5 -54
@@ -5516,62 +5516,14 @@ static int intel_iommu_disable_sva(struct device *dev)return ret; } -/* -* A PCI express designated vendor specific extended capability is defined -* in the section 3.7 of Intel scalable I/O virtualization technical spec -* for system software and tools to detect endpoint devices supporting the -* Intel scalable IO virtualization without host driver dependency. -* -* Returns the address of the matching extended capability structure within -* the device's PCI configuration space or 0 if the device does not support -* it. -*/ -static int siov_find_pci_dvsec (struct pci_dev *pdev) -{ -int pos; -u16 vendor, id; - - pos =pci_find_next_ext_capability (pdev,0 ,0x23 ); -while (pos) { -pci_read_config_word (pdev, pos +4 , &vendor); -pci_read_config_word (pdev, pos +8 , &id); -if (vendor ==PCI_VENDOR_ID_INTEL && id ==5 ) -return pos; - - pos =pci_find_next_ext_capability (pdev, pos,0x23 ); - } - -return 0 ; -} - -static bool -intel_iommu_dev_has_feat (struct device *dev,enum iommu_dev_features feat) +static int intel_iommu_enable_iopf (struct device *dev) {struct device_domain_info *info =get_domain_info (dev); -if (feat ==IOMMU_DEV_FEAT_AUX ) { -int ret; - -if (!dev_is_pci (dev) || dmar_disabled || - !scalable_mode_support () || !pasid_mode_support ()) -return false; - - ret =pci_pasid_features (to_pci_dev (dev)); -if (ret <0 ) -return false; - -return !!siov_find_pci_dvsec (to_pci_dev (dev)); - } - -if (feat ==IOMMU_DEV_FEAT_IOPF ) -return info && info->pri_supported; - -if (feat ==IOMMU_DEV_FEAT_SVA ) -return info && (info->iommu->flags &VTD_FLAG_SVM_CAPABLE ) && - info->pasid_supported && info->pri_supported && - info->ats_supported; +if (info && info->pri_supported) +return 0 ; -return false; +return -ENODEV ; } static int
@@ -5582,7 +5534,7 @@ intel_iommu_dev_enable_feat(struct device *dev, enum iommu_dev_features feat)return intel_iommu_enable_auxd (dev);case IOMMU_DEV_FEAT_IOPF : -return intel_iommu_dev_has_feat (dev, feat) ?0 : -ENODEV ; +return intel_iommu_enable_iopf (dev);case IOMMU_DEV_FEAT_SVA :return intel_iommu_enable_sva (dev);
@@ -5708,7 +5660,6 @@ const struct iommu_ops intel_iommu_ops = { .get_resv_regions = intel_iommu_get_resv_regions, .put_resv_regions = generic_iommu_put_resv_regions, .device_group = intel_iommu_device_group, - .dev_has_feat = intel_iommu_dev_has_feat, .dev_feat_enabled = intel_iommu_dev_feat_enabled, .dev_enable_feat = intel_iommu_dev_enable_feat, .dev_disable_feat = intel_iommu_dev_disable_feat,
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu