From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>
Cc: 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, robin.murphy@arm.com,
geert+renesas@glider.be, linus.walleij@linaro.org,
dan.j.williams@intel.com, arnd@arndb.de,
linux-arch@vger.kernel.org
Subject: Re: [PATCH v5 6/9] dmaengine: rcar-dmac: group slave configuration
Date: Thu, 17 Mar 2016 13:28:50 +0200 [thread overview]
Message-ID: <5083144.aEzMy68lFX@avalon> (raw)
Message-ID: <20160317112850.gksZy2wCIxeZytkylG0MqZ6AhkQNZmkwwzTrEez51QM@z> (raw)
In-Reply-To: <1457404974-1800-7-git-send-email-niklas.soderlund+renesas@ragnatech.se>
Hi Niklas,
Thank you for the patch.
On Tuesday 08 March 2016 03:42:51 Niklas Söderlund wrote:
> Group slave address and transfer size in own structs for source and
> destination. This is in preparation for hooking up the dma-mapping API
> to the slave addresses.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/dma/sh/rcar-dmac.c | 38 ++++++++++++++++++++++----------------
> 1 file changed, 22 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c
> index 01cf82f..b3911fe 100644
> --- a/drivers/dma/sh/rcar-dmac.c
> +++ b/drivers/dma/sh/rcar-dmac.c
> @@ -118,14 +118,22 @@ struct rcar_dmac_desc_page {
> sizeof(struct rcar_dmac_xfer_chunk))
>
> /*
> + * struct rcar_dmac_chan_slave - Slave configuration
> + * @slave_addr: slave memory address
> + * @xfer_size: size (in bytes) of hardware transfers
> + */
> +struct rcar_dmac_chan_slave {
> + phys_addr_t slave_addr;
> + unsigned int xfer_size;
> +};
> +
> +/*
> * struct rcar_dmac_chan - R-Car Gen2 DMA Controller Channel
> * @chan: base DMA channel object
> * @iomem: channel I/O memory base
> * @index: index of this channel in the controller
> - * @src_xfer_size: size (in bytes) of hardware transfers on the source side
> - * @dst_xfer_size: size (in bytes) of hardware transfers on the
> destination side - * @src_slave_addr: slave source memory address
> - * @dst_slave_addr: slave destination memory address
> + * @src: slave memory address and size on the source side
> + * @dst: slave memory address and size on the destination side
> * @mid_rid: hardware MID/RID for the DMA client using this channel
> * @lock: protects the channel CHCR register and the desc members
> * @desc.free: list of free descriptors
> @@ -142,10 +150,8 @@ struct rcar_dmac_chan {
> void __iomem *iomem;
> unsigned int index;
>
> - unsigned int src_xfer_size;
> - unsigned int dst_xfer_size;
> - phys_addr_t src_slave_addr;
> - phys_addr_t dst_slave_addr;
> + struct rcar_dmac_chan_slave src;
> + struct rcar_dmac_chan_slave dst;
> int mid_rid;
>
> spinlock_t lock;
> @@ -793,13 +799,13 @@ static void rcar_dmac_chan_configure_desc(struct
> rcar_dmac_chan *chan, case DMA_DEV_TO_MEM:
> chcr = RCAR_DMACHCR_DM_INC | RCAR_DMACHCR_SM_FIXED
>
> | RCAR_DMACHCR_RS_DMARS;
>
> - xfer_size = chan->src_xfer_size;
> + xfer_size = chan->src.xfer_size;
> break;
>
> case DMA_MEM_TO_DEV:
> chcr = RCAR_DMACHCR_DM_FIXED | RCAR_DMACHCR_SM_INC
>
> | RCAR_DMACHCR_RS_DMARS;
>
> - xfer_size = chan->dst_xfer_size;
> + xfer_size = chan->dst.xfer_size;
> break;
>
> case DMA_MEM_TO_MEM:
> @@ -1038,7 +1044,7 @@ rcar_dmac_prep_slave_sg(struct dma_chan *chan, struct
> scatterlist *sgl, }
>
> dev_addr = dir == DMA_DEV_TO_MEM
> - ? rchan->src_slave_addr : rchan->dst_slave_addr;
> + ? rchan->src.slave_addr : rchan->dst.slave_addr;
> return rcar_dmac_chan_prep_sg(rchan, sgl, sg_len, dev_addr,
> dir, flags, false);
> }
> @@ -1093,7 +1099,7 @@ rcar_dmac_prep_dma_cyclic(struct dma_chan *chan,
> dma_addr_t buf_addr, }
>
> dev_addr = dir == DMA_DEV_TO_MEM
> - ? rchan->src_slave_addr : rchan->dst_slave_addr;
> + ? rchan->src.slave_addr : rchan->dst.slave_addr;
> desc = rcar_dmac_chan_prep_sg(rchan, sgl, sg_len, dev_addr,
> dir, flags, true);
>
> @@ -1110,10 +1116,10 @@ static int rcar_dmac_device_config(struct dma_chan
> *chan, * 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;
> + 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;
> }
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2016-03-17 16:43 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-08 2:42 [PATCH v5 0/9] dmaengine: rcar-dmac: add iommu support for slave transfers Niklas Söderlund
2016-03-08 2:42 ` Niklas Söderlund
2016-03-08 2:42 ` [PATCH v5 1/9] iommu: Add MMIO mapping type Niklas Söderlund
[not found] ` <1457404974-1800-2-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
2016-03-17 11:18 ` Laurent Pinchart
2016-03-17 11:18 ` Laurent Pinchart
2016-03-08 2:42 ` [PATCH v5 2/9] dma-mapping: add {map,unmap}_resource to dma_map_ops Niklas Söderlund
2016-03-08 2:42 ` Niklas Söderlund
[not found] ` <1457404974-1800-1-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
2016-03-08 2:42 ` [PATCH v5 3/9] dma-mapping: add dma_{map,unmap}_resource Niklas Söderlund
2016-03-08 2:42 ` Niklas Söderlund
2016-03-08 7:38 ` Christoph Hellwig
2016-03-10 16:05 ` Niklas S??derlund
2016-03-10 16:05 ` Niklas S??derlund
2016-03-11 6:19 ` Vinod Koul
2016-03-11 6:19 ` Vinod Koul
2016-03-11 6:47 ` Dan Williams
2016-03-11 6:47 ` Dan Williams
2016-03-11 11:15 ` Christoph Hellwig
2016-03-11 12:58 ` Niklas Söderlund
2016-03-11 12:58 ` Niklas Söderlund
2016-03-15 8:22 ` Christoph Hellwig
[not found] ` <20160315082254.GE9136-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2016-03-17 11:33 ` Laurent Pinchart
2016-03-17 11:33 ` Laurent Pinchart
2016-03-21 15:26 ` Christoph Hellwig
2016-03-21 15:26 ` Christoph Hellwig
[not found] ` <20160321152601.GA11674-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2016-04-13 13:29 ` Niklas Söderlund
2016-04-13 13:29 ` Niklas Söderlund
2016-04-21 9:48 ` Niklas Söderlund
2016-04-21 9:48 ` Niklas Söderlund
2016-04-21 13:49 ` Christoph Hellwig
2016-04-21 13:49 ` Christoph Hellwig
2016-04-25 14:26 ` Niklas Söderlund
2016-04-25 14:26 ` Niklas Söderlund
2016-04-25 19:10 ` Christoph Hellwig
2016-04-25 19:10 ` Christoph Hellwig
[not found] ` <20160425191004.GA13906-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2016-04-26 13:29 ` Niklas Söderlund
2016-04-26 13:29 ` Niklas Söderlund
[not found] ` <CAPcyv4gO4EZnBuVKXT8+gsMhbHJzuK7sfr0uRcjVdJP-nUUz4A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-03-11 13:46 ` Robin Murphy
2016-03-11 13:46 ` Robin Murphy
2016-03-11 17:51 ` Dan Williams
2016-03-08 2:42 ` [PATCH v5 4/9] arm: dma-mapping: add {map, unmap}_resource for iommu ops Niklas Söderlund
2016-03-08 2:42 ` [PATCH v5 4/9] arm: dma-mapping: add {map,unmap}_resource " Niklas Söderlund
2016-03-08 2:42 ` [PATCH v5 5/9] dmaengine: rcar-dmac: slave address are physical Niklas Söderlund
2016-03-08 2:42 ` Niklas Söderlund
[not found] ` <1457404974-1800-6-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
2016-03-17 11:30 ` Laurent Pinchart
2016-03-17 11:30 ` Laurent Pinchart
2016-03-08 2:42 ` [PATCH v5 6/9] dmaengine: rcar-dmac: group slave configuration Niklas Söderlund
2016-03-08 2:42 ` Niklas Söderlund
[not found] ` <1457404974-1800-7-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
2016-03-17 11:28 ` Laurent Pinchart [this message]
2016-03-17 11:28 ` Laurent Pinchart
2016-03-08 2:42 ` [PATCH v5 7/9] dmaengine: rcar-dmac: add iommu support for slave transfers Niklas Söderlund
2016-03-08 2:42 ` Niklas Söderlund
2016-03-08 2:42 ` [PATCH v5 8/9] ARM: dts: r8a7790: add iommus to dmac0 and dmac1 Niklas Söderlund
2016-03-08 2:42 ` Niklas Söderlund
2016-03-08 2:42 ` [PATCH v5 9/9] ARM: dts: r8a7791: " 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=5083144.aEzMy68lFX@avalon \
--to=laurent.pinchart@ideasonboard.com \
--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=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=niklas.soderlund+renesas@ragnatech.se \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).