From patchwork Wed Feb 10 00:57:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 8267291 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 666B1BEEED for ; Wed, 10 Feb 2016 00:59:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE3F7201F4 for ; Wed, 10 Feb 2016 00:59:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11E0A20221 for ; Wed, 10 Feb 2016 00:59:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755801AbcBJA65 (ORCPT ); Tue, 9 Feb 2016 19:58:57 -0500 Received: from smtp-3.sys.kth.se ([130.237.48.192]:33138 "EHLO smtp-3.sys.kth.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754906AbcBJA64 (ORCPT ); Tue, 9 Feb 2016 19:58:56 -0500 Received: from smtp-3.sys.kth.se (localhost.localdomain [127.0.0.1]) by smtp-3.sys.kth.se (Postfix) with ESMTP id 614002B4D; Wed, 10 Feb 2016 01:58:54 +0100 (CET) X-Virus-Scanned: by amavisd-new at kth.se Received: from smtp-3.sys.kth.se ([127.0.0.1]) by smtp-3.sys.kth.se (smtp-3.sys.kth.se [127.0.0.1]) (amavisd-new, port 10024) with LMTP id vd4r1k46_Azm; Wed, 10 Feb 2016 01:58:53 +0100 (CET) X-KTH-Auth: niso [89.233.230.99] X-KTH-mail-from: niklas.soderlund+renesas@ragnatech.se Received: from bismarck.berto.se (dynamic.0.6.79d1f80.14cc20ac3a53.cust.bredband2.com [89.233.230.99]) by smtp-3.sys.kth.se (Postfix) with ESMTPSA id A333429B2; Wed, 10 Feb 2016 01:58:52 +0100 (CET) From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= To: linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, iommu@lists.linux-foundation.org Cc: robin.murphy@arm.com, vinod.koul@intel.com, laurent.pinchart@ideasonboard.com, geert+renesas@glider.be, linus.walleij@linaro.org, dan.j.williams@intel.com, arnd@arndb.de, linux-arch@vger.kernel.org, =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH v3 6/8] dmaengine: rcar-dmac: add iommu support for slave transfers Date: Wed, 10 Feb 2016 01:57:56 +0100 Message-Id: <1455065878-11906-7-git-send-email-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1455065878-11906-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> References: <1455065878-11906-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> MIME-Version: 1.0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Enable slave transfers to devices behind IPMMU:s by mapping the slave addresses using the dma-mapping API. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- drivers/dma/sh/rcar-dmac.c | 57 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c index 743873c..268407c 100644 --- a/drivers/dma/sh/rcar-dmac.c +++ b/drivers/dma/sh/rcar-dmac.c @@ -1106,21 +1106,68 @@ rcar_dmac_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, return desc; } +static int rcar_dmac_set_slave_addr(struct dma_chan *chan, + struct rcar_dmac_chan_slave *slave, + phys_addr_t addr, size_t size) +{ + struct dma_attrs attrs; + enum dma_data_direction dir; + + init_dma_attrs(&attrs); + dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &attrs); + dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs); + + /* + * We can't know the direction at this time, see documentation for + * 'direction' in struct dma_slave_config. + */ + dir = DMA_BIDIRECTIONAL; + + if (slave->xfer_size) { + dma_unmap_resource(chan->device->dev, slave->slave_addr, + slave->xfer_size, dir, &attrs); + slave->slave_addr = 0; + slave->xfer_size = 0; + } + + if (size) { + slave->slave_addr = dma_map_resource(chan->device->dev, addr, + size, dir, &attrs); + + if (dma_mapping_error(chan->device->dev, slave->slave_addr)) { + struct rcar_dmac_chan *rchan = to_rcar_dmac_chan(chan); + + dev_err(chan->device->dev, + "chan%u: failed to map %zx@%pap", + rchan->index, size, &addr); + return -EIO; + } + + slave->xfer_size = size; + } + + return 0; +} + static int rcar_dmac_device_config(struct dma_chan *chan, struct dma_slave_config *cfg) { struct rcar_dmac_chan *rchan = to_rcar_dmac_chan(chan); + int ret; /* * We could lock this, but you shouldn't be configuring the * channel, while using it... */ - rchan->src.slave_addr = cfg->src_addr; - rchan->dst.slave_addr = cfg->dst_addr; - rchan->src.xfer_size = cfg->src_addr_width; - rchan->dst.xfer_size = cfg->dst_addr_width; - return 0; + ret = rcar_dmac_set_slave_addr(chan, &rchan->src, cfg->src_addr, + cfg->src_addr_width); + if (ret) + return ret; + + ret = rcar_dmac_set_slave_addr(chan, &rchan->dst, cfg->dst_addr, + cfg->dst_addr_width); + return ret; } static int rcar_dmac_chan_terminate_all(struct dma_chan *chan)