From: Dmitry Osipenko <digetx@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Joerg Roedel <joro@8bytes.org>
Cc: Robin Murphy <robin.murphy@arm.com>,
iommu@lists.linux-foundation.org, devicetree@vger.kernel.org,
linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v6 17/21] iommu/tegra: gart: Don't use managed resources
Date: Sun, 9 Dec 2018 23:29:46 +0300 [thread overview]
Message-ID: <20181209202950.31486-18-digetx@gmail.com> (raw)
In-Reply-To: <20181209202950.31486-1-digetx@gmail.com>
GART is a part of the Memory Controller driver that is always built-in,
hence there is no benefit from the use of managed resources.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Acked-by: Thierry Reding <treding@nvidia.com>
---
drivers/iommu/tegra-gart.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/iommu/tegra-gart.c b/drivers/iommu/tegra-gart.c
index 1be595d15e7e..99afdbf8860c 100644
--- a/drivers/iommu/tegra-gart.c
+++ b/drivers/iommu/tegra-gart.c
@@ -173,7 +173,7 @@ static int gart_iommu_attach_dev(struct iommu_domain *domain,
struct gart_client *client, *c;
int err = 0;
- client = devm_kzalloc(gart->dev, sizeof(*c), GFP_KERNEL);
+ client = kzalloc(sizeof(*c), GFP_KERNEL);
if (!client)
return -ENOMEM;
client->dev = dev;
@@ -199,7 +199,7 @@ static int gart_iommu_attach_dev(struct iommu_domain *domain,
return 0;
fail:
- devm_kfree(gart->dev, client);
+ kfree(client);
spin_unlock(&gart->client_lock);
return err;
}
@@ -214,7 +214,7 @@ static void __gart_iommu_detach_dev(struct iommu_domain *domain,
list_for_each_entry(c, &gart->client, list) {
if (c->dev == dev) {
list_del(&c->list);
- devm_kfree(gart->dev, c);
+ kfree(c);
if (list_empty(&gart->client))
gart->active_domain = NULL;
dev_dbg(gart->dev, "Detached %s\n", dev_name(dev));
@@ -461,7 +461,7 @@ struct gart_device *tegra_gart_probe(struct device *dev,
return ERR_PTR(-ENXIO);
}
- gart = devm_kzalloc(dev, sizeof(*gart), GFP_KERNEL);
+ gart = kzalloc(sizeof(*gart), GFP_KERNEL);
if (!gart) {
dev_err(dev, "failed to allocate gart_device\n");
return ERR_PTR(-ENOMEM);
@@ -470,7 +470,7 @@ struct gart_device *tegra_gart_probe(struct device *dev,
ret = iommu_device_sysfs_add(&gart->iommu, dev, NULL, "gart");
if (ret) {
dev_err(dev, "Failed to register IOMMU in sysfs\n");
- return ERR_PTR(ret);
+ goto free_gart;
}
iommu_device_set_ops(&gart->iommu, &gart_iommu_ops);
@@ -508,6 +508,8 @@ struct gart_device *tegra_gart_probe(struct device *dev,
iommu_device_unregister(&gart->iommu);
remove_sysfs:
iommu_device_sysfs_remove(&gart->iommu);
+free_gart:
+ kfree(gart);
return ERR_PTR(ret);
}
--
2.19.1
next prev parent reply other threads:[~2018-12-09 20:31 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-09 20:29 [PATCH v6 00/21] IOMMU: Tegra GART driver clean up and optimization Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 01/21] iommu/tegra: gart: Remove pr_fmt and clean up includes Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 02/21] iommu/tegra: gart: Clean up driver probe errors handling Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 03/21] iommu/tegra: gart: Ignore devices without IOMMU phandle in DT Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 04/21] iommu: Introduce iotlb_sync_map callback Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 05/21] iommu/tegra: gart: Optimize mapping / unmapping performance Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 06/21] dt-bindings: memory: tegra: Squash tegra20-gart into tegra20-mc Dmitry Osipenko
2018-12-12 10:02 ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 07/21] ARM: dts: tegra20: Update Memory Controller node to the new binding Dmitry Osipenko
2018-12-12 10:02 ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 08/21] memory: tegra: Don't invoke Tegra30+ specific memory timing setup on Tegra20 Dmitry Osipenko
2018-12-12 10:02 ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 09/21] memory: tegra: Adapt to Tegra20 device-tree binding changes Dmitry Osipenko
2018-12-12 10:05 ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 10/21] memory: tegra: Read client ID on GART page fault Dmitry Osipenko
2018-12-12 10:05 ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 11/21] memory: tegra: Use of_device_get_match_data() Dmitry Osipenko
2018-12-12 10:05 ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 12/21] memory: tegra: Use relaxed versions of readl/writel Dmitry Osipenko
2018-12-12 10:05 ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 13/21] iommu/tegra: gart: Integrate with Memory Controller driver Dmitry Osipenko
2018-12-12 10:14 ` Thierry Reding
2018-12-12 13:52 ` Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 14/21] iommu/tegra: gart: Fix spinlock recursion Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 15/21] iommu/tegra: gart: Fix NULL pointer dereference Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 16/21] iommu/tegra: gart: Allow only one active domain at a time Dmitry Osipenko
2018-12-09 20:29 ` Dmitry Osipenko [this message]
2018-12-09 20:29 ` [PATCH v6 18/21] iommu/tegra: gart: Prepend error/debug messages with "gart:" Dmitry Osipenko
2018-12-12 10:20 ` Thierry Reding
2018-12-09 20:29 ` [PATCH v6 19/21] iommu/tegra: gart: Don't detach devices from inactive domains Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 20/21] iommu/tegra: gart: Simplify clients-tracking code Dmitry Osipenko
2018-12-09 20:29 ` [PATCH v6 21/21] iommu/tegra: gart: Perform code refactoring Dmitry Osipenko
2018-12-12 10:20 ` Thierry Reding
2018-12-11 9:53 ` [PATCH v6 00/21] IOMMU: Tegra GART driver clean up and optimization Joerg Roedel
2018-12-11 13:22 ` Dmitry Osipenko
2018-12-12 10:24 ` Thierry Reding
2018-12-12 10:43 ` Joerg Roedel
2018-12-12 12:49 ` Dmitry Osipenko
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=20181209202950.31486-18-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=devicetree@vger.kernel.org \
--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=robin.murphy@arm.com \
--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).