From: Nicolin Chen <nicoleotsuka@gmail.com>
To: thierry.reding@gmail.com, joro@8bytes.org, digetx@gmail.com
Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org,
iommu@lists.linux-foundation.org, jonathanh@nvidia.com
Subject: [PATCH v4 1/3] iommu/tegra-smmu: Use fwspec in tegra_smmu_(de)attach_dev
Date: Thu, 1 Oct 2020 23:08:05 -0700 [thread overview]
Message-ID: <20201002060807.32138-2-nicoleotsuka@gmail.com> (raw)
In-Reply-To: <20201002060807.32138-1-nicoleotsuka@gmail.com>
In tegra_smmu_(de)attach_dev() functions, we poll DTB for each
client's iommus property to get swgroup ID in order to prepare
"as" and enable smmu. Actually tegra_smmu_configure() prepared
an fwspec for each client, and added to the fwspec all swgroup
IDs of client DT node in DTB.
So this patch uses fwspec in tegra_smmu_(de)attach_dev() so as
to replace the redundant DT polling code.
Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
---
Changelog
v3->v4:
* Seperated the change, as a cleanup, from the rework patch
v1->v3:
* N/A
drivers/iommu/tegra-smmu.c | 50 +++++++++++++++-----------------------
1 file changed, 20 insertions(+), 30 deletions(-)
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index 6a3ecc334481..a573a5151c69 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -484,60 +484,50 @@ static void tegra_smmu_as_unprepare(struct tegra_smmu *smmu,
static int tegra_smmu_attach_dev(struct iommu_domain *domain,
struct device *dev)
{
+ struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct tegra_smmu *smmu = dev_iommu_priv_get(dev);
struct tegra_smmu_as *as = to_smmu_as(domain);
- struct device_node *np = dev->of_node;
- struct of_phandle_args args;
unsigned int index = 0;
int err = 0;
- while (!of_parse_phandle_with_args(np, "iommus", "#iommu-cells", index,
- &args)) {
- unsigned int swgroup = args.args[0];
-
- if (args.np != smmu->dev->of_node) {
- of_node_put(args.np);
- continue;
- }
-
- of_node_put(args.np);
+ if (!fwspec)
+ return -ENOENT;
+ for (index = 0; index < fwspec->num_ids; index++) {
err = tegra_smmu_as_prepare(smmu, as);
- if (err < 0)
- return err;
+ if (err)
+ goto disable;
- tegra_smmu_enable(smmu, swgroup, as->id);
- index++;
+ tegra_smmu_enable(smmu, fwspec->ids[index], as->id);
}
if (index == 0)
return -ENODEV;
return 0;
+
+disable:
+ while (index--) {
+ tegra_smmu_disable(smmu, fwspec->ids[index], as->id);
+ tegra_smmu_as_unprepare(smmu, as);
+ }
+
+ return err;
}
static void tegra_smmu_detach_dev(struct iommu_domain *domain, struct device *dev)
{
+ struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
struct tegra_smmu_as *as = to_smmu_as(domain);
- struct device_node *np = dev->of_node;
struct tegra_smmu *smmu = as->smmu;
- struct of_phandle_args args;
unsigned int index = 0;
- while (!of_parse_phandle_with_args(np, "iommus", "#iommu-cells", index,
- &args)) {
- unsigned int swgroup = args.args[0];
-
- if (args.np != smmu->dev->of_node) {
- of_node_put(args.np);
- continue;
- }
-
- of_node_put(args.np);
+ if (!fwspec)
+ return;
- tegra_smmu_disable(smmu, swgroup, as->id);
+ for (index = 0; index < fwspec->num_ids; index++) {
+ tegra_smmu_disable(smmu, fwspec->ids[index], as->id);
tegra_smmu_as_unprepare(smmu, as);
- index++;
}
}
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-10-02 6:15 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-02 6:08 [PATCH v4 0/3] iommu/tegra-smmu: Add PCI support Nicolin Chen
2020-10-02 6:08 ` Nicolin Chen [this message]
2020-10-02 14:22 ` [PATCH v4 1/3] iommu/tegra-smmu: Use fwspec in tegra_smmu_(de)attach_dev Dmitry Osipenko
2020-10-02 14:52 ` Dmitry Osipenko
2020-10-02 19:56 ` Nicolin Chen
2020-10-02 14:26 ` Dmitry Osipenko
2020-10-02 14:41 ` Dmitry Osipenko
2020-10-02 19:45 ` Nicolin Chen
2020-10-02 20:12 ` Dmitry Osipenko
2020-10-02 23:53 ` Nicolin Chen
2020-10-03 4:01 ` Dmitry Osipenko
2020-10-02 6:08 ` [PATCH v4 2/3] iommu/tegra-smmu: Rework tegra_smmu_probe_device() Nicolin Chen
2020-10-02 14:22 ` Dmitry Osipenko
2020-10-02 14:58 ` Dmitry Osipenko
2020-10-02 19:53 ` Nicolin Chen
2020-10-05 9:47 ` Thierry Reding
2020-10-02 14:22 ` Dmitry Osipenko
2020-10-02 14:50 ` Dmitry Osipenko
2020-10-05 9:53 ` Thierry Reding
2020-10-05 10:36 ` Dmitry Osipenko
2020-10-05 11:15 ` Thierry Reding
2020-10-05 13:28 ` Dmitry Osipenko
2020-10-05 14:22 ` Thierry Reding
2020-10-05 9:51 ` Thierry Reding
2020-10-02 14:23 ` Dmitry Osipenko
2020-10-02 18:01 ` Nicolin Chen
2020-10-02 18:20 ` Dmitry Osipenko
2020-10-02 15:02 ` Dmitry Osipenko
2020-10-02 18:58 ` Nicolin Chen
2020-10-05 9:57 ` Thierry Reding
2020-10-06 1:05 ` Nicolin Chen
2020-10-08 9:53 ` Thierry Reding
2020-10-08 21:12 ` Nicolin Chen
2020-10-09 12:25 ` Thierry Reding
2020-10-09 15:54 ` Nicolin Chen
2020-10-02 15:23 ` Dmitry Osipenko
2020-10-02 16:00 ` Dmitry Osipenko
2020-10-02 16:37 ` Dmitry Osipenko
2020-10-02 16:50 ` Dmitry Osipenko
2020-10-02 6:08 ` [PATCH v4 3/3] iommu/tegra-smmu: Add PCI support Nicolin Chen
2020-10-02 14:35 ` Dmitry Osipenko
2020-10-02 17:45 ` Nicolin Chen
2020-10-02 18:04 ` Dmitry Osipenko
2020-10-02 18:04 ` Dmitry Osipenko
2020-10-05 10:04 ` Thierry Reding
2020-10-06 0:54 ` 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=20201002060807.32138-2-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=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=thierry.reding@gmail.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;
as well as URLs for NNTP newsgroup(s).