@@ -3012,6 +3012,50 @@ static void arm_smmu_disable_pri(struct arm_smmu_master_data *master)
master->can_fault = false;
}
+static int arm_smmu_enable_pasid(struct arm_smmu_master_data *master)
+{
+ int ret;
+ int features;
+ int num_ssids;
+ struct pci_dev *pdev;
+
+ if (!dev_is_pci(master->dev))
+ return -ENOSYS;
+
+ pdev = to_pci_dev(master->dev);
+
+ features = pci_pasid_features(pdev);
+ if (features < 0)
+ return -ENOSYS;
+
+ num_ssids = pci_max_pasids(pdev);
+
+ dev_dbg(&pdev->dev, "device supports %#x SSIDs [%s%s]\n", num_ssids,
+ (features & PCI_PASID_CAP_EXEC) ? "x" : "",
+ (features & PCI_PASID_CAP_PRIV) ? "p" : "");
+
+ num_ssids = clamp_val(num_ssids, 1, 1 << master->smmu->ssid_bits);
+ num_ssids = rounddown_pow_of_two(num_ssids);
+
+ ret = pci_enable_pasid(pdev, features);
+ return ret ? ret : num_ssids;
+}
+
+static void arm_smmu_disable_pasid(struct arm_smmu_master_data *master)
+{
+ struct pci_dev *pdev;
+
+ if (!dev_is_pci(master->dev))
+ return;
+
+ pdev = to_pci_dev(master->dev);
+
+ if (!pdev->pasid_enabled)
+ return;
+
+ pci_disable_pasid(pdev);
+}
+
static int arm_smmu_insert_master(struct arm_smmu_device *smmu,
struct arm_smmu_master_data *master)
{
@@ -3134,6 +3178,11 @@ static int arm_smmu_add_device(struct device *dev)
master->ste.can_stall = true;
}
+ /* PASID must be enabled before ATS */
+ ret = arm_smmu_enable_pasid(master);
+ if (ret > 0)
+ master->num_ssids = ret;
+
if (!arm_smmu_enable_ats(master))
arm_smmu_enable_pri(master);
@@ -3152,6 +3201,7 @@ static int arm_smmu_add_device(struct device *dev)
err_disable_pri:
arm_smmu_disable_pri(master);
arm_smmu_disable_ats(master);
+ arm_smmu_disable_pasid(master);
return ret;
}
@@ -3172,7 +3222,9 @@ static void arm_smmu_remove_device(struct device *dev)
arm_smmu_remove_master(smmu, master);
arm_smmu_disable_pri(master);
+ /* PASID must be disabled after ATS */
arm_smmu_disable_ats(master);
+ arm_smmu_disable_pasid(master);
iommu_group_remove_device(dev);
iommu_device_unlink(&smmu->iommu, dev);
Enable PASID for PCI devices that support it. Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com> --- drivers/iommu/arm-smmu-v3.c | 52 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)