dmaengine: stm32-dma: use vchan_terminate_vdesc() in .terminate_all
[ Upstream commit d80cbef35bf89b763f06e03bb4ff8f933bf012c5 ] To avoid race with vchan_complete, use the race free way to terminate running transfer. Move vdesc->node list_del in stm32_dma_start_transfer instead of in stm32_mdma_chan_complete to avoid another race in vchan_dma_desc_free_list. Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com> Link: https://lore.kernel.org/r/20200129153628.29329-9-amelie.delaunay@st.com Signed-off-by: Vinod Koul <vkoul@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
f60007c9e9
commit
cdf63c29af
|
@ -488,8 +488,10 @@ static int stm32_dma_terminate_all(struct dma_chan *c)
|
||||||
|
|
||||||
spin_lock_irqsave(&chan->vchan.lock, flags);
|
spin_lock_irqsave(&chan->vchan.lock, flags);
|
||||||
|
|
||||||
if (chan->busy) {
|
if (chan->desc) {
|
||||||
stm32_dma_stop(chan);
|
vchan_terminate_vdesc(&chan->desc->vdesc);
|
||||||
|
if (chan->busy)
|
||||||
|
stm32_dma_stop(chan);
|
||||||
chan->desc = NULL;
|
chan->desc = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -545,6 +547,8 @@ static void stm32_dma_start_transfer(struct stm32_dma_chan *chan)
|
||||||
if (!vdesc)
|
if (!vdesc)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
list_del(&vdesc->node);
|
||||||
|
|
||||||
chan->desc = to_stm32_dma_desc(vdesc);
|
chan->desc = to_stm32_dma_desc(vdesc);
|
||||||
chan->next_sg = 0;
|
chan->next_sg = 0;
|
||||||
}
|
}
|
||||||
|
@ -622,7 +626,6 @@ static void stm32_dma_handle_chan_done(struct stm32_dma_chan *chan)
|
||||||
} else {
|
} else {
|
||||||
chan->busy = false;
|
chan->busy = false;
|
||||||
if (chan->next_sg == chan->desc->num_sgs) {
|
if (chan->next_sg == chan->desc->num_sgs) {
|
||||||
list_del(&chan->desc->vdesc.node);
|
|
||||||
vchan_cookie_complete(&chan->desc->vdesc);
|
vchan_cookie_complete(&chan->desc->vdesc);
|
||||||
chan->desc = NULL;
|
chan->desc = NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue