From: Shunqian Zheng <zhengsq@rock-chips.com>
To: joro@8bytes.org, heiko@sntech.de, robh+dt@kernel.org,
mark.rutland@arm.com, linux@armlinux.org.uk,
mark.yao@rock-chips.com, airlied@linux.ie, tfiga@google.com,
xxm@rock-chips.com
Cc: linux-arm-kernel@lists.infradead.org,
iommu@lists.linux-foundation.org, devicetree@vger.kernel.org,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
linux-rockchip@lists.infradead.org
Subject: [PATCH v2 2/7] iommu/rockchip: add map_sg callback for rk_iommu_ops
Date: Wed, 8 Jun 2016 21:26:27 +0800 [thread overview]
Message-ID: <1465392392-2003-3-git-send-email-zhengsq@rock-chips.com> (raw)
In-Reply-To: <1465392392-2003-1-git-send-email-zhengsq@rock-chips.com>
From: Simon Xue <xxm@rock-chips.com>
The iommu_dma_alloc() in iommu/dma-iommu.c calls iommu_map_sg()
that requires the callback iommu_ops .map_sg(). Adding the
default_iommu_map_sg() to rockchip iommu accordingly.
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Signed-off-by: Shunqian Zheng <xxm@rock-chips.com>
---
drivers/iommu/rockchip-iommu.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index ec0ce62..3c16ec3 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1022,6 +1022,7 @@ static const struct iommu_ops rk_iommu_ops = {
.detach_dev = rk_iommu_detach_device,
.map = rk_iommu_map,
.unmap = rk_iommu_unmap,
+ .map_sg = default_iommu_map_sg,
.add_device = rk_iommu_add_device,
.remove_device = rk_iommu_remove_device,
.iova_to_phys = rk_iommu_iova_to_phys,
--
1.9.1
next prev parent reply other threads:[~2016-06-08 13:27 UTC|newest]
Thread overview: 18+ 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
2016-06-08 13:26 ` [PATCH v2 1/7] iommu/rockchip: fix devm_{request,free}_irq parameter Shunqian Zheng
2016-06-10 5:30 ` Tomasz Figa
2016-06-08 13:26 ` Shunqian Zheng [this message]
2016-06-10 5:31 ` [PATCH v2 2/7] iommu/rockchip: add map_sg callback for rk_iommu_ops Tomasz Figa
2016-06-08 13:26 ` [PATCH v2 3/7] iommu/rockchip: support virtual iommu slave device Shunqian Zheng
2016-06-10 6:22 ` Tomasz Figa
2016-06-08 13:26 ` [PATCH v2 4/7] ARM: dts: rockchip: add virtual iommu for display Shunqian Zheng
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
2016-06-08 13:26 ` [PATCH v2 6/7] iommu/rockchip: use DMA API to map, to flush cache Shunqian Zheng
2016-06-10 9:10 ` Tomasz Figa
[not found] ` <575E834C.30305@gmail.com>
2016-06-13 10:21 ` Tomasz Figa
[not found] ` <575E8B6F.1040103@gmail.com>
2016-06-13 10:41 ` Tomasz Figa
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
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=1465392392-2003-3-git-send-email-zhengsq@rock-chips.com \
--to=zhengsq@rock-chips.com \
--cc=airlied@linux.ie \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=mark.yao@rock-chips.com \
--cc=robh+dt@kernel.org \
--cc=tfiga@google.com \
--cc=xxm@rock-chips.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).