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,
Tomasz Figa <tfiga@chromium.org>
Subject: [PATCH v5 2/8] iommu/rockchip: Add map_sg callback for rk_iommu_ops
Date: Fri, 24 Jun 2016 10:13:27 +0800 [thread overview]
Message-ID: <1466734413-7453-3-git-send-email-zhengsq@rock-chips.com> (raw)
In-Reply-To: <1466734413-7453-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>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
---
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 5a9659a..53fa0d9 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-24 2:15 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-24 2:13 iommu/rockchip: Fix bugs and enable on ARM64 Shunqian Zheng
2016-06-24 2:13 ` [PATCH v5 1/8] iommu/rockchip: Fix devm_{request,free}_irq parameter Shunqian Zheng
2016-06-24 2:13 ` Shunqian Zheng [this message]
2016-06-24 2:13 ` [PATCH v5 3/8] iommu/rockchip: Fix allocation of bases array in driver probe Shunqian Zheng
2016-06-24 2:13 ` [PATCH v5 4/8] iommu/rockchip: Use DMA API to manage coherency Shunqian Zheng
2016-06-24 2:13 ` [PATCH v5 5/8] iommu/rockchip: Prepare to support generic DMA mapping Shunqian Zheng
2016-06-24 2:13 ` [PATCH v5 6/8] drm/rockchip: Do not use DMA mapping API if attached to IOMMU domain Shunqian Zheng
2016-07-08 0:54 ` Mark yao
2016-06-24 2:13 ` [PATCH v5 7/8] drm/rockchip: Use common IOMMU API to attach devices Shunqian Zheng
2016-07-08 0:54 ` Mark yao
2016-06-24 2:13 ` [PATCH v5 8/8] iommu/rockchip: Enable Rockchip IOMMU on ARM64 Shunqian Zheng
2016-11-29 0:42 ` Brian Norris
2016-11-29 9:22 ` Heiko Stübner
2016-06-27 12:57 ` iommu/rockchip: Fix bugs and enable " Joerg Roedel
2016-07-08 1:01 ` Mark yao
2016-07-15 15:32 ` Matthias Brugger
2016-07-15 16:16 ` Joerg Roedel
2017-03-08 5:50 ` Caesar Wang
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=1466734413-7453-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@chromium.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).