dmaengine: dma-jz4780: Add missing residue DTC mask
authorDaniel Silsby <dansilsby@gmail.com>
Wed, 29 Aug 2018 21:32:53 +0000 (23:32 +0200)
committerVinod Koul <vkoul@kernel.org>
Tue, 11 Sep 2018 07:29:26 +0000 (12:59 +0530)
The 'dtc' word in jz DMA descriptors contains two fields: The
lowest 24 bits are the transfer count, and upper 8 bits are the DOA
offset to next descriptor. The upper 8 bits are now correctly masked
off when computing residue in jz4780_dma_desc_residue(). Note that
reads of the DTCn hardware reg are automatically masked this way.

Signed-off-by: Daniel Silsby <dansilsby@gmail.com>
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Tested-by: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/dma-jz4780.c

index 3a4d0a4b550d9d85f3802c921f55424dc06b77fd..bd3cecb800c50eeb1bc88f16a46e8e90e4ee4717 100644 (file)
@@ -616,7 +616,8 @@ static size_t jz4780_dma_desc_residue(struct jz4780_dma_chan *jzchan,
        residue = 0;
 
        for (i = next_sg; i < desc->count; i++)
-               residue += desc->desc[i].dtc << jzchan->transfer_shift;
+               residue += (desc->desc[i].dtc & GENMASK(23, 0)) <<
+                       jzchan->transfer_shift;
 
        if (next_sg != 0) {
                count = jz4780_dma_chn_readl(jzdma, jzchan->id,