Commit 3c4d9276 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Simon Horman

shdma: fixup sh_dmae_get_partial() calculation error

sh_desc->hw.tcr is controlling real data size,
and, register TCR is controlling data transfer count
which was xmit_shifted value of hw.tcr.
Current sh_dmae_get_partial() is calculating in different unit.
This patch fixes it.

This bug has been present since c014906a
("dmaengine: shdma: extend .device_terminate_all() to record partial
transfer"), which was added in 2.6.34-rc1.

Cc: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 16b551dd
...@@ -400,8 +400,8 @@ static size_t sh_dmae_get_partial(struct shdma_chan *schan, ...@@ -400,8 +400,8 @@ static size_t sh_dmae_get_partial(struct shdma_chan *schan,
shdma_chan); shdma_chan);
struct sh_dmae_desc *sh_desc = container_of(sdesc, struct sh_dmae_desc *sh_desc = container_of(sdesc,
struct sh_dmae_desc, shdma_desc); struct sh_dmae_desc, shdma_desc);
return (sh_desc->hw.tcr - sh_dmae_readl(sh_chan, TCR)) << return sh_desc->hw.tcr -
sh_chan->xmit_shift; (sh_dmae_readl(sh_chan, TCR) << sh_chan->xmit_shift);
} }
/* Called from error IRQ or NMI */ /* Called from error IRQ or NMI */
......
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