[PATCH 19/27] iommu/arm-smmu-v3: Keep track of arm_smmu_master_domain for SVA
Jason Gunthorpe
jgg at nvidia.com
Wed Oct 11 16:25:55 PDT 2023
Currently the smmu_domain->devices list is unused for SVA domains.
Fill it in with the SSID and master of every arm_smmu_set_pasid()
using the same logic as the RID attach.
Signed-off-by: Jason Gunthorpe <jgg at nvidia.com>
---
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index 08eac534cffd36..540666986a0a39 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -2724,6 +2724,8 @@ int arm_smmu_set_pasid(struct arm_smmu_master *master,
struct arm_smmu_domain *old_smmu_domain =
to_smmu_domain_safe(iommu_get_domain_for_dev(master->dev));
struct arm_smmu_cd *cdptr;
+ struct attach_state state;
+ int ret;
if (!old_smmu_domain || old_smmu_domain->stage != ARM_SMMU_DOMAIN_S1)
return -ENODEV;
@@ -2731,14 +2733,32 @@ int arm_smmu_set_pasid(struct arm_smmu_master *master,
cdptr = arm_smmu_get_cd_ptr(master, id);
if (!cdptr)
return -ENOMEM;
+
+ mutex_lock(&arm_smmu_asid_lock);
+ ret = arm_smmu_attach_prepare(master, smmu_domain, id, &state);
+ if (ret)
+ goto out_unlock;
+
arm_smmu_write_cd_entry(master, id, cdptr, cd);
+
+ arm_smmu_attach_commit(
+ master,
+ to_smmu_domain_safe(
+ iommu_get_domain_for_dev_pasid(master->dev, id, 0)),
+ smmu_domain, id, &state);
+
+out_unlock:
+ mutex_unlock(&arm_smmu_asid_lock);
return 0;
}
void arm_smmu_remove_pasid(struct arm_smmu_master *master,
struct arm_smmu_domain *smmu_domain, ioasid_t id)
{
+ mutex_lock(&arm_smmu_asid_lock);
+ arm_smmu_attach_remove(master, smmu_domain, id);
arm_smmu_clear_cd(master, id);
+ mutex_unlock(&arm_smmu_asid_lock);
}
static int arm_smmu_attach_dev_ste(struct device *dev,
--
2.42.0
More information about the linux-arm-kernel
mailing list