|
@@ -545,6 +545,8 @@ struct dma_pl330_chan {
|
|
|
|
|
|
/* List of to be xfered descriptors */
|
|
|
struct list_head work_list;
|
|
|
+ /* List of completed descriptors */
|
|
|
+ struct list_head completed_list;
|
|
|
|
|
|
/* Pointer to the DMAC that manages this channel,
|
|
|
* NULL if the channel is available to be acquired.
|
|
@@ -2198,66 +2200,6 @@ to_desc(struct dma_async_tx_descriptor *tx)
|
|
|
return container_of(tx, struct dma_pl330_desc, txd);
|
|
|
}
|
|
|
|
|
|
-static inline void free_desc_list(struct list_head *list)
|
|
|
-{
|
|
|
- struct dma_pl330_dmac *pdmac;
|
|
|
- struct dma_pl330_desc *desc;
|
|
|
- struct dma_pl330_chan *pch = NULL;
|
|
|
- unsigned long flags;
|
|
|
-
|
|
|
- /* Finish off the work list */
|
|
|
- list_for_each_entry(desc, list, node) {
|
|
|
- dma_async_tx_callback callback;
|
|
|
- void *param;
|
|
|
-
|
|
|
- /* All desc in a list belong to same channel */
|
|
|
- pch = desc->pchan;
|
|
|
- callback = desc->txd.callback;
|
|
|
- param = desc->txd.callback_param;
|
|
|
-
|
|
|
- if (callback)
|
|
|
- callback(param);
|
|
|
-
|
|
|
- desc->pchan = NULL;
|
|
|
- }
|
|
|
-
|
|
|
- /* pch will be unset if list was empty */
|
|
|
- if (!pch)
|
|
|
- return;
|
|
|
-
|
|
|
- pdmac = pch->dmac;
|
|
|
-
|
|
|
- spin_lock_irqsave(&pdmac->pool_lock, flags);
|
|
|
- list_splice_tail_init(list, &pdmac->desc_pool);
|
|
|
- spin_unlock_irqrestore(&pdmac->pool_lock, flags);
|
|
|
-}
|
|
|
-
|
|
|
-static inline void handle_cyclic_desc_list(struct list_head *list)
|
|
|
-{
|
|
|
- struct dma_pl330_desc *desc;
|
|
|
- struct dma_pl330_chan *pch = NULL;
|
|
|
- unsigned long flags;
|
|
|
-
|
|
|
- list_for_each_entry(desc, list, node) {
|
|
|
- dma_async_tx_callback callback;
|
|
|
-
|
|
|
- /* Change status to reload it */
|
|
|
- desc->status = PREP;
|
|
|
- pch = desc->pchan;
|
|
|
- callback = desc->txd.callback;
|
|
|
- if (callback)
|
|
|
- callback(desc->txd.callback_param);
|
|
|
- }
|
|
|
-
|
|
|
- /* pch will be unset if list was empty */
|
|
|
- if (!pch)
|
|
|
- return;
|
|
|
-
|
|
|
- spin_lock_irqsave(&pch->lock, flags);
|
|
|
- list_splice_tail_init(list, &pch->work_list);
|
|
|
- spin_unlock_irqrestore(&pch->lock, flags);
|
|
|
-}
|
|
|
-
|
|
|
static inline void fill_queue(struct dma_pl330_chan *pch)
|
|
|
{
|
|
|
struct dma_pl330_desc *desc;
|
|
@@ -2291,7 +2233,6 @@ static void pl330_tasklet(unsigned long data)
|
|
|
struct dma_pl330_chan *pch = (struct dma_pl330_chan *)data;
|
|
|
struct dma_pl330_desc *desc, *_dt;
|
|
|
unsigned long flags;
|
|
|
- LIST_HEAD(list);
|
|
|
|
|
|
spin_lock_irqsave(&pch->lock, flags);
|
|
|
|
|
@@ -2300,7 +2241,7 @@ static void pl330_tasklet(unsigned long data)
|
|
|
if (desc->status == DONE) {
|
|
|
if (!pch->cyclic)
|
|
|
dma_cookie_complete(&desc->txd);
|
|
|
- list_move_tail(&desc->node, &list);
|
|
|
+ list_move_tail(&desc->node, &pch->completed_list);
|
|
|
}
|
|
|
|
|
|
/* Try to submit a req imm. next to the last completed cookie */
|
|
@@ -2309,12 +2250,31 @@ static void pl330_tasklet(unsigned long data)
|
|
|
/* Make sure the PL330 Channel thread is active */
|
|
|
pl330_chan_ctrl(pch->pl330_chid, PL330_OP_START);
|
|
|
|
|
|
- spin_unlock_irqrestore(&pch->lock, flags);
|
|
|
+ while (!list_empty(&pch->completed_list)) {
|
|
|
+ dma_async_tx_callback callback;
|
|
|
+ void *callback_param;
|
|
|
|
|
|
- if (pch->cyclic)
|
|
|
- handle_cyclic_desc_list(&list);
|
|
|
- else
|
|
|
- free_desc_list(&list);
|
|
|
+ desc = list_first_entry(&pch->completed_list,
|
|
|
+ struct dma_pl330_desc, node);
|
|
|
+
|
|
|
+ callback = desc->txd.callback;
|
|
|
+ callback_param = desc->txd.callback_param;
|
|
|
+
|
|
|
+ if (pch->cyclic) {
|
|
|
+ desc->status = PREP;
|
|
|
+ list_move_tail(&desc->node, &pch->work_list);
|
|
|
+ } else {
|
|
|
+ desc->status = FREE;
|
|
|
+ list_move_tail(&desc->node, &pch->dmac->desc_pool);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (callback) {
|
|
|
+ spin_unlock_irqrestore(&pch->lock, flags);
|
|
|
+ callback(callback_param);
|
|
|
+ spin_lock_irqsave(&pch->lock, flags);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ spin_unlock_irqrestore(&pch->lock, flags);
|
|
|
}
|
|
|
|
|
|
static void dma_pl330_rqcb(void *token, enum pl330_op_err err)
|
|
@@ -2409,7 +2369,7 @@ static int pl330_alloc_chan_resources(struct dma_chan *chan)
|
|
|
static int pl330_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, unsigned long arg)
|
|
|
{
|
|
|
struct dma_pl330_chan *pch = to_pchan(chan);
|
|
|
- struct dma_pl330_desc *desc, *_dt;
|
|
|
+ struct dma_pl330_desc *desc;
|
|
|
unsigned long flags;
|
|
|
struct dma_pl330_dmac *pdmac = pch->dmac;
|
|
|
struct dma_slave_config *slave_config;
|
|
@@ -2423,12 +2383,18 @@ static int pl330_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, unsigned
|
|
|
pl330_chan_ctrl(pch->pl330_chid, PL330_OP_FLUSH);
|
|
|
|
|
|
/* Mark all desc done */
|
|
|
- list_for_each_entry_safe(desc, _dt, &pch->work_list , node) {
|
|
|
- desc->status = DONE;
|
|
|
- list_move_tail(&desc->node, &list);
|
|
|
+ list_for_each_entry(desc, &pch->work_list , node) {
|
|
|
+ desc->status = FREE;
|
|
|
+ dma_cookie_complete(&desc->txd);
|
|
|
+ }
|
|
|
+
|
|
|
+ list_for_each_entry(desc, &pch->completed_list , node) {
|
|
|
+ desc->status = FREE;
|
|
|
+ dma_cookie_complete(&desc->txd);
|
|
|
}
|
|
|
|
|
|
- list_splice_tail_init(&list, &pdmac->desc_pool);
|
|
|
+ list_splice_tail_init(&pch->work_list, &pdmac->desc_pool);
|
|
|
+ list_splice_tail_init(&pch->completed_list, &pdmac->desc_pool);
|
|
|
spin_unlock_irqrestore(&pch->lock, flags);
|
|
|
break;
|
|
|
case DMA_SLAVE_CONFIG:
|
|
@@ -2979,6 +2945,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
|
|
|
pch->chan.private = adev->dev.of_node;
|
|
|
|
|
|
INIT_LIST_HEAD(&pch->work_list);
|
|
|
+ INIT_LIST_HEAD(&pch->completed_list);
|
|
|
spin_lock_init(&pch->lock);
|
|
|
pch->pl330_chid = NULL;
|
|
|
pch->chan.device = pd;
|