From: Yong Wu <yong.wu@mediatek.com>
To: Joerg Roedel <joro@8bytes.org>
Cc: Joerg Roedel <jroedel@suse.de>, Will Deacon <will@kernel.org>,
linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
linux-mediatek@lists.infradead.org,
Matthias Brugger <matthias.bgg@gmail.com>,
Robin Murphy <robin.murphy@arm.com>
Subject: Re: [PATCH v2 23/33] iommu/mediatek-v1 Convert to probe/release_device() call-backs
Date: Fri, 15 May 2020 15:44:59 +0800 [thread overview]
Message-ID: <1589528699.26119.9.camel@mhfsdcap03> (raw)
In-Reply-To: <20200414131542.25608-24-joro@8bytes.org>
On Tue, 2020-04-14 at 15:15 +0200, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel@suse.de>
>
> Convert the Mediatek-v1 IOMMU driver to use the probe_device() and
> release_device() call-backs of iommu_ops, so that the iommu core code
> does the group and sysfs setup.
>
> Signed-off-by: Joerg Roedel <jroedel@suse.de>
> ---
> drivers/iommu/mtk_iommu_v1.c | 50 +++++++++++++++---------------------
> 1 file changed, 20 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
> index a31be05601c9..7bdd74c7cb9f 100644
> --- a/drivers/iommu/mtk_iommu_v1.c
> +++ b/drivers/iommu/mtk_iommu_v1.c
> @@ -416,14 +416,12 @@ static int mtk_iommu_create_mapping(struct device *dev,
> return 0;
> }
>
> -static int mtk_iommu_add_device(struct device *dev)
> +static struct iommu_device *mtk_iommu_probe_device(struct device *dev)
> {
> struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
> - struct dma_iommu_mapping *mtk_mapping;
> struct of_phandle_args iommu_spec;
> struct of_phandle_iterator it;
> struct mtk_iommu_data *data;
> - struct iommu_group *group;
> int err;
>
> of_for_each_phandle(&it, err, dev->of_node, "iommus",
> @@ -442,35 +440,28 @@ static int mtk_iommu_add_device(struct device *dev)
> }
>
> if (!fwspec || fwspec->ops != &mtk_iommu_ops)
> - return -ENODEV; /* Not a iommu client device */
> + return ERR_PTR(-ENODEV); /* Not a iommu client device */
>
> - /*
> - * This is a short-term bodge because the ARM DMA code doesn't
> - * understand multi-device groups, but we have to call into it
> - * successfully (and not just rely on a normal IOMMU API attach
> - * here) in order to set the correct DMA API ops on @dev.
> - */
> - group = iommu_group_alloc();
> - if (IS_ERR(group))
> - return PTR_ERR(group);
> + data = dev_iommu_priv_get(dev);
>
> - err = iommu_group_add_device(group, dev);
> - iommu_group_put(group);
> - if (err)
> - return err;
> + return &data->iommu;
> +}
>
> - data = dev_iommu_priv_get(dev);
> +static void mtk_iommu_probe_finalize(struct device *dev)
> +{
> + struct dma_iommu_mapping *mtk_mapping;
> + struct mtk_iommu_data *data;
> + int err;
> +
> + data = dev_iommu_priv_get(dev);
> mtk_mapping = data->dev->archdata.iommu;
> - err = arm_iommu_attach_device(dev, mtk_mapping);
> - if (err) {
> - iommu_group_remove_device(dev);
> - return err;
> - }
>
> - return iommu_device_link(&data->iommu, dev);
> + err = arm_iommu_attach_device(dev, mtk_mapping);
> + if (err)
> + dev_err(dev, "Can't create IOMMU mapping - DMA-OPS will not work\n");
Hi Joerg,
Thanks very much for this patch.
This arm_iommu_attach_device is called just as we expected.
But it will fail in this callstack as the group->mutex was tried to
be re-locked...
[<c0938e8c>] (iommu_attach_device) from [<c0317590>]
(__arm_iommu_attach_device+0x34/0x90)
[<c0317590>] (__arm_iommu_attach_device) from [<c03175f8>]
(arm_iommu_attach_device+0xc/0x20)
[<c03175f8>] (arm_iommu_attach_device) from [<c09432cc>]
(mtk_iommu_probe_finalize+0x34/0x50)
[<c09432cc>] (mtk_iommu_probe_finalize) from [<c093a8ac>]
(bus_iommu_probe+0x2a8/0x2c4)
[<c093a8ac>] (bus_iommu_probe) from [<c093a950>] (bus_set_iommu
+0x88/0xd4)
[<c093a950>] (bus_set_iommu) from [<c0943c74>] (mtk_iommu_probe
+0x2f8/0x364)
> }
>
> -static void mtk_iommu_remove_device(struct device *dev)
> +static void mtk_iommu_release_device(struct device *dev)
> {
> struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
> struct mtk_iommu_data *data;
> @@ -479,9 +470,6 @@ static void mtk_iommu_remove_device(struct device *dev)
> return;
>
> data = dev_iommu_priv_get(dev);
> - iommu_device_unlink(&data->iommu, dev);
> -
> - iommu_group_remove_device(dev);
> iommu_fwspec_free(dev);
> }
>
> @@ -534,8 +522,10 @@ static const struct iommu_ops mtk_iommu_ops = {
> .map = mtk_iommu_map,
> .unmap = mtk_iommu_unmap,
> .iova_to_phys = mtk_iommu_iova_to_phys,
> - .add_device = mtk_iommu_add_device,
> - .remove_device = mtk_iommu_remove_device,
> + .probe_device = mtk_iommu_probe_device,
> + .probe_finalize = mtk_iommu_probe_finalize,
> + .release_device = mtk_iommu_release_device,
> + .device_group = generic_device_group,
> .pgsize_bitmap = ~0UL << MT2701_IOMMU_PAGE_SHIFT,
> };
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-05-15 7:52 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20200414131600eucas1p16f1ff6aedb780eb795a770dc08e5dec5@eucas1p1.samsung.com>
2020-04-14 13:15 ` [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 01/33] iommu: Move default domain allocation to separate function Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 02/33] iommu: Add def_domain_type() callback in iommu_ops Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 03/33] iommu/amd: Implement iommu_ops->def_domain_type call-back Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 04/33] iommu/vt-d: Wire up iommu_ops->def_domain_type Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 05/33] iommu/amd: Remove dma_mask check from check_device() Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 06/33] iommu/amd: Return -ENODEV in add_device when device is not handled by IOMMU Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 07/33] iommu: Add probe_device() and remove_device() call-backs Joerg Roedel
2020-04-15 6:36 ` Lu Baolu
2020-04-15 12:31 ` Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 08/33] iommu: Move default domain allocation to iommu_probe_device() Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 09/33] iommu: Keep a list of allocated groups in __iommu_probe_device() Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 10/33] iommu: Move new probe_device path to separate function Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 11/33] iommu: Split off default domain allocation from group assignment Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 12/33] iommu: Move iommu_group_create_direct_mappings() out of iommu_group_add_device() Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 13/33] iommu: Export bus_iommu_probe() and make is safe for re-probing Joerg Roedel
2020-04-15 6:10 ` Lu Baolu
2020-04-15 12:29 ` Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 14/33] iommu/amd: Remove dev_data->passthrough Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 15/33] iommu/amd: Convert to probe/release_device() call-backs Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 16/33] iommu/vt-d: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 17/33] iommu/arm-smmu: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 18/33] iommu/pamu: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 19/33] iommu/s390: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 20/33] iommu/virtio: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 21/33] iommu/msm: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 22/33] iommu/mediatek: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 23/33] iommu/mediatek-v1 " Joerg Roedel
2020-05-15 7:44 ` Yong Wu [this message]
2020-05-15 10:07 ` Joerg Roedel
2020-05-18 6:51 ` Yong Wu
2020-05-18 13:55 ` Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 24/33] iommu/qcom: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 25/33] iommu/rockchip: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 26/33] iommu/tegra: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 27/33] iommu/renesas: " Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 28/33] iommu/omap: Remove orphan_dev tracking Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 29/33] iommu/omap: Convert to probe/release_device() call-backs Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 30/33] iommu/exynos: Use first SYSMMU in controllers list for IOMMU core Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 31/33] iommu/exynos: Convert to probe/release_device() call-backs Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 32/33] iommu: Remove add_device()/remove_device() code-paths Joerg Roedel
2020-04-14 13:15 ` [PATCH v2 33/33] iommu: Unexport iommu_group_get_for_dev() Joerg Roedel
2020-04-16 11:48 ` [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code Marek Szyprowski
2020-04-17 1:03 ` Daniel Drake
2020-04-17 1:14 ` Derrick, Jonathan
2020-04-18 12:44 ` joro
2020-05-29 22:16 ` Jerry Snitselaar
2020-06-01 10:42 ` Jerry Snitselaar
2020-06-01 13:17 ` Jerry Snitselaar
2020-06-01 23:20 ` Lu Baolu
2020-06-01 23:16 ` Lu Baolu
2020-06-02 0:02 ` Jerry Snitselaar
2020-06-02 14:23 ` Joerg Roedel
2020-06-02 16:38 ` Jerry Snitselaar
2020-06-02 21:17 ` Jerry Snitselaar
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=1589528699.26119.9.camel@mhfsdcap03 \
--to=yong.wu@mediatek.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=robin.murphy@arm.com \
--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).