Commit 99efdb3e authored by Sinan Kaya's avatar Sinan Kaya Committed by Vinod Koul

dmaengine: qcom_hidma: correct API violation for submit

Current code is violating the DMA Engine API by putting the submitted
requests directly into the HW queue. This causes queued transactions
to be started by another thread as soon as the first one finishes.

The DMA Engine document clearly states this.

"dmaengine_submit() will not start the DMA operation".

Move HW queuing of the requests into the issue_pending() routine
to comply with API requirements also create a new queued state for
temporarily holding the requests.

A descriptor goes through these transitions now.

free->prepared->queued->active->completed->free

as opposed to

free->prepared->active->completed->free
Signed-off-by: default avatarSinan Kaya <okaya@codeaurora.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 82474dad
...@@ -210,6 +210,7 @@ static int hidma_chan_init(struct hidma_dev *dmadev, u32 dma_sig) ...@@ -210,6 +210,7 @@ static int hidma_chan_init(struct hidma_dev *dmadev, u32 dma_sig)
INIT_LIST_HEAD(&mchan->prepared); INIT_LIST_HEAD(&mchan->prepared);
INIT_LIST_HEAD(&mchan->active); INIT_LIST_HEAD(&mchan->active);
INIT_LIST_HEAD(&mchan->completed); INIT_LIST_HEAD(&mchan->completed);
INIT_LIST_HEAD(&mchan->queued);
spin_lock_init(&mchan->lock); spin_lock_init(&mchan->lock);
list_add_tail(&mchan->chan.device_node, &ddev->channels); list_add_tail(&mchan->chan.device_node, &ddev->channels);
...@@ -230,9 +231,15 @@ static void hidma_issue_pending(struct dma_chan *dmach) ...@@ -230,9 +231,15 @@ static void hidma_issue_pending(struct dma_chan *dmach)
struct hidma_chan *mchan = to_hidma_chan(dmach); struct hidma_chan *mchan = to_hidma_chan(dmach);
struct hidma_dev *dmadev = mchan->dmadev; struct hidma_dev *dmadev = mchan->dmadev;
unsigned long flags; unsigned long flags;
struct hidma_desc *qdesc, *next;
int status; int status;
spin_lock_irqsave(&mchan->lock, flags); spin_lock_irqsave(&mchan->lock, flags);
list_for_each_entry_safe(qdesc, next, &mchan->queued, node) {
hidma_ll_queue_request(dmadev->lldev, qdesc->tre_ch);
list_move_tail(&qdesc->node, &mchan->active);
}
if (!mchan->running) { if (!mchan->running) {
struct hidma_desc *desc = list_first_entry(&mchan->active, struct hidma_desc *desc = list_first_entry(&mchan->active,
struct hidma_desc, struct hidma_desc,
...@@ -315,17 +322,18 @@ static dma_cookie_t hidma_tx_submit(struct dma_async_tx_descriptor *txd) ...@@ -315,17 +322,18 @@ static dma_cookie_t hidma_tx_submit(struct dma_async_tx_descriptor *txd)
pm_runtime_put_autosuspend(dmadev->ddev.dev); pm_runtime_put_autosuspend(dmadev->ddev.dev);
return -ENODEV; return -ENODEV;
} }
pm_runtime_mark_last_busy(dmadev->ddev.dev);
pm_runtime_put_autosuspend(dmadev->ddev.dev);
mdesc = container_of(txd, struct hidma_desc, desc); mdesc = container_of(txd, struct hidma_desc, desc);
spin_lock_irqsave(&mchan->lock, irqflags); spin_lock_irqsave(&mchan->lock, irqflags);
/* Move descriptor to active */ /* Move descriptor to queued */
list_move_tail(&mdesc->node, &mchan->active); list_move_tail(&mdesc->node, &mchan->queued);
/* Update cookie */ /* Update cookie */
cookie = dma_cookie_assign(txd); cookie = dma_cookie_assign(txd);
hidma_ll_queue_request(dmadev->lldev, mdesc->tre_ch);
spin_unlock_irqrestore(&mchan->lock, irqflags); spin_unlock_irqrestore(&mchan->lock, irqflags);
return cookie; return cookie;
...@@ -431,6 +439,7 @@ static int hidma_terminate_channel(struct dma_chan *chan) ...@@ -431,6 +439,7 @@ static int hidma_terminate_channel(struct dma_chan *chan)
list_splice_init(&mchan->active, &list); list_splice_init(&mchan->active, &list);
list_splice_init(&mchan->prepared, &list); list_splice_init(&mchan->prepared, &list);
list_splice_init(&mchan->completed, &list); list_splice_init(&mchan->completed, &list);
list_splice_init(&mchan->queued, &list);
spin_unlock_irqrestore(&mchan->lock, irqflags); spin_unlock_irqrestore(&mchan->lock, irqflags);
/* this suspends the existing transfer */ /* this suspends the existing transfer */
......
...@@ -104,6 +104,7 @@ struct hidma_chan { ...@@ -104,6 +104,7 @@ struct hidma_chan {
struct dma_chan chan; struct dma_chan chan;
struct list_head free; struct list_head free;
struct list_head prepared; struct list_head prepared;
struct list_head queued;
struct list_head active; struct list_head active;
struct list_head completed; struct list_head completed;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment