All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Thierry Reding
	<thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
	Jonathan Hunter
	<jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>,
	Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>,
	Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>
Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH v4 03/20] iommu/tegra: gart: Ignore devices without IOMMU phandle in DT
Date: Mon, 24 Sep 2018 03:41:36 +0300	[thread overview]
Message-ID: <20180924004153.8232-4-digetx@gmail.com> (raw)
In-Reply-To: <20180924004153.8232-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

GART can't handle all devices, hence ignore devices that aren't related
to GART. IOMMU phandle must be explicitly assign to devices in the device
tree.

Signed-off-by: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 drivers/iommu/tegra-gart.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/tegra-gart.c b/drivers/iommu/tegra-gart.c
index e9524ed264cf..f6cf5cd5aaca 100644
--- a/drivers/iommu/tegra-gart.c
+++ b/drivers/iommu/tegra-gart.c
@@ -342,8 +342,12 @@ static bool gart_iommu_capable(enum iommu_cap cap)
 
 static int gart_iommu_add_device(struct device *dev)
 {
-	struct iommu_group *group = iommu_group_get_for_dev(dev);
+	struct iommu_group *group;
 
+	if (!dev->iommu_fwspec)
+		return -ENODEV;
+
+	group = iommu_group_get_for_dev(dev);
 	if (IS_ERR(group))
 		return PTR_ERR(group);
 
@@ -360,6 +364,12 @@ static void gart_iommu_remove_device(struct device *dev)
 	iommu_device_unlink(&gart_handle->iommu, dev);
 }
 
+static int gart_iommu_of_xlate(struct device *dev,
+			       struct of_phandle_args *args)
+{
+	return 0;
+}
+
 static const struct iommu_ops gart_iommu_ops = {
 	.capable	= gart_iommu_capable,
 	.domain_alloc	= gart_iommu_domain_alloc,
@@ -373,6 +383,7 @@ static const struct iommu_ops gart_iommu_ops = {
 	.unmap		= gart_iommu_unmap,
 	.iova_to_phys	= gart_iommu_iova_to_phys,
 	.pgsize_bitmap	= GART_IOMMU_PGSIZES,
+	.of_xlate	= gart_iommu_of_xlate,
 };
 
 static int tegra_gart_suspend(struct device *dev)
@@ -438,6 +449,7 @@ static int tegra_gart_probe(struct platform_device *pdev)
 	}
 
 	iommu_device_set_ops(&gart->iommu, &gart_iommu_ops);
+	iommu_device_set_fwnode(&gart->iommu, dev->fwnode);
 
 	ret = iommu_device_register(&gart->iommu);
 	if (ret) {
-- 
2.19.0

WARNING: multiple messages have this Message-ID (diff)
From: Dmitry Osipenko <digetx@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>,
	Jonathan Hunter <jonathanh@nvidia.com>,
	Joerg Roedel <joro@8bytes.org>, Rob Herring <robh+dt@kernel.org>,
	Robin Murphy <robin.murphy@arm.com>
Cc: iommu@lists.linux-foundation.org, devicetree@vger.kernel.org,
	linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v4 03/20] iommu/tegra: gart: Ignore devices without IOMMU phandle in DT
Date: Mon, 24 Sep 2018 03:41:36 +0300	[thread overview]
Message-ID: <20180924004153.8232-4-digetx@gmail.com> (raw)
In-Reply-To: <20180924004153.8232-1-digetx@gmail.com>

GART can't handle all devices, hence ignore devices that aren't related
to GART. IOMMU phandle must be explicitly assign to devices in the device
tree.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
 drivers/iommu/tegra-gart.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/tegra-gart.c b/drivers/iommu/tegra-gart.c
index e9524ed264cf..f6cf5cd5aaca 100644
--- a/drivers/iommu/tegra-gart.c
+++ b/drivers/iommu/tegra-gart.c
@@ -342,8 +342,12 @@ static bool gart_iommu_capable(enum iommu_cap cap)
 
 static int gart_iommu_add_device(struct device *dev)
 {
-	struct iommu_group *group = iommu_group_get_for_dev(dev);
+	struct iommu_group *group;
 
+	if (!dev->iommu_fwspec)
+		return -ENODEV;
+
+	group = iommu_group_get_for_dev(dev);
 	if (IS_ERR(group))
 		return PTR_ERR(group);
 
@@ -360,6 +364,12 @@ static void gart_iommu_remove_device(struct device *dev)
 	iommu_device_unlink(&gart_handle->iommu, dev);
 }
 
