Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 185ecb5f authored by Alexandre Bounine's avatar Alexandre Bounine Committed by Vinod Koul
Browse files

dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic 



Add context parameter to device_prep_slave_sg() and device_prep_dma_cyclic()
interfaces to allow passing client/target specific information associated
with the data transfer.
Modify all affected DMA engine drivers.

Signed-off-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent 16052827

drivers/dma/amba-pl08x.c

+1 −1
Original line number Diff line number Diff line
@@ -1313,7 +1313,7 @@ static struct dma_async_tx_descriptor *pl08x_prep_dma_memcpy( 
static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(

		struct dma_chan *chan, struct scatterlist *sgl,

		unsigned int sg_len, enum dma_transfer_direction direction,

		unsigned long flags)

		unsigned long flags, void *context)

{

	struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);

	struct pl08x_driver_data *pl08x = plchan->host;

drivers/dma/at_hdmac.c

+5 −2
Original line number Diff line number Diff line
@@ -639,11 +639,12 @@ err_desc_get: 
 * @sg_len: number of entries in @scatterlist

 * @direction: DMA direction

 * @flags: tx descriptor status flags

 * @context: transaction context (ignored)

 */

static struct dma_async_tx_descriptor *

atc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,

		unsigned int sg_len, enum dma_transfer_direction direction,

		unsigned long flags)

		unsigned long flags, void *context)

{

	struct at_dma_chan	*atchan = to_at_dma_chan(chan);

	struct at_dma_slave	*atslave = chan->private;
@@ -840,10 +841,12 @@ atc_dma_cyclic_fill_desc(struct at_dma_slave *atslave, struct at_desc *desc, 
 * @buf_len: total number of bytes for the entire buffer

 * @period_len: number of bytes for each period

 * @direction: transfer direction, to or from device

 * @context: transfer context (ignored)

 */

static struct dma_async_tx_descriptor *

atc_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,

		size_t period_len, enum dma_transfer_direction direction)

		size_t period_len, enum dma_transfer_direction direction,

		void *context)

{

	struct at_dma_chan	*atchan = to_at_dma_chan(chan);

	struct at_dma_slave	*atslave = chan->private;

drivers/dma/coh901318.c

+1 −1
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ coh901318_prep_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, 
static struct dma_async_tx_descriptor *

coh901318_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,

			unsigned int sg_len, enum dma_transfer_direction direction,

			unsigned long flags)

			unsigned long flags, void *context)

{

	struct coh901318_chan *cohc = to_coh901318_chan(chan);

	struct coh901318_lli *lli;

drivers/dma/dw_dmac.c

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ err_desc_get: 
static struct dma_async_tx_descriptor *

dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,

		unsigned int sg_len, enum dma_transfer_direction direction,

		unsigned long flags)

		unsigned long flags, void *context)

{

	struct dw_dma_chan	*dwc = to_dw_dma_chan(chan);

	struct dw_dma_slave	*dws = chan->private;

drivers/dma/ep93xx_dma.c

+4 −2
Original line number Diff line number Diff line
@@ -975,13 +975,14 @@ fail: 
 * @sg_len: number of entries in @sgl

 * @dir: direction of tha DMA transfer

 * @flags: flags for the descriptor

 * @context: operation context (ignored)

 *

 * Returns a valid DMA descriptor or %NULL in case of failure.

 */

static struct dma_async_tx_descriptor *

ep93xx_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,

			 unsigned int sg_len, enum dma_transfer_direction dir,

			 unsigned long flags)

			 unsigned long flags, void *context)

{

	struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan);

	struct ep93xx_dma_desc *desc, *first;
@@ -1048,6 +1049,7 @@ fail: 
 * @buf_len: length of the buffer (in bytes)

 * @period_len: lenght of a single period

 * @dir: direction of the operation

 * @context: operation context (ignored)

 *

 * Prepares a descriptor for cyclic DMA operation. This means that once the

 * descriptor is submitted, we will be submitting in a @period_len sized
@@ -1060,7 +1062,7 @@ fail: 
static struct dma_async_tx_descriptor *

ep93xx_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,

			   size_t buf_len, size_t period_len,

			   enum dma_transfer_direction dir)

			   enum dma_transfer_direction dir, void *context)

{

	struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan);

	struct ep93xx_dma_desc *desc, *first;