Skip to content

Commit

Permalink
dmaengine/ste_dma40: add a separate queue for pending requests
Browse files Browse the repository at this point in the history
tx_submit will add descriptors to the pending queue. Issue pending
will then move the pending descriptors to the transfer queue.

Signed-off-by: Per Forlin <per.forlin@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  • Loading branch information
Per Forlin authored and Vinod Koul committed Jul 13, 2011
1 parent 70f1891 commit a8f3067
Showing 1 changed file with 24 additions and 2 deletions.
26 changes: 24 additions & 2 deletions drivers/dma/ste_dma40.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ struct d40_chan {
struct dma_chan chan;
struct tasklet_struct tasklet;
struct list_head client;
struct list_head pending_queue;
struct list_head active;
struct list_head queue;
struct stedma40_chan_cfg dma_cfg;
Expand Down Expand Up @@ -644,7 +645,20 @@ static struct d40_desc *d40_first_active_get(struct d40_chan *d40c)

static void d40_desc_queue(struct d40_chan *d40c, struct d40_desc *desc)
{
list_add_tail(&desc->node, &d40c->queue);
list_add_tail(&desc->node, &d40c->pending_queue);
}

static struct d40_desc *d40_first_pending(struct d40_chan *d40c)
{
struct d40_desc *d;

if (list_empty(&d40c->pending_queue))
return NULL;

d = list_first_entry(&d40c->pending_queue,
struct d40_desc,
node);
return d;
}

static struct d40_desc *d40_first_queued(struct d40_chan *d40c)
Expand Down Expand Up @@ -801,6 +815,11 @@ static void d40_term_all(struct d40_chan *d40c)
d40_desc_free(d40c, d40d);
}

/* Release pending descriptors */
while ((d40d = d40_first_pending(d40c))) {
d40_desc_remove(d40d);
d40_desc_free(d40c, d40d);
}

d40c->pending_tx = 0;
d40c->busy = false;
Expand Down Expand Up @@ -2151,7 +2170,9 @@ static void d40_issue_pending(struct dma_chan *chan)

spin_lock_irqsave(&d40c->lock, flags);

/* Busy means that pending jobs are already being processed */
list_splice_tail_init(&d40c->pending_queue, &d40c->queue);

/* Busy means that queued jobs are already being processed */
if (!d40c->busy)
(void) d40_queue_start(d40c);

Expand Down Expand Up @@ -2340,6 +2361,7 @@ static void __init d40_chan_init(struct d40_base *base, struct dma_device *dma,

INIT_LIST_HEAD(&d40c->active);
INIT_LIST_HEAD(&d40c->queue);
INIT_LIST_HEAD(&d40c->pending_queue);
INIT_LIST_HEAD(&d40c->client);

tasklet_init(&d40c->tasklet, dma_tasklet,
Expand Down

0 comments on commit a8f3067

Please sign in to comment.