From: Bjorn Helgaas <helgaas@kernel.org>
To: Wang Xingang <wangxingang5@huawei.com>
Cc: robh@kernel.org, will@kernel.org, joro@8bytes.org,
robh+dt@kernel.org, gregkh@linuxfoundation.org,
iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org, xieyingtai@huawei.com,
Marek Szyprowski <m.szyprowski@samsung.com>,
Anders Roxell <anders.roxell@linaro.org>,
Robin Murphy <robin.murphy@arm.com>
Subject: Re: [PATCH v4] iommu/of: Fix pci_request_acs() before enumerating PCI devices
Date: Thu, 2 Sep 2021 09:46:25 -0500 [thread overview]
Message-ID: <20210902144625.GA328403@bjorn-Precision-5520> (raw)
In-Reply-To: <20210820195712.GA3342877@bjorn-Precision-5520>
[+cc Marek, Anders, Robin]
On Fri, Aug 20, 2021 at 02:57:12PM -0500, Bjorn Helgaas wrote:
> On Fri, May 21, 2021 at 03:03:24AM +0000, Wang Xingang wrote:
> > From: Xingang Wang <wangxingang5@huawei.com>
> >
> > When booting with devicetree, the pci_request_acs() is called after the
> > enumeration and initialization of PCI devices, thus the ACS is not
> > enabled. And ACS should be enabled when IOMMU is detected for the
> > PCI host bridge, so add check for IOMMU before probe of PCI host and call
> > pci_request_acs() to make sure ACS will be enabled when enumerating PCI
> > devices.
> >
> > Fixes: 6bf6c24720d33 ("iommu/of: Request ACS from the PCI core when
> > configuring IOMMU linkage")
> > Signed-off-by: Xingang Wang <wangxingang5@huawei.com>
>
> Applied to pci/virtualization for v5.15, thanks!
I dropped this for now, until the problems reported by Marek and
Anders get sorted out.
> > ---
> > drivers/iommu/of_iommu.c | 1 -
> > drivers/pci/of.c | 8 +++++++-
> > 2 files changed, 7 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
> > index a9d2df001149..54a14da242cc 100644
> > --- a/drivers/iommu/of_iommu.c
> > +++ b/drivers/iommu/of_iommu.c
> > @@ -205,7 +205,6 @@ const struct iommu_ops *of_iommu_configure(struct device *dev,
> > .np = master_np,
> > };
> >
> > - pci_request_acs();
> > err = pci_for_each_dma_alias(to_pci_dev(dev),
> > of_pci_iommu_init, &info);
> > } else {
> > diff --git a/drivers/pci/of.c b/drivers/pci/of.c
> > index da5b414d585a..2313c3f848b0 100644
> > --- a/drivers/pci/of.c
> > +++ b/drivers/pci/of.c
> > @@ -581,9 +581,15 @@ static int pci_parse_request_of_pci_ranges(struct device *dev,
> >
> > int devm_of_pci_bridge_init(struct device *dev, struct pci_host_bridge *bridge)
> > {
> > - if (!dev->of_node)
> > + struct device_node *node = dev->of_node;
> > +
> > + if (!node)
> > return 0;
> >
> > + /* Detect IOMMU and make sure ACS will be enabled */
> > + if (of_property_read_bool(node, "iommu-map"))
> > + pci_request_acs();
> > +
> > bridge->swizzle_irq = pci_common_swizzle;
> > bridge->map_irq = of_irq_parse_and_map_pci;
> >
> > --
> > 2.19.1
> >
next prev parent reply other threads:[~2021-09-02 14:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-21 3:03 [PATCH v4] iommu/of: Fix pci_request_acs() before enumerating PCI devices Wang Xingang
2021-05-21 19:03 ` Rob Herring
2021-05-31 11:24 ` Xingang Wang
2021-06-04 15:36 ` Joerg Roedel
2021-06-07 12:43 ` Xingang Wang
2021-06-04 19:04 ` Bjorn Helgaas
2021-06-07 12:58 ` Xingang Wang
2021-06-08 10:23 ` John Garry
2021-06-28 13:20 ` Xingang Wang
2021-08-20 19:57 ` Bjorn Helgaas
2021-09-02 14:46 ` Bjorn Helgaas [this message]
[not found] ` <CGME20210901085937eucas1p2d02da65cac797706ca3a10b8a2eb8ba2@eucas1p2.samsung.com>
2021-09-01 8:59 ` Marek Szyprowski
2021-09-01 9:58 ` Robin Murphy
2021-09-02 12:51 ` Anders Roxell
2021-09-02 13:07 ` Robin Murphy
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=20210902144625.GA328403@bjorn-Precision-5520 \
--to=helgaas@kernel.org \
--cc=anders.roxell@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
--cc=robin.murphy@arm.com \
--cc=wangxingang5@huawei.com \
--cc=will@kernel.org \
--cc=xieyingtai@huawei.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).