This patch simply adds support for PCI devices. Signed-off-by: Nicolin Chen <nicoleotsuka@xxxxxxxxx> --- drivers/iommu/tegra-smmu.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index 97a7185b4578..9dbc5d7183cc 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -15,6 +15,7 @@ #include <linux/spinlock.h> #include <linux/dma-iommu.h> #include <linux/dma-mapping.h> +#include <linux/pci.h> #include <soc/tegra/ahb.h> #include <soc/tegra/mc.h> @@ -935,6 +936,7 @@ static struct iommu_group *tegra_smmu_device_group(struct device *dev) const struct tegra_smmu_group_soc *soc; struct tegra_smmu_group *group; int swgroup = fwspec->ids[0]; + bool pci = dev_is_pci(dev); struct iommu_group *grp; /* Find group_soc associating with swgroup */ @@ -961,7 +963,7 @@ static struct iommu_group *tegra_smmu_device_group(struct device *dev) group->smmu = smmu; group->soc = soc; - group->group = iommu_group_alloc(); + group->group = pci ? pci_device_group(dev) : iommu_group_alloc(); if (IS_ERR(group->group)) { devm_kfree(smmu->dev, group); mutex_unlock(&smmu->lock); @@ -1180,6 +1182,19 @@ struct tegra_smmu *tegra_smmu_probe(struct device *dev, return ERR_PTR(err); } +#ifdef CONFIG_PCI + if (!iommu_present(&pci_bus_type)) { + pci_request_acs(); + err = bus_set_iommu(&pci_bus_type, &tegra_smmu_ops); + if (err < 0) { + bus_set_iommu(&platform_bus_type, NULL); + iommu_device_unregister(&smmu->iommu); + iommu_device_sysfs_remove(&smmu->iommu); + return ERR_PTR(err); + } + } +#endif + if (IS_ENABLED(CONFIG_DEBUG_FS)) tegra_smmu_debugfs_init(smmu); -- 2.17.1