leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iommu/tegra: Add support for struct iommu_device

Browse Source 
Add a struct iommu_device to each tegra-smmu and register it
with the iommu-core. Also link devices added to the driver
to their respective hardware iommus.

Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Joerg Roedel 2017-08-09 17:41:52 +02:00
parent fa94cf84af
commit 0b480e4470
1 changed files with 25 additions and 0 deletions

25
drivers/iommu/tegra-smmu.c
View File

@ -36,6 +36,8 @@ struct tegra_smmu {
struct list_head list; struct list_head list;
struct dentry *debugfs; struct dentry *debugfs;
struct iommu_device iommu; /* IOMMU Core code handle */
}; };
struct tegra_smmu_as { struct tegra_smmu_as {
@ -720,6 +722,9 @@ static int tegra_smmu_add_device(struct device *dev)
* first match. * first match.
*/ */
dev->archdata.iommu = smmu; dev->archdata.iommu = smmu;
iommu_device_link(&smmu->iommu, dev);
break; break;
} }
@ -737,6 +742,11 @@ static int tegra_smmu_add_device(struct device *dev)
static void tegra_smmu_remove_device(struct device *dev) static void tegra_smmu_remove_device(struct device *dev)
{ {
struct tegra_smmu *smmu = dev->archdata.iommu;
if (smmu)
iommu_device_unlink(&smmu->iommu, dev);
dev->archdata.iommu = NULL; dev->archdata.iommu = NULL;
iommu_group_remove_device(dev); iommu_group_remove_device(dev);
} }
@ -943,6 +953,18 @@ struct tegra_smmu *tegra_smmu_probe(struct device *dev,
if (err < 0) if (err < 0)
return ERR_PTR(err); return ERR_PTR(err);
err = iommu_device_sysfs_add(&smmu->iommu, dev, NULL, dev_name(dev));
if (err)
return ERR_PTR(err);
iommu_device_set_ops(&smmu->iommu, &tegra_smmu_ops);
err = iommu_device_register(&smmu->iommu);
if (err) {
iommu_device_sysfs_remove(&smmu->iommu);
return ERR_PTR(err);
}
if (IS_ENABLED(CONFIG_DEBUG_FS)) if (IS_ENABLED(CONFIG_DEBUG_FS))
tegra_smmu_debugfs_init(smmu); tegra_smmu_debugfs_init(smmu);
@ -951,6 +973,9 @@ struct tegra_smmu *tegra_smmu_probe(struct device *dev,
void tegra_smmu_remove(struct tegra_smmu *smmu) void tegra_smmu_remove(struct tegra_smmu *smmu)
{ {
iommu_device_unregister(&smmu->iommu);
iommu_device_sysfs_remove(&smmu->iommu);
if (IS_ENABLED(CONFIG_DEBUG_FS)) if (IS_ENABLED(CONFIG_DEBUG_FS))
tegra_smmu_debugfs_exit(smmu); tegra_smmu_debugfs_exit(smmu);
} }