From: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se> 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, "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se> Subject: [PATCH v3 6/8] dmaengine: rcar-dmac: add iommu support for slave transfers Date: Wed, 10 Feb 2016 01:57:56 +0100 [thread overview] Message-ID: <1455065878-11906-7-git-send-email-niklas.soderlund+renesas@ragnatech.se> (raw) In-Reply-To: <1455065878-11906-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> Enable slave transfers to devices behind IPMMU:s by mapping the slave addresses using the dma-mapping API. Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> --- 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) -- 2.7.1
WARNING: multiple messages have this Message-ID (diff)
From: niklas.soderlund+renesas@ragnatech.se (Niklas Söderlund) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 6/8] dmaengine: rcar-dmac: add iommu support for slave transfers Date: Wed, 10 Feb 2016 01:57:56 +0100 [thread overview] Message-ID: <1455065878-11906-7-git-send-email-niklas.soderlund+renesas@ragnatech.se> (raw) In-Reply-To: <1455065878-11906-1-git-send-email-niklas.soderlund+renesas@ragnatech.se> Enable slave transfers to devices behind IPMMU:s by mapping the slave addresses using the dma-mapping API. Signed-off-by: Niklas S?derlund <niklas.soderlund+renesas@ragnatech.se> --- 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) -- 2.7.1
next prev parent reply other threads:[~2016-02-10 1:05 UTC|newest] Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-10 0:57 [PATCH v3 0/8] dmaengine: rcar-dmac: add iommu support for slave transfers Niklas Söderlund 2016-02-10 0:57 ` Niklas Söderlund 2016-02-10 0:57 ` [PATCH v3 1/8] iommu: Add MMIO mapping type Niklas Söderlund 2016-02-10 0:57 ` Niklas Söderlund 2016-02-11 0:02 ` Laurent Pinchart 2016-02-11 0:02 ` Laurent Pinchart 2016-02-11 0:02 ` Laurent Pinchart 2016-02-11 0:02 ` Laurent Pinchart 2016-02-11 15:57 ` Robin Murphy 2016-02-11 15:57 ` Robin Murphy 2016-02-11 15:57 ` Robin Murphy 2016-02-16 12:06 ` Niklas Söderlund 2016-02-16 12:06 ` Niklas Söderlund 2016-02-16 12:06 ` Niklas Söderlund 2016-02-16 12:06 ` Niklas Söderlund 2016-02-16 12:43 ` Robin Murphy 2016-02-16 12:43 ` Robin Murphy 2016-02-16 12:43 ` Robin Murphy 2016-02-16 13:30 ` Niklas Söderlund 2016-02-16 13:30 ` Niklas Söderlund 2016-02-16 13:30 ` Niklas Söderlund 2016-02-10 0:57 ` [PATCH v3 2/8] dma-mapping: add {map,unmap}_resource to dma_map_ops Niklas Söderlund 2016-02-10 0:57 ` Niklas Söderlund 2016-02-10 12:11 ` Sergei Shtylyov 2016-02-10 12:11 ` Sergei Shtylyov 2016-02-11 0:03 ` Laurent Pinchart 2016-02-11 0:03 ` [PATCH v3 2/8] dma-mapping: add {map, unmap}_resource " Laurent Pinchart 2016-02-11 0:03 ` [PATCH v3 2/8] dma-mapping: add {map,unmap}_resource " Laurent Pinchart 2016-02-10 0:57 ` [PATCH v3 3/8] dma-mapping: add dma_{map,unmap}_resource Niklas Söderlund 2016-02-10 0:57 ` Niklas Söderlund 2016-02-10 10:25 ` Robin Murphy 2016-02-10 10:25 ` Robin Murphy 2016-02-10 10:25 ` Robin Murphy 2016-02-10 0:57 ` [PATCH v3 4/8] arm: dma-mapping: add {map,unmap}_resource for iommu ops Niklas Söderlund 2016-02-10 0:57 ` [PATCH v3 4/8] arm: dma-mapping: add {map, unmap}_resource " Niklas Söderlund 2016-02-11 0:12 ` [PATCH v3 4/8] arm: dma-mapping: add {map,unmap}_resource " Laurent Pinchart 2016-02-11 0:12 ` [PATCH v3 4/8] arm: dma-mapping: add {map, unmap}_resource " Laurent Pinchart 2016-02-11 0:12 ` [PATCH v3 4/8] arm: dma-mapping: add {map,unmap}_resource " Laurent Pinchart 2016-02-10 0:57 ` [PATCH v3 5/8] dmaengine: rcar-dmac: group slave configuration Niklas Söderlund 2016-02-10 0:57 ` Niklas Söderlund 2016-02-11 0:14 ` Laurent Pinchart 2016-02-11 0:14 ` Laurent Pinchart 2016-02-11 0:14 ` Laurent Pinchart 2016-02-10 0:57 ` Niklas Söderlund [this message] 2016-02-10 0:57 ` [PATCH v3 6/8] dmaengine: rcar-dmac: add iommu support for slave transfers Niklas Söderlund 2016-02-10 10:49 ` Robin Murphy 2016-02-10 10:49 ` Robin Murphy 2016-02-10 10:49 ` Robin Murphy 2016-02-11 0:33 ` Laurent Pinchart 2016-02-11 0:33 ` Laurent Pinchart 2016-02-11 0:33 ` Laurent Pinchart 2016-02-11 0:33 ` Laurent Pinchart 2016-02-10 0:57 ` [PATCH v3 7/8] ARM: dts: r8a7790: add iommus to dmac0 and dmac1 Niklas Söderlund 2016-02-10 0:57 ` Niklas Söderlund 2016-02-10 17:55 ` Simon Horman 2016-02-10 17:55 ` Simon Horman 2016-02-11 0:50 ` Niklas Söderlund 2016-02-11 0:50 ` Niklas Söderlund 2016-02-11 0:41 ` Laurent Pinchart 2016-02-11 0:41 ` Laurent Pinchart 2016-02-11 0:41 ` Laurent Pinchart 2016-02-10 0:57 ` [PATCH v3 8/8] ARM: dts: r8a7791: " Niklas Söderlund 2016-02-10 0:57 ` Niklas Söderlund
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1455065878-11906-7-git-send-email-niklas.soderlund+renesas@ragnatech.se \ --to=niklas.soderlund+renesas@ragnatech.se \ --cc=arnd@arndb.de \ --cc=dan.j.williams@intel.com \ --cc=dmaengine@vger.kernel.org \ --cc=geert+renesas@glider.be \ --cc=iommu@lists.linux-foundation.org \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=robin.murphy@arm.com \ --cc=vinod.koul@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.