iommu/tegra-smmu: Allow to group clients in same swgroup

There can be clients using the same swgroup in DT, for example i2c0
and i2c1. The current driver will add them to separate IOMMU groups,
though it has implemented device_group() callback which is to group
devices using different swgroups like DC and DCB.

All clients having the same swgroup should be also added to the same
IOMMU group so as to share an asid. Otherwise, the asid register may
get overwritten every time a new device is attached.

Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20200911071643.17212-4-nicoleotsuka@gmail.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index e6d1424..0becdbf 100644 (file)
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -23,6 +23,7 @@ struct tegra_smmu_group {
        struct tegra_smmu *smmu;
        const struct tegra_smmu_group_soc *soc;
        struct iommu_group *group;
+       unsigned int swgroup;
 };
 
 struct tegra_smmu {
@@ -909,14 +910,14 @@ static struct iommu_group *tegra_smmu_group_get(struct tegra_smmu *smmu,
        struct tegra_smmu_group *group;
        struct iommu_group *grp;
 
+       /* Find group_soc associating with swgroup */
        soc = tegra_smmu_find_group(smmu, swgroup);
-       if (!soc)
-               return NULL;
 
        mutex_lock(&smmu->lock);
 
+       /* Find existing iommu_group associating with swgroup or group_soc */
        list_for_each_entry(group, &smmu->groups, list)
-               if (group->soc == soc) {
+               if ((group->swgroup == swgroup) || (soc && group->soc == soc)) {
                        grp = iommu_group_ref_get(group->group);
                        mutex_unlock(&smmu->lock);
                        return grp;
@@ -929,6 +930,7 @@ static struct iommu_group *tegra_smmu_group_get(struct tegra_smmu *smmu,
        }
 
        INIT_LIST_HEAD(&group->list);
+       group->swgroup = swgroup;
        group->smmu = smmu;
        group->soc = soc;
 
@@ -940,7 +942,8 @@ static struct iommu_group *tegra_smmu_group_get(struct tegra_smmu *smmu,
        }
 
        iommu_group_set_iommudata(group->group, group, tegra_smmu_group_release);
-       iommu_group_set_name(group->group, soc->name);
+       if (soc)
+               iommu_group_set_name(group->group, soc->name);
        list_add_tail(&group->list, &smmu->groups);
        mutex_unlock(&smmu->lock);