From patchwork Thu Jan 21 14:01:33 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: 8081741 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2D3469F1CC for ; Thu, 21 Jan 2016 14:08:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B41832028D for ; Thu, 21 Jan 2016 14:08:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 24D6A20494 for ; Thu, 21 Jan 2016 14:08:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759537AbcAUOIK (ORCPT ); Thu, 21 Jan 2016 09:08:10 -0500 Received: from smtp-4.sys.kth.se ([130.237.48.193]:54174 "EHLO smtp-4.sys.kth.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759536AbcAUOIH (ORCPT ); Thu, 21 Jan 2016 09:08:07 -0500 Received: from smtp-4.sys.kth.se (localhost.localdomain [127.0.0.1]) by smtp-4.sys.kth.se (Postfix) with ESMTP id 4848E3162; Thu, 21 Jan 2016 15:02:15 +0100 (CET) X-Virus-Scanned: by amavisd-new at kth.se Received: from smtp-4.sys.kth.se ([127.0.0.1]) by smtp-4.sys.kth.se (smtp-4.sys.kth.se [127.0.0.1]) (amavisd-new, port 10024) with LMTP id fBN9SWkSRndn; Thu, 21 Jan 2016 15:02:10 +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-4.sys.kth.se (Postfix) with ESMTPSA id 7755E3065; Thu, 21 Jan 2016 15:02:09 +0100 (CET) From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= To: dmaengine@vger.kernel.org, linux-renesas-soc@vger.kernel.org, vinod.koul@intel.com Cc: linus.walleij@linaro.org, laurent.pinchart@ideasonboard.com, geert+renesas@glider.be, dan.j.williams@intel.com, =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH v2 3/5] dmaengine: rcar-dmac: add iommu support for slave transfers Date: Thu, 21 Jan 2016 15:01:33 +0100 Message-Id: <1453384895-20395-4-git-send-email-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1453384895-20395-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> References: <1453384895-20395-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=-6.9 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 --- drivers/dma/sh/rcar-dmac.c | 59 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c index 743873c..f3ec8a6 100644 --- a/drivers/dma/sh/rcar-dmac.c +++ b/drivers/dma/sh/rcar-dmac.c @@ -1106,21 +1106,70 @@ rcar_dmac_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, return desc; } +static int __rcar_dmac_device_config(struct dma_chan *chan, + struct rcar_dmac_chan_slave *slave, + phys_addr_t addr, size_t size, + enum dma_data_direction dir, + struct dma_attrs *attrs) +{ + struct rcar_dmac_chan *rchan = to_rcar_dmac_chan(chan); + struct page *page; + size_t offset; + + /* unmap old */ + if (slave->slave_addr) { + dma_unmap_page_attrs(chan->device->dev, slave->slave_addr, + slave->xfer_size, dir, attrs); + slave->slave_addr = 0; + slave->xfer_size = 0; + } + + /* map new */ + if (addr) { + /* phys_to_page not available on all platforms */ + page = pfn_to_page(addr >> PAGE_SHIFT); + offset = addr - page_to_phys(page); + slave->slave_addr = dma_map_page_attrs(chan->device->dev, page, + offset, size, dir, attrs); + + if (dma_mapping_error(chan->device->dev, slave->slave_addr)) { + 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); + struct dma_attrs attrs; + 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; + init_dma_attrs(&attrs); + dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, &attrs); + dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs); + + ret = __rcar_dmac_device_config(chan, &rchan->src, cfg->src_addr, + cfg->src_addr_width, DMA_FROM_DEVICE, &attrs); + if (!ret) + return ret; + + ret = __rcar_dmac_device_config(chan, &rchan->dst, cfg->dst_addr, + cfg->dst_addr_width, DMA_TO_DEVICE, &attrs); + return ret; } static int rcar_dmac_chan_terminate_all(struct dma_chan *chan)