+static int gart_iommu_of_xlate(struct device *dev,
+			       struct of_phandle_args *args)
+{
+	return 0;
+}
+
 static const struct iommu_ops gart_iommu_ops = {
 	.capable	= gart_iommu_capable,
 	.domain_alloc	= gart_iommu_domain_alloc,
@@ -373,6 +383,7 @@ static const struct iommu_ops gart_iommu_ops = {
 	.unmap		= gart_iommu_unmap,
 	.iova_to_phys	= gart_iommu_iova_to_phys,
 	.pgsize_bitmap	= GART_IOMMU_PGSIZES,
+	.of_xlate	= gart_iommu_of_xlate,
 };
 
 static int tegra_gart_suspend(struct device *dev)
@@ -438,6 +449,7 @@ static int tegra_gart_probe(struct platform_device *pdev)
 	}
 
 	iommu_device_set_ops(&gart->iommu, &gart_iommu_ops);
+	iommu_device_set_fwnode(&gart->iommu, dev->fwnode);
 
 	ret = iommu_device_register(&gart->iommu);
 	if (ret) {
-- 
2.19.0


  parent reply	other threads:[~2018-09-24  0:41 UTC|newest]

Thread overview: 95+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-24  0:41 [PATCH v4 00/20] IOMMU: Tegra GART driver clean up and optimization Dmitry Osipenko
2018-09-24  0:41 ` Dmitry Osipenko
2018-09-24  0:41 ` [PATCH v4 07/20] ARM: dts: tegra20: Update Memory Controller node to the new binding Dmitry Osipenko
2018-09-24  0:41 ` [PATCH v4 13/20] iommu/tegra: gart: Fix spinlock recursion Dmitry Osipenko
2018-09-24 10:49   ` Thierry Reding
     [not found] ` <20180924004153.8232-1-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-24  0:41   ` [PATCH v4 01/20] iommu/tegra: gart: Remove pr_fmt and clean up includes Dmitry Osipenko
2018-09-24  0:41     ` Dmitry Osipenko
     [not found]     ` <20180924004153.8232-2-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-24 10:02       ` Thierry Reding
2018-09-24 10:02         ` Thierry Reding
2018-09-24  0:41   ` [PATCH v4 02/20] iommu/tegra: gart: Clean up driver probe errors handling Dmitry Osipenko
2018-09-24  0:41     ` Dmitry Osipenko
     [not found]     ` <20180924004153.8232-3-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-24 10:02       ` Thierry Reding
2018-09-24 10:02         ` Thierry Reding
2018-09-24  0:41   ` Dmitry Osipenko [this message]
2018-09-24  0:41     ` [PATCH v4 03/20] iommu/tegra: gart: Ignore devices without IOMMU phandle in DT Dmitry Osipenko
2018-09-24 10:05     ` Thierry Reding
2018-09-24 18:41       ` Dmitry Osipenko
2018-09-24 18:41         ` Dmitry Osipenko
2018-09-24  0:41   ` [PATCH v4 04/20] iommu: Introduce iotlb_sync_map callback Dmitry Osipenko
2018-09-24  0:41     ` Dmitry Osipenko
2018-09-24 10:06     ` Thierry Reding
2018-09-24  0:41   ` [PATCH v4 05/20] iommu/tegra: gart: Optimize mapping / unmapping performance Dmitry Osipenko
2018-09-24  0:41     ` Dmitry Osipenko
     [not found]     ` <20180924004153.8232-6-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-24 10:07       ` Thierry Reding
2018-09-24 10:07         ` Thierry Reding
2018-09-24  0:41   ` [PATCH v4 06/20] dt-bindings: memory: tegra: Squash tegra20-gart into tegra20-mc Dmitry Osipenko
2018-09-24  0:41     ` Dmitry Osipenko
     [not found]     ` <20180924004153.8232-7-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-24  9:55       ` Thierry Reding
2018-09-24  9:55         ` Thierry Reding
2018-09-27 18:41         ` Rob Herring
2018-09-27 18:41           ` Rob Herring
2018-09-27 18:41     ` Rob Herring
2018-09-24  0:41   ` [PATCH v4 08/20] memory: tegra: Don't invoke Tegra30+ specific memory timing setup on Tegra20 Dmitry Osipenko
2018-09-24  0:41     ` Dmitry Osipenko
2018-09-24  0:41   ` [PATCH v4 09/20] memory: tegra: Adapt to Tegra20 device-tree binding changes Dmitry Osipenko
2018-09-24  0:41     ` Dmitry Osipenko
     [not found]     ` <20180924004153.8232-10-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-24 10:02       ` Thierry Reding
2018-09-24 10:02         ` Thierry Reding
2018-09-24 13:22         ` Dmitry Osipenko
2018-09-25 12:16           ` Dmitry Osipenko
2018-09-24  0:41   ` [PATCH v4 10/20] memory: tegra: Read client ID on GART page fault Dmitry Osipenko
2018-09-24  0:41     ` Dmitry Osipenko
2018-09-24  0:41   ` [PATCH v4 11/20] memory: tegra: Use of_device_get_match_data() Dmitry Osipenko
2018-09-24  0:41     ` Dmitry Osipenko
2018-09-24 10:13     ` Thierry Reding
2018-09-24 18:39       ` Dmitry Osipenko
2018-09-24 18:39         ` Dmitry Osipenko
2018-09-25 10:00         ` Thierry Reding
2018-09-25 13:53           ` Dmitry Osipenko
2018-09-24  0:41   ` [PATCH v4 12/20] iommu/tegra: gart: Integrate with Memory Controller driver Dmitry Osipenko
2018-09-24  0:41     ` Dmitry Osipenko
     [not found]     ` <20180924004153.8232-13-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-24 10:23       ` Thierry Reding
2018-09-24 10:23         ` Thierry Reding
2018-09-24 18:22         ` Dmitry Osipenko
2018-09-25 10:02           ` Thierry Reding
2018-09-24  0:41   ` [PATCH v4 14/20] iommu/tegra: gart: Fix NULL pointer dereference Dmitry Osipenko
2018-09-24  0:41     ` Dmitry Osipenko
2018-09-24 10:49     ` Thierry Reding
2018-09-24  0:41   ` [PATCH v4 16/20] iommu/tegra: gart: Don't use managed resources Dmitry Osipenko
2018-09-24  0:41     ` Dmitry Osipenko
2018-09-24 10:52     ` Thierry Reding
2018-09-24 18:57       ` Dmitry Osipenko
2018-09-24 18:57         ` Dmitry Osipenko
     [not found]         ` <a9e2943b-1139-8838-5440-bd6cf55e9a55-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-25 10:03           ` Thierry Reding
2018-09-25 10:03             ` Thierry Reding
2018-09-25 13:41             ` Dmitry Osipenko
2018-09-24  0:41   ` [PATCH v4 17/20] iommu/tegra: gart: Prepend error/debug messages with "GART:" Dmitry Osipenko
2018-09-24  0:41     ` Dmitry Osipenko
     [not found]     ` <20180924004153.8232-18-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-24 10:57       ` Thierry Reding
2018-09-24 10:57         ` Thierry Reding
2018-09-24 18:09         ` Dmitry Osipenko
2018-09-24 18:09           ` Dmitry Osipenko
2018-09-24  0:41   ` [PATCH v4 18/20] iommu/tegra: gart: Don't detach devices from inactive domains Dmitry Osipenko
2018-09-24  0:41     ` Dmitry Osipenko
     [not found]     ` <20180924004153.8232-19-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-24 11:00       ` Thierry Reding
2018-09-24 11:00         ` Thierry Reding
2018-09-24 18:05         ` Dmitry Osipenko
     [not found]           ` <8be80297-3b13-ece6-a5bf-873cc7877989-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-25 10:04             ` Thierry Reding
2018-09-25 10:04               ` Thierry Reding
2018-09-25 13:41               ` Dmitry Osipenko
2018-09-25 13:41                 ` Dmitry Osipenko
2018-09-24  0:41 ` [PATCH v4 15/20] iommu/tegra: gart: Allow only one active domain at a time Dmitry Osipenko
     [not found]   ` <20180924004153.8232-16-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-24 10:50     ` Thierry Reding
2018-09-24 10:50       ` Thierry Reding
2018-09-24  0:41 ` [PATCH v4 19/20] iommu/tegra: gart: Simplify clients-tracking code Dmitry Osipenko
     [not found]   ` <20180924004153.8232-20-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-24 11:10     ` Thierry Reding
2018-09-24 11:10       ` Thierry Reding
2018-09-24 17:50       ` Dmitry Osipenko
     [not found]         ` <aefb6b78-4923-0259-0f3a-2ce3b95ca456-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-25 10:09           ` Thierry Reding
2018-09-25 10:09             ` Thierry Reding
2018-09-25 13:47             ` Dmitry Osipenko
2018-09-24  0:41 ` [PATCH v4 20/20] iommu/tegra: gart: Perform code refactoring Dmitry Osipenko
     [not found]   ` <20180924004153.8232-21-digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-24 11:34     ` Thierry Reding
2018-09-24 11:34       ` Thierry Reding
2018-09-24 17:11       ` 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=20180924004153.8232-4-digetx@gmail.com \
    --to=digetx-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
    --cc=jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \
    --cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=robin.murphy-5wv7dgnIgG8@public.gmane.org \
    --cc=thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.