diff options
| author | Narayanan G <narayanan.gopalakrishnan@stericsson.com> | 2011-09-29 16:37:48 +0530 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 13:01:51 +0200 |
| commit | f9519dd52ef76f7f90842cf50b9146a5ed71e286 (patch) | |
| tree | 3ec1b0b11964e83a9bb1f96fae7762f8b3397fa3 | |
| parent | 0a97d70a168face24f84113a86b468c2e24d7016 (diff) | |
Revert "dma40: combine desc init functions"
This patch is introducing a bug in width/maxburst.
Hence, Will fix and update a new patch
This reverts commit a6ea748b15c4932e17ebc516cf9a74f09ceb1d67.
Change-Id: I6ea178f433e37f688aaa579788679a41ba5e8ca6
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32504
Tested-by: Narayanan GOPALAKRISHNAN <narayanan.gopalakrishnan@stericsson.com>
Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
| -rw-r--r-- | drivers/dma/ste_dma40.c | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 750de9495cb..42d5b3eea80 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -1953,26 +1953,6 @@ _exit: } -static struct d40_desc * -d40_prep_desc(struct d40_chan *chan, struct scatterlist *sg, - unsigned int sg_len, unsigned long dma_flags) -{ - struct d40_desc *desc; - - desc = d40_desc_get(chan); - if (!desc) - return NULL; - - desc->lli_len = sg_len; - desc->lli_current = 0; - desc->txd.flags = dma_flags; - desc->txd.tx_submit = d40_tx_submit; - - dma_async_tx_descriptor_init(&desc->txd, &chan->chan); - - return desc; -} - struct dma_async_tx_descriptor *stedma40_memcpy_sg(struct dma_chan *chan, struct scatterlist *sgl_dst, struct scatterlist *sgl_src, @@ -1991,12 +1971,15 @@ struct dma_async_tx_descriptor *stedma40_memcpy_sg(struct dma_chan *chan, } spin_lock_irqsave(&d40c->lock, flags); + d40d = d40_desc_get(d40c); - d40d = d40_prep_desc(d40c, sgl_dst, sgl_len, dma_flags); - - if (!d40d) + if (d40d == NULL) goto err; + d40d->lli_len = sgl_len; + d40d->lli_current = 0; + d40d->txd.flags = dma_flags; + if (chan_is_logical(d40c)) { if (d40_pool_lli_alloc(d40c, d40d, sgl_len, true) < 0) { @@ -2054,6 +2037,10 @@ struct dma_async_tx_descriptor *stedma40_memcpy_sg(struct dma_chan *chan, d40d->lli_pool.size, DMA_TO_DEVICE); } + dma_async_tx_descriptor_init(&d40d->txd, chan); + + d40d->txd.tx_submit = d40_tx_submit; + spin_unlock_irqrestore(&d40c->lock, flags); return &d40d->txd; @@ -2293,6 +2280,9 @@ static int d40_prep_slave_sg_log(struct d40_desc *d40d, return -ENOMEM; } + d40d->lli_len = sg_len; + d40d->lli_current = 0; + if (direction == DMA_FROM_DEVICE) dev_addr = d40_dev_rx_addr(d40c); else if (direction == DMA_TO_DEVICE) @@ -2329,6 +2319,9 @@ static int d40_prep_slave_sg_phy(struct d40_desc *d40d, return -ENOMEM; } + d40d->lli_len = sgl_len; + d40d->lli_current = 0; + if (direction == DMA_FROM_DEVICE) { dst_dev_addr = 0; src_dev_addr = d40_dev_rx_addr(d40c); @@ -2387,7 +2380,7 @@ d40_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, } spin_lock_irqsave(&d40c->lock, flags); - d40d = d40_prep_desc(d40c, sgl, sg_len, dma_flags); + d40d = d40_desc_get(d40c); if (d40d == NULL) goto err; @@ -2407,6 +2400,12 @@ d40_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, goto err; } + d40d->txd.flags = dma_flags; + + dma_async_tx_descriptor_init(&d40d->txd, chan); + + d40d->txd.tx_submit = d40_tx_submit; + spin_unlock_irqrestore(&d40c->lock, flags); return &d40d->txd; |