]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
dmaengine: qcom: bam_dma: Fix completed descriptors count
authorSricharan R <sricharan@codeaurora.org>
Fri, 28 Jun 2019 12:09:46 +0000 (17:39 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 10 Jul 2019 07:52:32 +0000 (09:52 +0200)
commit f6034225442c4a87906d36e975fd9e99a8f95487 upstream.

One space is left unused in circular FIFO to differentiate
'full' and 'empty' cases. So take that in to account while
counting for the descriptors completed.

Fixes the issue reported here,
https://lkml.org/lkml/2019/6/18/669

Cc: stable@vger.kernel.org
Reported-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/dma/qcom/bam_dma.c

index cb860cb53c27476386ec0609b5281d03de3f563c..d30f8bd434d5e13cc2a07df4ba68fee704aecef8 100644 (file)
@@ -808,6 +808,9 @@ static u32 process_channel_irqs(struct bam_device *bdev)
                /* Number of bytes available to read */
                avail = CIRC_CNT(offset, bchan->head, MAX_DESCRIPTORS + 1);
 
+               if (offset < bchan->head)
+                       avail--;
+
                list_for_each_entry_safe(async_desc, tmp,
                                         &bchan->desc_list, desc_node) {
                        /* Not enough data to read */