提交 07b9a872 编写于 作者: J Jean-Philippe Brucker 提交者: Xie XiuQi

iommu/arm-smmu-v3: Add support for PCI PASID

hulk inclusion
category: feature
bugzilla: 14369
CVE: NA
-------------------

Enable PASID for PCI devices that support it. Unlike PRI, we can't enable
PASID lazily in iommu_sva_device_init(), because it has to be enabled
before ATS, and because we have to allocate substream tables early.
Signed-off-by: NJean-Philippe Brucker <jean-philippe.brucker@arm.com>
Signed-off-by: NFang Lijun <fanglijun3@huawei.com>
Reviewed-by: NHanjun Guo <guohanjun@huawei.com>
Reviewed-by: NZhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 4d6240a9
......@@ -2697,6 +2697,53 @@ static bool arm_smmu_sid_in_range(struct arm_smmu_device *smmu, u32 sid)
return sid < limit;
}
static int arm_smmu_enable_pasid(struct arm_smmu_master_data *master)
{
int ret;
int features;
u8 pasid_bits;
int num_pasids;
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_pasids = pci_max_pasids(pdev);
if (num_pasids <= 0)
return -ENOSYS;
pasid_bits = min_t(u8, ilog2(num_pasids), master->smmu->ssid_bits);
dev_dbg(&pdev->dev, "device supports %#x PASID bits [%s%s]\n",
pasid_bits,
(features & PCI_PASID_CAP_EXEC) ? "x" : "",
(features & PCI_PASID_CAP_PRIV) ? "p" : "");
ret = pci_enable_pasid(pdev, features);
return ret ? ret : pasid_bits;
}
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_enable_ats(struct arm_smmu_master_data *master)
{
size_t stu;
......@@ -2867,6 +2914,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->ssid_bits = ret;
arm_smmu_enable_ats(master);
ret = iommu_device_link(&smmu->iommu, dev);
......@@ -2895,6 +2947,7 @@ static int arm_smmu_add_device(struct device *dev)
err_disable_ats:
arm_smmu_disable_ats(master);
arm_smmu_disable_pasid(master);
err_free_master:
kfree(master);
......@@ -2924,7 +2977,9 @@ static void arm_smmu_remove_device(struct device *dev)
arm_smmu_remove_master(smmu, master);
iommu_device_unlink(&smmu->iommu, dev);
arm_smmu_disable_pri(master);
/* PASID must be disabled after ATS */
arm_smmu_disable_ats(master);
arm_smmu_disable_pasid(master);
kfree(master);
iommu_fwspec_free(dev);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册