iommu/vt-d: Move PCI PASID enablement to probe path

Currently, PCI PASID is enabled alongside PCI ATS when an iommu domain is
attached to the device and disabled when the device transitions to block
translation mode. This approach is inappropriate as PCI PASID is a device
feature independent of the type of the attached domain.

Enable PCI PASID during the IOMMU device probe and disables it during the
release path.

Suggested-by: Yi Liu <yi.l.liu@intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Yi Liu <yi.l.liu@intel.com>
Tested-by: Yi Liu <yi.l.liu@intel.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20240819051805.116936-1-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 159da629349c4b0491ad15d29eb47cf4c82a8327..10468c871fe016c3f7f906d920e507c9ab3d27a3 100644 (file)
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -1281,15 +1281,6 @@ static void iommu_enable_pci_caps(struct device_domain_info *info)
                return;
 
        pdev = to_pci_dev(info->dev);
-
-       /* The PCIe spec, in its wisdom, declares that the behaviour of
-          the device if you enable PASID support after ATS support is
-          undefined. So always enable PASID support on devices which
-          have it, even if we can't yet know if we're ever going to
-          use it. */
-       if (info->pasid_supported && !pci_enable_pasid(pdev, info->pasid_supported & ~1))
-               info->pasid_enabled = 1;
-
        if (info->ats_supported && pci_ats_page_aligned(pdev) &&
            !pci_enable_ats(pdev, VTD_PAGE_SHIFT))
                info->ats_enabled = 1;
@@ -1308,11 +1299,6 @@ static void iommu_disable_pci_caps(struct device_domain_info *info)
                pci_disable_ats(pdev);
                info->ats_enabled = 0;
        }
-
-       if (info->pasid_enabled) {
-               pci_disable_pasid(pdev);
-               info->pasid_enabled = 0;
-       }
 }
 
 static void intel_flush_iotlb_all(struct iommu_domain *domain)
@@ -3940,6 +3926,16 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev)
 
        intel_iommu_debugfs_create_dev(info);
 
+       /*
+        * The PCIe spec, in its wisdom, declares that the behaviour of the
+        * device is undefined if you enable PASID support after ATS support.
+        * So always enable PASID support on devices which have it, even if
+        * we can't yet know if we're ever going to use it.
+        */
+       if (info->pasid_supported &&
+           !pci_enable_pasid(pdev, info->pasid_supported & ~1))
+               info->pasid_enabled = 1;
+
        return &iommu->iommu;
 free_table:
        intel_pasid_free_table(dev);
@@ -3956,6 +3952,11 @@ static void intel_iommu_release_device(struct device *dev)
        struct device_domain_info *info = dev_iommu_priv_get(dev);
        struct intel_iommu *iommu = info->iommu;
 
+       if (info->pasid_enabled) {
+               pci_disable_pasid(to_pci_dev(dev));
+               info->pasid_enabled = 0;
+       }
+
        mutex_lock(&iommu->iopf_lock);
        if (dev_is_pci(dev) && pci_ats_supported(to_pci_dev(dev)))
                device_rbtree_remove(info);