From: Joerg Roedel <joro@8bytes.org>
To: Jean-Philippe Brucker <jean-philippe@linaro.org>
Cc: Hanjun Guo <guohanjun@huawei.com>,
iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org,
linux-mediatek@lists.infradead.org,
virtualization@lists.linux-foundation.org,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Sudeep Holla <sudeep.holla@arm.com>,
Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Thierry Reding <thierry.reding@gmail.com>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Linuxarm <linuxarm@huawei.com>
Subject: Re: [PATCH 00/14] iommu: Move iommu_fwspec out of 'struct device'
Date: Mon, 9 Mar 2020 17:32:02 +0100 [thread overview]
Message-ID: <20200309163202.nk7yotb7awzido7b@8bytes.org> (raw)
In-Reply-To: <20200306100955.GB50020@myrica>
Hi Jean-Philippe,
On Fri, Mar 06, 2020 at 11:09:55AM +0100, Jean-Philippe Brucker wrote:
> I think that's because patch 01/14 move the fwspec access too early. In
>
> err = pci_for_each_dma_alias(to_pci_dev(dev),
> iort_pci_iommu_init, &info);
>
> if (!err && iort_pci_rc_supports_ats(node))
> dev->iommu_fwspec->flags |= IOMMU_FWSPEC_PCI_RC_ATS;
>
> the iommu_fwspec is only valid if iort_pci_iommu_init() initialized it
> successfully, if err == 0. The following might fix it:
>
> diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
> index 0e981d7f3c7d..7d04424189df 100644
> --- a/drivers/acpi/arm64/iort.c
> +++ b/drivers/acpi/arm64/iort.c
> @@ -1015,7 +1015,7 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
> return ops;
>
> if (dev_is_pci(dev)) {
> - struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
> + struct iommu_fwspec *fwspec;
> struct pci_bus *bus = to_pci_dev(dev)->bus;
> struct iort_pci_alias_info info = { .dev = dev };
>
> @@ -1028,7 +1028,8 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev)
> err = pci_for_each_dma_alias(to_pci_dev(dev),
> iort_pci_iommu_init, &info);
>
> - if (!err && iort_pci_rc_supports_ats(node))
> + fwspec = dev_iommu_fwspec_get(dev);
> + if (fwspec && iort_pci_rc_supports_ats(node))
> fwspec->flags |= IOMMU_FWSPEC_PCI_RC_ATS;
> } else {
> int i = 0;
Thanks a lot for the fix! I added it to patch 1/14.
Regards,
Joerg
prev parent reply other threads:[~2020-03-09 16:32 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-28 15:08 [PATCH 00/14] iommu: Move iommu_fwspec out of 'struct device' Joerg Roedel
2020-02-28 15:08 ` [PATCH 01/14] ACPI/IORT: Remove direct access of dev->iommu_fwspec Joerg Roedel
2020-02-28 15:08 ` [PATCH 02/14] drm/msm/mdp5: " Joerg Roedel
2020-02-29 3:04 ` kbuild test robot
2020-02-28 15:08 ` [PATCH 03/14] iommu/tegra-gart: " Joerg Roedel
2020-02-28 15:08 ` [PATCH 04/14] iommu/arm-smmu: Fix uninitilized variable warning Joerg Roedel
2020-02-28 15:08 ` [PATCH 05/14] iommu: Rename struct iommu_param to dev_iommu Joerg Roedel
2020-02-28 15:08 ` [PATCH 06/14] iommu: Move iommu_fwspec to struct dev_iommu Joerg Roedel
2020-02-28 15:08 ` [PATCH 07/14] iommu: Introduce accessors for iommu private data Joerg Roedel
2020-02-28 15:08 ` [PATCH 08/14] iommu/arm-smmu-v3: Use accessor functions " Joerg Roedel
2020-02-28 15:08 ` [PATCH 09/14] iommu/arm-smmu: " Joerg Roedel
2020-02-28 15:08 ` [PATCH 10/14] iommu/renesas: " Joerg Roedel
2020-02-28 15:08 ` [PATCH 11/14] iommu/mediatek: " Joerg Roedel
2020-02-28 15:08 ` [PATCH 12/14] iommu/qcom: " Joerg Roedel
2020-02-28 15:08 ` [PATCH 13/14] iommu/virtio: " Joerg Roedel
2020-02-28 15:08 ` [PATCH 14/14] iommu: Move fwspec->iommu_priv to struct dev_iommu Joerg Roedel
2020-03-03 19:16 ` [PATCH 00/14] iommu: Move iommu_fwspec out of 'struct device' Will Deacon
2020-03-04 13:27 ` Joerg Roedel
2020-03-06 8:39 ` Hanjun Guo
2020-03-06 10:09 ` Jean-Philippe Brucker
2020-03-06 11:04 ` Hanjun Guo
2020-03-09 16:32 ` Joerg Roedel [this message]
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=20200309163202.nk7yotb7awzido7b@8bytes.org \
--to=joro@8bytes.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=guohanjun@huawei.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jean-philippe@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linuxarm@huawei.com \
--cc=lorenzo.pieralisi@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=robdclark@gmail.com \
--cc=robin.murphy@arm.com \
--cc=sean@poorly.run \
--cc=sudeep.holla@arm.com \
--cc=thierry.reding@gmail.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=will@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 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).