Commit 907bd68a authored by Dirk Behme's avatar Dirk Behme Committed by Vinod Koul

dmaengine: sh: rcar-dmac: With cyclic DMA residue 0 is valid

Having a cyclic DMA, a residue 0 is not an indication of a completed
DMA. In case of cyclic DMA make sure that dma_set_residue() is called
and with this a residue of 0 is forwarded correctly to the caller.

Fixes: 3544d287 ("dmaengine: rcar-dmac: use result of updated get_residue in tx_status")
Signed-off-by: default avatarDirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: default avatarAchim Dahlhoff <Achim.Dahlhoff@de.bosch.com>
Signed-off-by: default avatarHiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: default avatarYao Lihua <ylhuajnu@outlook.com>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: <stable@vger.kernel.org> # v4.8+
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent f1473847
...@@ -1368,6 +1368,7 @@ static enum dma_status rcar_dmac_tx_status(struct dma_chan *chan, ...@@ -1368,6 +1368,7 @@ static enum dma_status rcar_dmac_tx_status(struct dma_chan *chan,
enum dma_status status; enum dma_status status;
unsigned long flags; unsigned long flags;
unsigned int residue; unsigned int residue;
bool cyclic;
status = dma_cookie_status(chan, cookie, txstate); status = dma_cookie_status(chan, cookie, txstate);
if (status == DMA_COMPLETE || !txstate) if (status == DMA_COMPLETE || !txstate)
...@@ -1375,10 +1376,11 @@ static enum dma_status rcar_dmac_tx_status(struct dma_chan *chan, ...@@ -1375,10 +1376,11 @@ static enum dma_status rcar_dmac_tx_status(struct dma_chan *chan,
spin_lock_irqsave(&rchan->lock, flags); spin_lock_irqsave(&rchan->lock, flags);
residue = rcar_dmac_chan_get_residue(rchan, cookie); residue = rcar_dmac_chan_get_residue(rchan, cookie);
cyclic = rchan->desc.running ? rchan->desc.running->cyclic : false;
spin_unlock_irqrestore(&rchan->lock, flags); spin_unlock_irqrestore(&rchan->lock, flags);
/* if there's no residue, the cookie is complete */ /* if there's no residue, the cookie is complete */
if (!residue) if (!residue && !cyclic)
return DMA_COMPLETE; return DMA_COMPLETE;
dma_set_residue(txstate, residue); dma_set_residue(txstate, residue);
......
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