From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robin Murphy Subject: Re: [PATCH v3 6/8] dmaengine: rcar-dmac: add iommu support for slave transfers Date: Wed, 10 Feb 2016 10:49:31 +0000 Message-ID: <56BB15BB.30806@arm.com> References: <1455065878-11906-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> <1455065878-11906-7-git-send-email-niklas.soderlund+renesas@ragnatech.se> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1455065878-11906-7-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: =?UTF-8?Q?Niklas_S=c3=b6derlund?= , 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, arnd-r2nGTMty4D4@public.gmane.org, geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org, vinod.koul-ral2JQCrhuEAvxtiuMwx3w@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 T24gMTAvMDIvMTYgMDA6NTcsIE5pa2xhcyBTw7ZkZXJsdW5kIHdyb3RlOgo+IEVuYWJsZSBzbGF2 ZSB0cmFuc2ZlcnMgdG8gZGV2aWNlcyBiZWhpbmQgSVBNTVU6cyBieSBtYXBwaW5nIHRoZSBzbGF2 ZQo+IGFkZHJlc3NlcyB1c2luZyB0aGUgZG1hLW1hcHBpbmcgQVBJLgo+Cj4gU2lnbmVkLW9mZi1i eTogTmlrbGFzIFPDtmRlcmx1bmQgPG5pa2xhcy5zb2Rlcmx1bmQrcmVuZXNhc0ByYWduYXRlY2gu c2U+Cj4gLS0tCj4gICBkcml2ZXJzL2RtYS9zaC9yY2FyLWRtYWMuYyB8IDU3ICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0KPiAgIDEgZmlsZSBjaGFuZ2VkLCA1 MiBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv ZG1hL3NoL3JjYXItZG1hYy5jIGIvZHJpdmVycy9kbWEvc2gvcmNhci1kbWFjLmMKPiBpbmRleCA3 NDM4NzNjLi4yNjg0MDdjIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZG1hL3NoL3JjYXItZG1hYy5j Cj4gKysrIGIvZHJpdmVycy9kbWEvc2gvcmNhci1kbWFjLmMKPiBAQCAtMTEwNiwyMSArMTEwNiw2 OCBAQCByY2FyX2RtYWNfcHJlcF9kbWFfY3ljbGljKHN0cnVjdCBkbWFfY2hhbiAqY2hhbiwgZG1h X2FkZHJfdCBidWZfYWRkciwKPiAgIAlyZXR1cm4gZGVzYzsKPiAgIH0KPgo+ICtzdGF0aWMgaW50 IHJjYXJfZG1hY19zZXRfc2xhdmVfYWRkcihzdHJ1Y3QgZG1hX2NoYW4gKmNoYW4sCj4gKwkJCQkg ICAgIHN0cnVjdCByY2FyX2RtYWNfY2hhbl9zbGF2ZSAqc2xhdmUsCj4gKwkJCQkgICAgIHBoeXNf YWRkcl90IGFkZHIsIHNpemVfdCBzaXplKQo+ICt7Cj4gKwlzdHJ1Y3QgZG1hX2F0dHJzIGF0dHJz Owo+ICsJZW51bSBkbWFfZGF0YV9kaXJlY3Rpb24gZGlyOwo+ICsKPiArCWluaXRfZG1hX2F0dHJz KCZhdHRycyk7Cj4gKwlkbWFfc2V0X2F0dHIoRE1BX0FUVFJfTk9fS0VSTkVMX01BUFBJTkcsICZh dHRycyk7Cj4gKwlkbWFfc2V0X2F0dHIoRE1BX0FUVFJfU0tJUF9DUFVfU1lOQywgJmF0dHJzKTsK Ck5vdyB0aGF0IHdlIGhhdmUgYSB3YXkgdG8gZGVhbCB3aXRoIE1NSU8gYWRkcmVzc2VzIHByb3Bl cmx5LCB3ZSBkb24ndCAKbmVlZCB0aGVzZSBhbnkgbW9yZS4KClJvYmluLgoKPiArCj4gKwkvKgo+ ICsJICogV2UgY2FuJ3Qga25vdyB0aGUgZGlyZWN0aW9uIGF0IHRoaXMgdGltZSwgc2VlIGRvY3Vt ZW50YXRpb24gZm9yCj4gKwkgKiAnZGlyZWN0aW9uJyBpbiBzdHJ1Y3QgZG1hX3NsYXZlX2NvbmZp Zy4KPiArCSAqLwo+ICsJZGlyID0gRE1BX0JJRElSRUNUSU9OQUw7Cj4gKwo+ICsJaWYgKHNsYXZl LT54ZmVyX3NpemUpIHsKPiArCQlkbWFfdW5tYXBfcmVzb3VyY2UoY2hhbi0+ZGV2aWNlLT5kZXYs IHNsYXZlLT5zbGF2ZV9hZGRyLAo+ICsJCQkJc2xhdmUtPnhmZXJfc2l6ZSwgZGlyLCAmYXR0cnMp Owo+ICsJCXNsYXZlLT5zbGF2ZV9hZGRyID0gMDsKPiArCQlzbGF2ZS0+eGZlcl9zaXplID0gMDsK PiArCX0KPiArCj4gKwlpZiAoc2l6ZSkgewo+ICsJCXNsYXZlLT5zbGF2ZV9hZGRyID0gZG1hX21h cF9yZXNvdXJjZShjaGFuLT5kZXZpY2UtPmRldiwgYWRkciwKPiArCQkJCXNpemUsIGRpciwgJmF0 dHJzKTsKPiArCj4gKwkJaWYgKGRtYV9tYXBwaW5nX2Vycm9yKGNoYW4tPmRldmljZS0+ZGV2LCBz bGF2ZS0+c2xhdmVfYWRkcikpIHsKPiArCQkJc3RydWN0IHJjYXJfZG1hY19jaGFuICpyY2hhbiA9 IHRvX3JjYXJfZG1hY19jaGFuKGNoYW4pOwo+ICsKPiArCQkJZGV2X2VycihjaGFuLT5kZXZpY2Ut PmRldiwKPiArCQkJCQkiY2hhbiV1OiBmYWlsZWQgdG8gbWFwICV6eEAlcGFwIiwKPiArCQkJCQly Y2hhbi0+aW5kZXgsIHNpemUsICZhZGRyKTsKPiArCQkJcmV0dXJuIC1FSU87Cj4gKwkJfQo+ICsK PiArCQlzbGF2ZS0+eGZlcl9zaXplID0gc2l6ZTsKPiArCX0KPiArCj4gKwlyZXR1cm4gMDsKPiAr fQo+ICsKPiAgIHN0YXRpYyBpbnQgcmNhcl9kbWFjX2RldmljZV9jb25maWcoc3RydWN0IGRtYV9j aGFuICpjaGFuLAo+ICAgCQkJCSAgIHN0cnVjdCBkbWFfc2xhdmVfY29uZmlnICpjZmcpCj4gICB7 Cj4gICAJc3RydWN0IHJjYXJfZG1hY19jaGFuICpyY2hhbiA9IHRvX3JjYXJfZG1hY19jaGFuKGNo YW4pOwo+ICsJaW50IHJldDsKPgo+ICAgCS8qCj4gICAJICogV2UgY291bGQgbG9jayB0aGlzLCBi dXQgeW91IHNob3VsZG4ndCBiZSBjb25maWd1cmluZyB0aGUKPiAgIAkgKiBjaGFubmVsLCB3aGls ZSB1c2luZyBpdC4uLgo+ICAgCSAqLwo+IC0JcmNoYW4tPnNyYy5zbGF2ZV9hZGRyID0gY2ZnLT5z cmNfYWRkcjsKPiAtCXJjaGFuLT5kc3Quc2xhdmVfYWRkciA9IGNmZy0+ZHN0X2FkZHI7Cj4gLQly Y2hhbi0+c3JjLnhmZXJfc2l6ZSA9IGNmZy0+c3JjX2FkZHJfd2lkdGg7Cj4gLQlyY2hhbi0+ZHN0 LnhmZXJfc2l6ZSA9IGNmZy0+ZHN0X2FkZHJfd2lkdGg7Cj4KPiAtCXJldHVybiAwOwo+ICsJcmV0 ID0gcmNhcl9kbWFjX3NldF9zbGF2ZV9hZGRyKGNoYW4sICZyY2hhbi0+c3JjLCBjZmctPnNyY19h ZGRyLAo+ICsJCQljZmctPnNyY19hZGRyX3dpZHRoKTsKPiArCWlmIChyZXQpCj4gKwkJcmV0dXJu IHJldDsKPiArCj4gKwlyZXQgPSByY2FyX2RtYWNfc2V0X3NsYXZlX2FkZHIoY2hhbiwgJnJjaGFu LT5kc3QsIGNmZy0+ZHN0X2FkZHIsCj4gKwkJCWNmZy0+ZHN0X2FkZHJfd2lkdGgpOwo+ICsJcmV0 dXJuIHJldDsKPiAgIH0KPgo+ICAgc3RhdGljIGludCByY2FyX2RtYWNfY2hhbl90ZXJtaW5hdGVf YWxsKHN0cnVjdCBkbWFfY2hhbiAqY2hhbikKPgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KaW9tbXUgbWFpbGluZyBsaXN0CmlvbW11QGxpc3RzLmxpbnV4 LWZvdW5kYXRpb24ub3JnCmh0dHBzOi8vbGlzdHMubGludXhmb3VuZGF0aW9uLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2lvbW11 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com ([217.140.101.70]:46176 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754435AbcBJKte (ORCPT ); Wed, 10 Feb 2016 05:49:34 -0500 Subject: Re: [PATCH v3 6/8] dmaengine: rcar-dmac: add iommu support for slave transfers References: <1455065878-11906-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> <1455065878-11906-7-git-send-email-niklas.soderlund+renesas@ragnatech.se> From: Robin Murphy Message-ID: <56BB15BB.30806@arm.com> Date: Wed, 10 Feb 2016 10:49:31 +0000 MIME-Version: 1.0 In-Reply-To: <1455065878-11906-7-git-send-email-niklas.soderlund+renesas@ragnatech.se> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: =?UTF-8?Q?Niklas_S=c3=b6derlund?= , 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: linux-arch@vger.kernel.org, arnd@arndb.de, geert+renesas@glider.be, vinod.koul@intel.com, linus.walleij@linaro.org, laurent.pinchart@ideasonboard.com, dan.j.williams@intel.com Message-ID: <20160210104931.YXs7D2VKzeP8Xr9iisF7MAsaDG35HWBFhWXAf66kjxo@z> On 10/02/16 00:57, Niklas Söderlund wrote: > 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 | 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); Now that we have a way to deal with MMIO addresses properly, we don't need these any more. Robin. > + > + /* > + * 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) >