From: Joerg Roedel <joro@8bytes.org>
To: Robin Murphy <robin.murphy@arm.com>
Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
sudeep.holla@arm.com
Subject: Re: [PATCH v2] iommu/of: Fix of_iommu_configure() for disabled IOMMUs
Date: Tue, 15 Aug 2017 16:50:33 +0200 [thread overview]
Message-ID: <20170815145033.GA25618@8bytes.org> (raw)
In-Reply-To: <318c01e2f27ff892f3edbafa10972b75f45c8b74.1501863753.git.robin.murphy@arm.com>
On Fri, Aug 04, 2017 at 05:29:06PM +0100, Robin Murphy wrote:
> Sudeep reports that the logic got slightly broken when a PCI iommu-map
> entry targets an IOMMU marked as disabled in DT, since of_pci_map_rid()
> succeeds in following a phandle, and of_iommu_xlate() doesn't return an
> error value, but we miss checking whether ops was actually non-NULL.
> Whilst this could be solved with a point fix in of_pci_iommu_init(), it
> suggests that all the juggling of ERR_PTR values through the ops pointer
> is proving rather too complicated for its own good, so let's instead
> simplify the whole flow (with a side-effect of eliminating the cause of
> the bug).
>
> The fact that we now rely on iommu_fwspec means that we no longer need
> to pass around an iommu_ops pointer at all - we can simply propagate a
> regular int return value until we know whether we have a viable IOMMU,
> then retrieve the ops from the fwspec if and when we actually need them.
> This makes everything a bit more uniform and certainly easier to follow.
>
> Fixes: d87beb749281 ("iommu/of: Handle PCI aliases properly")
> Reported-by: Sudeep Holla <sudeep.holla@arm.com>
> Tested-by: Sudeep Holla <sudeep.holla@arm.com>
> Signed-off-by: Robin Murphy <robin.murphy@arm.com>
> ---
>
> v2: Don't break the -EPROBE_DEFER case
>
> drivers/iommu/of_iommu.c | 59 ++++++++++++++++++++++++------------------------
> 1 file changed, 29 insertions(+), 30 deletions(-)
Applied, thanks.
WARNING: multiple messages have this Message-ID (diff)
From: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
To: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>
Cc: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
sudeep.holla-5wv7dgnIgG8@public.gmane.org
Subject: Re: [PATCH v2] iommu/of: Fix of_iommu_configure() for disabled IOMMUs
Date: Tue, 15 Aug 2017 16:50:33 +0200 [thread overview]
Message-ID: <20170815145033.GA25618@8bytes.org> (raw)
In-Reply-To: <318c01e2f27ff892f3edbafa10972b75f45c8b74.1501863753.git.robin.murphy-5wv7dgnIgG8@public.gmane.org>
On Fri, Aug 04, 2017 at 05:29:06PM +0100, Robin Murphy wrote:
> Sudeep reports that the logic got slightly broken when a PCI iommu-map
> entry targets an IOMMU marked as disabled in DT, since of_pci_map_rid()
> succeeds in following a phandle, and of_iommu_xlate() doesn't return an
> error value, but we miss checking whether ops was actually non-NULL.
> Whilst this could be solved with a point fix in of_pci_iommu_init(), it
> suggests that all the juggling of ERR_PTR values through the ops pointer
> is proving rather too complicated for its own good, so let's instead
> simplify the whole flow (with a side-effect of eliminating the cause of
> the bug).
>
> The fact that we now rely on iommu_fwspec means that we no longer need
> to pass around an iommu_ops pointer at all - we can simply propagate a
> regular int return value until we know whether we have a viable IOMMU,
> then retrieve the ops from the fwspec if and when we actually need them.
> This makes everything a bit more uniform and certainly easier to follow.
>
> Fixes: d87beb749281 ("iommu/of: Handle PCI aliases properly")
> Reported-by: Sudeep Holla <sudeep.holla-5wv7dgnIgG8@public.gmane.org>
> Tested-by: Sudeep Holla <sudeep.holla-5wv7dgnIgG8@public.gmane.org>
> Signed-off-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>
> ---
>
> v2: Don't break the -EPROBE_DEFER case
>
> drivers/iommu/of_iommu.c | 59 ++++++++++++++++++++++++------------------------
> 1 file changed, 29 insertions(+), 30 deletions(-)
Applied, thanks.
next prev parent reply other threads:[~2017-08-15 14:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-04 16:29 [PATCH v2] iommu/of: Fix of_iommu_configure() for disabled IOMMUs Robin Murphy
2017-08-15 14:50 ` Joerg Roedel [this message]
2017-08-15 14:50 ` 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=20170815145033.GA25618@8bytes.org \
--to=joro@8bytes.org \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=sudeep.holla@arm.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 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.