[PATCH v5 2/8] iommu/rockchip: Add map_sg callback for rk_iommu_ops

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Shunqian Zheng <zhengsq@rock-chips.com>
Newsgroups	linux.kernel
Subject	[PATCH v5 2/8] iommu/rockchip: Add map_sg callback for rk_iommu_ops
Date	Fri, 24 Jun 2016 04:20:02 +0200
Message-ID	<rNoSS-230-15@gated-at.bofh.it> (permalink)
References	<rNoSR-230-3@gated-at.bofh.it>
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=35Xd7CNMTWEgdVoM6MEEXTj2gLnLZZ+6Ztd4sJJahuU=; b=lTrcQaSXepRTMszpgu4YEcr9/xRZkiQmDeYLe42FW+0m7SiGWcCZHgxK0/oQnIKqxF OfHTjA9x2FkrTqIWgS2x/gg+Anz6cngR7u9ZdmqqlRc5mEBqt7NQ4eqhw85dJ8Kblq2E xd/BWJvfAz+hNFO8FxkrmltUGTy6kQDgLZVMmE0m9npCNAd6maWI80W/6Gpj9HamfRxy +vlLj/117L5S0r+V8O5CN5+1EzUTrDUytnk8bwzPjFkdqFY9JphH/A21N+MOyrTlABfV oOgkv5BPh/JaQ8SpjK6QuxHxBIkvovoL3MboTbeASAYGjYlADEcKRSYA7liLkm3F5hnY TDdQ==
X-Gm-Message-State	ALyK8tKuWVB68qhTut3dAgCO7xwvtagD4mKKzta+1LXp5JUJIZw5f+VXojl/jnlPIl4zEQ==
X-Received	by 10.66.160.225 with SMTP id xn1mr3138611pab.20.1466734499936; Thu, 23 Jun 2016 19:14:59 -0700 (PDT)
X-Mailer	git-send-email 1.9.1
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	28
Organization	linux.* mail to news gateway
X-Original-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>
X-Original-Date	Fri, 24 Jun 2016 10:13:27 +0800
X-Original-Message-ID	<1466734413-7453-3-git-send-email-zhengsq@rock-chips.com>
X-Original-References	<1466734413-7453-1-git-send-email-zhengsq@rock-chips.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1430294

Show key headers only | View raw

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

Thread

iommu/rockchip: Fix bugs and enable on ARM64 Shunqian Zheng <zhengsq@rock-chips.com> - 2016-06-24 04:20 +0200
  [PATCH v5 7/8] drm/rockchip: Use common IOMMU API to attach devices Shunqian Zheng <zhengsq@rock-chips.com> - 2016-06-24 04:20 +0200
    Re: [PATCH v5 7/8] drm/rockchip: Use common IOMMU API to attach  devices Mark yao <mark.yao@rock-chips.com> - 2016-07-08 03:00 +0200
  [PATCH v5 1/8] iommu/rockchip: Fix devm_{request,free}_irq parameter Shunqian Zheng <zhengsq@rock-chips.com> - 2016-06-24 04:20 +0200
  [PATCH v5 2/8] iommu/rockchip: Add map_sg callback for rk_iommu_ops Shunqian Zheng <zhengsq@rock-chips.com> - 2016-06-24 04:20 +0200
  [PATCH v5 3/8] iommu/rockchip: Fix allocation of bases array in driver probe Shunqian Zheng <zhengsq@rock-chips.com> - 2016-06-24 04:20 +0200
  [PATCH v5 6/8] drm/rockchip: Do not use DMA mapping API if attached to IOMMU domain Shunqian Zheng <zhengsq@rock-chips.com> - 2016-06-24 04:20 +0200
    Re: [PATCH v5 6/8] drm/rockchip: Do not use DMA mapping API if  attached to IOMMU domain Mark yao <mark.yao@rock-chips.com> - 2016-07-08 03:00 +0200
  [PATCH v5 5/8] iommu/rockchip: Prepare to support generic DMA mapping Shunqian Zheng <zhengsq@rock-chips.com> - 2016-06-24 04:20 +0200
  [PATCH v5 8/8] iommu/rockchip: Enable Rockchip IOMMU on ARM64 Shunqian Zheng <zhengsq@rock-chips.com> - 2016-06-24 04:20 +0200
  Re: iommu/rockchip: Fix bugs and enable on ARM64 Joerg Roedel <joro@8bytes.org> - 2016-06-27 15:00 +0200
    Re: iommu/rockchip: Fix bugs and enable on ARM64 Mark yao <mark.yao@rock-chips.com> - 2016-07-08 03:10 +0200

csiph-web