From: Shunqian Zheng <zhengsq-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
To: Tomasz Figa <tfiga-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
Cc: "Mark Rutland" <mark.rutland-5wv7dgnIgG8@public.gmane.org>,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
"Heiko Stübner" <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>,
"David Airlie" <airlied-cv59FeDIM0c@public.gmane.org>,
list-Y9sIeH5OGRo@public.gmane.org,
linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org,
dri-devel
<dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>,
"linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
"open list:ARM/Rockchip SoC..."
<linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>,
"IOMMU DRIVERS"
<iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>,
"Rob Herring" <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
"simon xue" <xxm-TNX95d0MmH7DzftRWevZcw@public.gmane.org>,
open-Y9sIeH5OGRo@public.gmane.org,
"linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org"
<linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>,
姚智情 <mark.yao-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
Subject: Re: [PATCH v2 3/7] iommu/rockchip: support virtual iommu slave device
Date: Sun, 12 Jun 2016 10:33:05 +0800 [thread overview]
Message-ID: <575CC9E1.2060409@rock-chips.com> (raw)
In-Reply-To: <CAAFQd5DuAc-B17AqOg0mGcfLCGwztEOaukPL+c5jmL4a-AEeBA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
HI,
On 2016年06月10日 14:22, Tomasz Figa wrote:
> Hi,
>
> On Wed, Jun 8, 2016 at 10:26 PM, Shunqian Zheng <zhengsq@rock-chips.com> wrote:
>> An virtual master device like DRM need to attach to iommu
>> domain to share the domain with VOP(the one with actual
>> iommu slave). We currently check the group is NULL to indicate
>> a virtual master, which is not true since we decide to use
>> the common iommu api to attach device in DRM.
>>
>> With this patch, we can probe a virtual iommu device and
>> allow the DRM attaching to it. The virtual iommu is needed also
>> because we want convert to use DMA API for map/unmap, cache flush,
>> so that DRM buffer alloc still work even VOP is disabled.
> I'm not really convinced that this is a good idea. This will require
> creating fake devices in the system and generally looks really hacky.
> Please see my alternative proposal inline.
>
>> Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
>> ---
>> drivers/iommu/rockchip-iommu.c | 37 +++++++++++++++++++++++++------------
>> 1 file changed, 25 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
>> index 3c16ec3..d6c3051 100644
>> --- a/drivers/iommu/rockchip-iommu.c
>> +++ b/drivers/iommu/rockchip-iommu.c
>> @@ -75,6 +75,11 @@
>>
>> #define IOMMU_REG_POLL_COUNT_FAST 1000
>>
>> +/* A virtual iommu in device-tree registered without reg or
>> + * interrupts, so the num_mmu is zero.
>> + */
>> +#define RK_IOMMU_IS_VIRTUAL(iommu) (iommu->num_mmu == 0)
>> +
>> struct rk_iommu_domain {
>> struct list_head iommus;
>> u32 *dt; /* page directory table */
>> @@ -789,13 +794,13 @@ static int rk_iommu_attach_device(struct iommu_domain *domain,
>> int ret, i;
>> phys_addr_t dte_addr;
>>
>> - /*
>> - * Allow 'virtual devices' (e.g., drm) to attach to domain.
>> - * Such a device does not belong to an iommu group.
>> - */
>> iommu = rk_iommu_from_dev(dev);
>> - if (!iommu)
> Could we instead allocate such virtual rk_iommu struct here (dev could
> be used as iommu->dev for logging purposes and a fake group could be
> allocated too)?
Thanks for your advice.
The "iommu->dev" not only for logging, but mainly for dma_*().
If allocating virtual rk_iommu struct here and set iommu->dev to dev of DRM,
dma_map_single() (or dma_alloc_coherent() as you suggested in patch 6/7)
may not
act as expected.
Because when DRM attached to iommu, the dma_ops of DRM is the
rk_iommu_ops, so
dma_map_single() will get endless loop to call rk_iommu_map() like the
stack shows:
[ 3.095215] [<ffffffc0004bc374>] dump_stack+0xb4/0xf0
[ 3.095222] [<ffffffc0005a6048>] rk_iommu_map+0x50/0x4b8
[ 3.095229] [<ffffffc0005a130c>] iommu_map+0xd8/0x2fc
[ 3.095237] [<ffffffc0005a3634>] iommu_dma_map_page+0xe4/0x114
[ 3.095245] [<ffffffc0005a4258>] __iommu_map_page+0x68/0xb4
[ 3.095251] [<ffffffc0005a6118>] rk_iommu_map+0x120/0x4b8
[ 3.095258] [<ffffffc0005a130c>] iommu_map+0xd8/0x2fc
[ 3.095265] [<ffffffc0005a15d4>] default_iommu_map_sg+0xa4/0xf8
[ 3.095273] [<ffffffc0005a3474>] iommu_dma_alloc+0x290/0x2e8
[ 3.095281] [<ffffffc0005a3cbc>] __iommu_alloc_attrs+0xbc/0x22c
[ 3.095287] [<ffffffc0005e0794>] rockchip_gem_create_object+0x118/0x168
But, if the virtual iommu registered in device-tree, the iommu->dev is
set to platform dma_ops,
that is swiotlb_dma_ops for arm64, which can avoid the issue above.
This is why the virtual iommu added in device-tree. Yes, it's hacky, but
I don't have
another idea to solve the problem.
>
>> +
>> + iommu->domain = domain;
>> + if (RK_IOMMU_IS_VIRTUAL(iommu)) {
>> + dev_dbg(dev, "Attach virtual device to iommu domain\n");
>> return 0;
>> + }
>>
>> ret = rk_iommu_enable_stall(iommu);
>> if (ret)
>> @@ -805,7 +810,6 @@ static int rk_iommu_attach_device(struct iommu_domain *domain,
>> if (ret)
>> return ret;
>>
>> - iommu->domain = domain;
>>
>> ret = devm_request_irq(iommu->dev, iommu->irq, rk_iommu_irq,
>> IRQF_SHARED, dev_name(dev), iommu);
>> @@ -842,10 +846,13 @@ static void rk_iommu_detach_device(struct iommu_domain *domain,
>> unsigned long flags;
>> int i;
>>
>> - /* Allow 'virtual devices' (eg drm) to detach from domain */
>> iommu = rk_iommu_from_dev(dev);
>> - if (!iommu)
>> +
>> + iommu->domain = NULL;
> I don't think it's a good idea to set the domain to NULL before
> disabling the real IOMMU. It might still trigger an interrupt at this
> point and things won't behave correctly. I guess the original line
> could be left as is and simply same assignment added under the if
> below.
Correct, for the virtual one, it's safe to set "iommu->domain = NULL",
while for the real iommu, better to keep as it's before.
Thank you very much,
Shunqian
>
> Best regards,
> Tomasz
>
>
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2016-06-12 2:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-08 13:26 [PATCH v2 0/7] fix bugs; enable iommu for ARM64 Shunqian Zheng
[not found] ` <1465392392-2003-1-git-send-email-zhengsq-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2016-06-08 13:26 ` [PATCH v2 1/7] iommu/rockchip: fix devm_{request,free}_irq parameter Shunqian Zheng
2016-06-10 5:30 ` [PATCH v2 1/7] iommu/rockchip: fix devm_{request, free}_irq parameter Tomasz Figa
2016-06-08 13:26 ` [PATCH v2 2/7] iommu/rockchip: add map_sg callback for rk_iommu_ops Shunqian Zheng
2016-06-10 5:31 ` Tomasz Figa
2016-06-08 13:26 ` [PATCH v2 3/7] iommu/rockchip: support virtual iommu slave device Shunqian Zheng
[not found] ` <1465392392-2003-4-git-send-email-zhengsq-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2016-06-10 6:22 ` Tomasz Figa
[not found] ` <CAAFQd5DuAc-B17AqOg0mGcfLCGwztEOaukPL+c5jmL4a-AEeBA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-06-12 2:33 ` Shunqian Zheng [this message]
2016-06-08 13:26 ` [PATCH v2 4/7] ARM: dts: rockchip: add virtual iommu for display Shunqian Zheng
[not found] ` <1465392392-2003-5-git-send-email-zhengsq-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2016-06-10 6:22 ` Tomasz Figa
2016-06-08 13:26 ` [PATCH v2 5/7] drm: rockchip: use common iommu api to attach iommu Shunqian Zheng
2016-06-10 8:03 ` Tomasz Figa
[not found] ` <CAAFQd5AEsMhQiNkjBr-Af6rBg9x6Z9bCOu7GuYXt2h=wao7Cow-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-06-12 3:37 ` Shunqian Zheng
2016-06-08 13:26 ` [PATCH v2 6/7] iommu/rockchip: use DMA API to map, to flush cache Shunqian Zheng
[not found] ` <1465392392-2003-7-git-send-email-zhengsq-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2016-06-10 9:10 ` Tomasz Figa
[not found] ` <CAAFQd5Da+Eg=eiRUgLSS_qPjGbG474KYWDC=GaAMS8A_CuQ3Mg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-06-13 9:56 ` Shunqian Zheng
2016-06-13 10:21 ` Tomasz Figa
[not found] ` <CAAFQd5DDCd8VcdEhEASAK7NMBnVJWuUxgGURtsa2KQBKsgsxUQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-06-13 10:31 ` Shunqian Zheng
[not found] ` <575E8B6F.1040103-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-06-13 10:41 ` Tomasz Figa
[not found] ` <575E834C.30305-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-06-13 10:39 ` Robin Murphy
2016-06-08 13:26 ` [PATCH v2 7/7] iommu/rockchip: enable rockchip iommu on ARM64 platform Shunqian Zheng
[not found] ` <1465392392-2003-8-git-send-email-zhengsq-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2016-06-10 9:12 ` Tomasz Figa
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=575CC9E1.2060409@rock-chips.com \
--to=zhengsq-tnx95d0mmh7dzftrwevzcw@public.gmane.org \
--cc=airlied-cv59FeDIM0c@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=list-Y9sIeH5OGRo@public.gmane.org \
--cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
--cc=mark.yao-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
--cc=open-Y9sIeH5OGRo@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=tfiga-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=xxm-TNX95d0MmH7DzftRWevZcw@public.gmane.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