From: Nicolin Chen <nicoleotsuka@gmail.com>
To: thierry.reding@gmail.com, joro@8bytes.org, krzk@kernel.org,
digetx@gmail.com
Cc: vdumpa@nvidia.com, jonathanh@nvidia.com,
linux-tegra@vger.kernel.org, iommu@lists.linux-foundation.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 3/3] iommu/tegra-smmu: Add PCI support
Date: Tue, 29 Sep 2020 17:30:13 -0700 [thread overview]
Message-ID: <20200930003013.31289-4-nicoleotsuka@gmail.com> (raw)
In-Reply-To: <20200930003013.31289-1-nicoleotsuka@gmail.com>
This patch simply adds support for PCI devices. Also reverses
bus_set_iommu in tegra_smmu_remove().
Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
---
Changelog
v1->v2
* Added error-out labels in tegra_smmu_probe()
* Dropped pci_request_acs() since IOMMU core would call it.
drivers/iommu/tegra-smmu.c | 33 ++++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index cf4981369828..74d84908679e 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -10,6 +10,7 @@
#include <linux/kernel.h>
#include <linux/of.h>
#include <linux/of_device.h>
+#include <linux/pci.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
@@ -856,6 +857,7 @@ static struct iommu_group *tegra_smmu_device_group(struct device *dev)
const struct tegra_smmu_group_soc *soc;
unsigned int swgroup = fwspec->ids[0];
struct tegra_smmu_group *group;
+ bool pci = dev_is_pci(dev);
struct iommu_group *grp;
/* Find group_soc associating with swgroup */
@@ -882,7 +884,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);
@@ -1079,26 +1081,39 @@ struct tegra_smmu *tegra_smmu_probe(struct device *dev,
iommu_device_set_fwnode(&smmu->iommu, dev->fwnode);
err = iommu_device_register(&smmu->iommu);
- if (err) {
- iommu_device_sysfs_remove(&smmu->iommu);
- return ERR_PTR(err);
- }
+ if (err)
+ goto err_sysfs;
err = bus_set_iommu(&platform_bus_type, &tegra_smmu_ops);
- if (err < 0) {
- iommu_device_unregister(&smmu->iommu);
- iommu_device_sysfs_remove(&smmu->iommu);
- return ERR_PTR(err);
+ if (err < 0)
+ goto err_unregister;
+
+#ifdef CONFIG_PCI
+ if (!iommu_present(&pci_bus_type)) {
+ err = bus_set_iommu(&pci_bus_type, &tegra_smmu_ops);
+ if (err < 0)
+ goto err_bus_set;
}
+#endif
if (IS_ENABLED(CONFIG_DEBUG_FS))
tegra_smmu_debugfs_init(smmu);
return smmu;
+
+err_bus_set:
+ bus_set_iommu(&platform_bus_type, NULL);
+err_unregister:
+ iommu_device_unregister(&smmu->iommu);
+err_sysfs:
+ iommu_device_sysfs_remove(&smmu->iommu);
+
+ return ERR_PTR(err);
}
void tegra_smmu_remove(struct tegra_smmu *smmu)
{
+ bus_set_iommu(&platform_bus_type, NULL);
iommu_device_unregister(&smmu->iommu);
iommu_device_sysfs_remove(&smmu->iommu);
--
2.17.1
next prev parent reply other threads:[~2020-09-30 0:35 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-30 0:30 [PATCH v2 0/3] iommu/tegra-smmu: Add PCI support Nicolin Chen
2020-09-30 0:30 ` [PATCH v2 1/3] memory: tegra: Add helper function tegra_get_memory_controller Nicolin Chen
2020-09-30 5:12 ` Dmitry Osipenko
2020-09-30 5:44 ` Nicolin Chen
2020-09-30 6:32 ` Dmitry Osipenko
2020-09-30 6:38 ` Nicolin Chen
2020-09-30 7:31 ` Dmitry Osipenko
2020-09-30 7:21 ` Krzysztof Kozlowski
2020-09-30 7:25 ` Nicolin Chen
2020-09-30 7:50 ` Krzysztof Kozlowski
2020-09-30 0:30 ` [PATCH v2 2/3] iommu/tegra-smmu: Rework .probe_device and .attach_dev Nicolin Chen
2020-09-30 5:10 ` Dmitry Osipenko
2020-09-30 5:20 ` Dmitry Osipenko
2020-09-30 5:50 ` Nicolin Chen
2020-09-30 6:34 ` Nicolin Chen
2020-09-30 5:11 ` Dmitry Osipenko
2020-09-30 5:49 ` Nicolin Chen
2020-09-30 6:10 ` Dmitry Osipenko
2020-09-30 6:13 ` Nicolin Chen
2020-09-30 6:33 ` Dmitry Osipenko
2020-09-30 5:24 ` Dmitry Osipenko
2020-09-30 5:39 ` Nicolin Chen
2020-09-30 5:48 ` Dmitry Osipenko
2020-09-30 5:39 ` Dmitry Osipenko
2020-09-30 5:41 ` Nicolin Chen
2020-09-30 5:59 ` Dmitry Osipenko
2020-09-30 6:19 ` Nicolin Chen
2020-09-30 0:30 ` Nicolin Chen [this message]
2020-09-30 5:10 ` [PATCH v2 3/3] iommu/tegra-smmu: Add PCI support Dmitry Osipenko
2020-09-30 5:28 ` Nicolin Chen
2020-09-30 5:10 ` Dmitry Osipenko
2020-09-30 5:29 ` Nicolin Chen
2020-09-30 5:58 ` Dmitry Osipenko
2020-09-30 7:16 ` Nicolin Chen
2020-09-30 5:10 ` Dmitry Osipenko
2020-09-30 5:34 ` Nicolin Chen
2020-09-30 6:01 ` Dmitry Osipenko
2020-09-30 7:12 ` Nicolin Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200930003013.31289-4-nicoleotsuka@gmail.com \
--to=nicoleotsuka@gmail.com \
--cc=digetx@gmail.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jonathanh@nvidia.com \
--cc=joro@8bytes.org \
--cc=krzk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=thierry.reding@gmail.com \
--cc=vdumpa@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox