From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH v4 6/8] dmaengine: rcar-dmac: add iommu support for slave transfers Date: Tue, 16 Feb 2016 21:39:42 +0100 Message-ID: <1455655184-14478-7-git-send-email-niklas.soderlund+renesas@ragnatech.se> References: <1455655184-14478-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1455655184-14478-1-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org, linux-renesas-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dmaengine-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, =?UTF-8?q?Niklas=20S=C3=B6derlund?= , geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org, arnd-r2nGTMty4D4@public.gmane.org, linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org, dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org List-Id: linux-arch.vger.kernel.org RW5hYmxlIHNsYXZlIHRyYW5zZmVycyB0byBkZXZpY2VzIGJlaGluZCBJUE1NVTpzIGJ5IG1hcHBp bmcgdGhlIHNsYXZlCmFkZHJlc3NlcyB1c2luZyB0aGUgZG1hLW1hcHBpbmcgQVBJLgoKU2lnbmVk LW9mZi1ieTogTmlrbGFzIFPDtmRlcmx1bmQgPG5pa2xhcy5zb2Rlcmx1bmQrcmVuZXNhc0ByYWdu YXRlY2guc2U+ClJldmlld2VkLWJ5OiBMYXVyZW50IFBpbmNoYXJ0IDxsYXVyZW50LnBpbmNoYXJ0 QGlkZWFzb25ib2FyZC5jb20+Ci0tLQogZHJpdmVycy9kbWEvc2gvcmNhci1kbWFjLmMgfCA1MiAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2RtYS9zaC9yY2FyLWRtYWMuYyBiL2RyaXZlcnMvZG1hL3NoL3JjYXItZG1hYy5jCmluZGV4 IDc0Mzg3M2MuLjZhMjQ4NDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZG1hL3NoL3JjYXItZG1hYy5j CisrKyBiL2RyaXZlcnMvZG1hL3NoL3JjYXItZG1hYy5jCkBAIC0xMTA2LDIxICsxMTA2LDYzIEBA IHJjYXJfZG1hY19wcmVwX2RtYV9jeWNsaWMoc3RydWN0IGRtYV9jaGFuICpjaGFuLCBkbWFfYWRk cl90IGJ1Zl9hZGRyLAogCXJldHVybiBkZXNjOwogfQogCitzdGF0aWMgaW50IHJjYXJfZG1hY19z ZXRfc2xhdmVfYWRkcihzdHJ1Y3QgZG1hX2NoYW4gKmNoYW4sCisJCQkJICAgICBzdHJ1Y3QgcmNh cl9kbWFjX2NoYW5fc2xhdmUgKnNsYXZlLAorCQkJCSAgICAgcGh5c19hZGRyX3QgYWRkciwgc2l6 ZV90IHNpemUpCit7CisJZW51bSBkbWFfZGF0YV9kaXJlY3Rpb24gZGlyOworCisJLyoKKwkgKiBX ZSBjYW4ndCBrbm93IHRoZSBkaXJlY3Rpb24gYXQgdGhpcyB0aW1lLCBzZWUgZG9jdW1lbnRhdGlv biBmb3IKKwkgKiAnZGlyZWN0aW9uJyBpbiBzdHJ1Y3QgZG1hX3NsYXZlX2NvbmZpZy4KKwkgKi8K KwlkaXIgPSBETUFfQklESVJFQ1RJT05BTDsKKworCWlmIChzbGF2ZS0+eGZlcl9zaXplKSB7CisJ CWRtYV91bm1hcF9yZXNvdXJjZShjaGFuLT5kZXZpY2UtPmRldiwgc2xhdmUtPnNsYXZlX2FkZHIs CisJCQkJICAgc2xhdmUtPnhmZXJfc2l6ZSwgZGlyLCBOVUxMKTsKKwkJc2xhdmUtPnNsYXZlX2Fk ZHIgPSAwOworCQlzbGF2ZS0+eGZlcl9zaXplID0gMDsKKwl9CisKKwlpZiAoc2l6ZSkgeworCQlz bGF2ZS0+c2xhdmVfYWRkciA9IGRtYV9tYXBfcmVzb3VyY2UoY2hhbi0+ZGV2aWNlLT5kZXYsIGFk ZHIsCisJCQkJc2l6ZSwgZGlyLCBOVUxMKTsKKworCQlpZiAoZG1hX21hcHBpbmdfZXJyb3IoY2hh bi0+ZGV2aWNlLT5kZXYsIHNsYXZlLT5zbGF2ZV9hZGRyKSkgeworCQkJc3RydWN0IHJjYXJfZG1h Y19jaGFuICpyY2hhbiA9IHRvX3JjYXJfZG1hY19jaGFuKGNoYW4pOworCisJCQlkZXZfZXJyKGNo YW4tPmRldmljZS0+ZGV2LAorCQkJCSJjaGFuJXU6IGZhaWxlZCB0byBtYXAgJXp4QCVwYXAiLCBy Y2hhbi0+aW5kZXgsCisJCQkJc2l6ZSwgJmFkZHIpOworCQkJcmV0dXJuIC1FSU87CisJCX0KKwor CQlzbGF2ZS0+eGZlcl9zaXplID0gc2l6ZTsKKwl9CisKKwlyZXR1cm4gMDsKK30KKwogc3RhdGlj IGludCByY2FyX2RtYWNfZGV2aWNlX2NvbmZpZyhzdHJ1Y3QgZG1hX2NoYW4gKmNoYW4sCiAJCQkJ ICAgc3RydWN0IGRtYV9zbGF2ZV9jb25maWcgKmNmZykKIHsKIAlzdHJ1Y3QgcmNhcl9kbWFjX2No YW4gKnJjaGFuID0gdG9fcmNhcl9kbWFjX2NoYW4oY2hhbik7CisJaW50IHJldDsKIAogCS8qCiAJ ICogV2UgY291bGQgbG9jayB0aGlzLCBidXQgeW91IHNob3VsZG4ndCBiZSBjb25maWd1cmluZyB0 aGUKIAkgKiBjaGFubmVsLCB3aGlsZSB1c2luZyBpdC4uLgogCSAqLwotCXJjaGFuLT5zcmMuc2xh dmVfYWRkciA9IGNmZy0+c3JjX2FkZHI7Ci0JcmNoYW4tPmRzdC5zbGF2ZV9hZGRyID0gY2ZnLT5k c3RfYWRkcjsKLQlyY2hhbi0+c3JjLnhmZXJfc2l6ZSA9IGNmZy0+c3JjX2FkZHJfd2lkdGg7Ci0J cmNoYW4tPmRzdC54ZmVyX3NpemUgPSBjZmctPmRzdF9hZGRyX3dpZHRoOwogCi0JcmV0dXJuIDA7 CisJcmV0ID0gcmNhcl9kbWFjX3NldF9zbGF2ZV9hZGRyKGNoYW4sICZyY2hhbi0+c3JjLCBjZmct PnNyY19hZGRyLAorCQkJCSAgICAgICBjZmctPnNyY19hZGRyX3dpZHRoKTsKKwlpZiAocmV0KQor CQlyZXR1cm4gcmV0OworCisJcmV0ID0gcmNhcl9kbWFjX3NldF9zbGF2ZV9hZGRyKGNoYW4sICZy Y2hhbi0+ZHN0LCBjZmctPmRzdF9hZGRyLAorCQkJCSAgICAgICBjZmctPmRzdF9hZGRyX3dpZHRo KTsKKwlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgaW50IHJjYXJfZG1hY19jaGFuX3Rlcm1pbmF0 ZV9hbGwoc3RydWN0IGRtYV9jaGFuICpjaGFuKQotLSAKMi43LjEKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlvbW11IG1haWxpbmcgbGlzdAppb21tdUBs aXN0cy5saW51eC1mb3VuZGF0aW9uLm9yZwpodHRwczovL2xpc3RzLmxpbnV4Zm91bmRhdGlvbi5v cmcvbWFpbG1hbi9saXN0aW5mby9pb21tdQ== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-3.sys.kth.se ([130.237.48.192]:58083 "EHLO smtp-3.sys.kth.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932209AbcBPUkQ (ORCPT ); Tue, 16 Feb 2016 15:40:16 -0500 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH v4 6/8] dmaengine: rcar-dmac: add iommu support for slave transfers Date: Tue, 16 Feb 2016 21:39:42 +0100 Message-ID: <1455655184-14478-7-git-send-email-niklas.soderlund+renesas@ragnatech.se> In-Reply-To: <1455655184-14478-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> References: <1455655184-14478-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: vinod.koul@intel.com, 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, 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?= Message-ID: <20160216203942.Pv7SQR6aWV-NpUvSNLDph7OFB29-b-MdTUgEJd9AJjM@z> 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 | 52 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c index 743873c..6a24847 100644 --- a/drivers/dma/sh/rcar-dmac.c +++ b/drivers/dma/sh/rcar-dmac.c @@ -1106,21 +1106,63 @@ 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) +{ + enum dma_data_direction dir; + + /* + * 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, NULL); + slave->slave_addr = 0; + slave->xfer_size = 0; + } + + if (size) { + slave->slave_addr = dma_map_resource(chan->device->dev, addr, + size, dir, NULL); + + 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) -- 2.7.1