i/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

k3dma: fix non-cyclic mode

Browse Source 
Commit 36387a2b1f ("k3dma: Fix
memory handling in preparation for cyclic mode") breaks the
logic around ds_run/ds_done in case of non-cyclic DMA.

Fix it reverting part of the commit.
Tested that both audio play and SPI works fine using the DMA
and that no memory leak is present.

Change-Id: I71d955ea9dc5db7b0056a359f5f8bae58ec3b1ef
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Antonio Borneo
2017-05-05 18:05:38 +02:00
committed by Antonio Borneo
parent 72eb40fdb7
commit 132986bef2
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/dma/k3dma.c
+4 -8
View File
@@ -223,7 +223,6 @@ static irqreturn_t k3_dma_int_handler(int irq, void *dev_id)
if (c && (tc1 & BIT(i))) { if (c && (tc1 & BIT(i))) {
spin_lock_irqsave(&c->vc.lock, flags); spin_lock_irqsave(&c->vc.lock, flags);
vchan_cookie_complete(&p->ds_run->vd); vchan_cookie_complete(&p->ds_run->vd);
WARN_ON_ONCE(p->ds_done);
p->ds_done = p->ds_run; p->ds_done = p->ds_run;
p->ds_run = NULL; p->ds_run = NULL;
spin_unlock_irqrestore(&c->vc.lock, flags); spin_unlock_irqrestore(&c->vc.lock, flags);
@@ -274,13 +273,14 @@ static int k3_dma_start_txd(struct k3_dma_chan *c)
*/ */
list_del(&ds->vd.node); list_del(&ds->vd.node);
WARN_ON_ONCE(c->phy->ds_run);
WARN_ON_ONCE(c->phy->ds_done);
c->phy->ds_run = ds; c->phy->ds_run = ds;
c->phy->ds_done = NULL;
/* start dma */ /* start dma */
k3_dma_set_desc(c->phy, &ds->desc_hw[0]); k3_dma_set_desc(c->phy, &ds->desc_hw[0]);
return 0; return 0;
} }
c->phy->ds_run = NULL;
c->phy->ds_done = NULL;
return -EAGAIN; return -EAGAIN;
} }
@@ -723,11 +723,7 @@ static int k3_dma_terminate_all(struct dma_chan *chan)
k3_dma_free_desc(&p->ds_run->vd); k3_dma_free_desc(&p->ds_run->vd);
p->ds_run = NULL; p->ds_run = NULL;
} }
if (p->ds_done) { p->ds_done = NULL;
k3_dma_free_desc(&p->ds_done->vd);
p->ds_done = NULL;
}
} }
spin_unlock_irqrestore(&c->vc.lock, flags); spin_unlock_irqrestore(&c->vc.lock, flags);
vchan_dma_desc_free_list(&c->vc, &head); vchan_dma_desc_free_list(&c->vc, &head);