From: Magnus Damm <magnus.damm@gmail.com>
To: iommu@lists.linux-foundation.org
Cc: laurent.pinchart+renesas@ideasonboard.com,
geert+renesas@glider.be, joro@8bytes.org,
linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
horms+renesas@verge.net.au, Magnus Damm <magnus.damm@gmail.com>
Subject: [PATCH v2 06/11] iommu/ipmmu-vmsa: Teach xlate() to skip disabled iommus
Date: Mon, 06 Jun 2016 12:58:22 +0900 [thread overview]
Message-ID: <20160606035822.31763.39713.sendpatchset@little-apple> (raw)
In-Reply-To: <20160606035723.31763.66500.sendpatchset@little-apple>
From: Magnus Damm <damm+renesas@opensource.se>
The ->xlate() call gets invoked even though the iommu
device has status = "disabled" in DT, so make sure we
skip over disabled devices.
In my mind it would make sense to have this at some
shared level, but I guess some users may want to
configure the iommu regardless of DT state.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
Changes since V1:
- Reworked slightly to fit on top of updated patch order
drivers/iommu/ipmmu-vmsa.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- 0017/drivers/iommu/ipmmu-vmsa.c
+++ work/drivers/iommu/ipmmu-vmsa.c 2016-06-06 10:58:18.530607110 +0900
@@ -1001,7 +1001,13 @@ static struct iommu_group *ipmmu_device_
static int ipmmu_of_xlate_dma(struct device *dev,
struct of_phandle_args *spec)
{
- /* dummy callback to satisfy of_iommu_configure() */
+ /* If the IPMMU device is disabled in DT then return error
+ * to make sure the of_iommu code does not install ops
+ * even though the iommu device is disabled
+ */
+ if (!of_device_is_available(spec->np))
+ return -ENODEV;
+
return 0;
}
WARNING: multiple messages have this Message-ID (diff)
From: Magnus Damm <magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
Cc: laurent.pinchart+renesas-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org,
geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org,
Magnus Damm <magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
horms+renesas-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org
Subject: [PATCH v2 06/11] iommu/ipmmu-vmsa: Teach xlate() to skip disabled iommus
Date: Mon, 06 Jun 2016 12:58:22 +0900 [thread overview]
Message-ID: <20160606035822.31763.39713.sendpatchset@little-apple> (raw)
In-Reply-To: <20160606035723.31763.66500.sendpatchset@little-apple>
From: Magnus Damm <damm+renesas-yzvPICuk2ACczHhG9Qg4qA@public.gmane.org>
The ->xlate() call gets invoked even though the iommu
device has status = "disabled" in DT, so make sure we
skip over disabled devices.
In my mind it would make sense to have this at some
shared level, but I guess some users may want to
configure the iommu regardless of DT state.
Signed-off-by: Magnus Damm <damm+renesas-yzvPICuk2ACczHhG9Qg4qA@public.gmane.org>
---
Changes since V1:
- Reworked slightly to fit on top of updated patch order
drivers/iommu/ipmmu-vmsa.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- 0017/drivers/iommu/ipmmu-vmsa.c
+++ work/drivers/iommu/ipmmu-vmsa.c 2016-06-06 10:58:18.530607110 +0900
@@ -1001,7 +1001,13 @@ static struct iommu_group *ipmmu_device_
static int ipmmu_of_xlate_dma(struct device *dev,
struct of_phandle_args *spec)
{
- /* dummy callback to satisfy of_iommu_configure() */
+ /* If the IPMMU device is disabled in DT then return error
+ * to make sure the of_iommu code does not install ops
+ * even though the iommu device is disabled
+ */
+ if (!of_device_is_available(spec->np))
+ return -ENODEV;
+
return 0;
}
next prev parent reply other threads:[~2016-06-06 4:08 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 3:57 [PATCH v2 00/11] iommu/ipmmu-vmsa: r8a7795 support V2 Magnus Damm
2016-06-06 3:57 ` [PATCH v2 01/11] iommu/ipmmu-vmsa: Introduce features, break out alias Magnus Damm
2016-06-06 3:57 ` Magnus Damm
2016-06-06 3:57 ` [PATCH v2 02/11] iommu/ipmmu-vmsa: Add optional root device feature Magnus Damm
2016-06-06 3:57 ` Magnus Damm
2016-06-06 3:57 ` [PATCH v2 03/11] iommu/ipmmu-vmsa: Enable multi context support Magnus Damm
2016-06-06 3:57 ` Magnus Damm
2016-06-06 3:58 ` [PATCH v2 04/11] iommu/ipmmu-vmsa: Reuse iommu groups Magnus Damm
2016-06-06 3:58 ` Magnus Damm
2016-06-06 3:58 ` [PATCH v2 05/11] iommu/ipmmu-vmsa: Make use of IOMMU_OF_DECLARE() Magnus Damm
2016-06-06 3:58 ` Magnus Damm
2017-02-07 12:59 ` Geert Uytterhoeven
2017-02-07 12:59 ` Geert Uytterhoeven
2016-06-06 3:58 ` Magnus Damm [this message]
2016-06-06 3:58 ` [PATCH v2 06/11] iommu/ipmmu-vmsa: Teach xlate() to skip disabled iommus Magnus Damm
2016-06-08 0:23 ` Laurent Pinchart
2016-06-08 0:23 ` Laurent Pinchart
2016-06-06 3:58 ` [PATCH v2 07/11] iommu/ipmmu-vmsa: IPMMU device is 64-bit bus master Magnus Damm
2016-06-06 3:58 ` [PATCH v2 08/11] iommu/ipmmu-vmsa: Write IMCTR twice Magnus Damm
2016-06-06 3:58 ` Magnus Damm
2016-06-06 3:58 ` [PATCH v2 09/11] iommu/ipmmu-vmsa: Make IMBUSCTR setup optional Magnus Damm
2016-06-06 3:58 ` Magnus Damm
2016-06-06 3:58 ` [PATCH v2 10/11] iommu/ipmmu-vmsa: Allow two bit SL0 Magnus Damm
2016-06-06 3:59 ` [PATCH v2 11/11] iommu/ipmmu-vmsa: Hook up r8a7795 DT matching code Magnus Damm
2016-06-06 7:05 ` [PATCH v2 00/11] iommu/ipmmu-vmsa: r8a7795 support V2 Geert Uytterhoeven
2016-06-21 12:42 ` Joerg Roedel
2016-06-21 12:42 ` Joerg Roedel
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=20160606035822.31763.39713.sendpatchset@little-apple \
--to=magnus.damm@gmail.com \
--cc=geert+renesas@glider.be \
--cc=horms+renesas@verge.net.au \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.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.