[v2,for-4.9,15/32] dmaengine: bcm2835: Fix cyclic DMA period splitting

Message ID 1491388344-13521-16-git-send-email-amit.pundir@linaro.org
State Superseded
Headers show
  • Stable commits picked up from lede project
Related show

Commit Message

Amit Pundir April 5, 2017, 10:32 a.m.
From: Matthias Reichl <hias@horus.com>

The code responsible for splitting periods into chunks that
can be handled by the DMA controller missed to update total_len,
the number of bytes processed in the current period, when there
are more chunks to follow.

Therefore total_len was stuck at 0 and the code didn't work at all.
This resulted in a wrong control block layout and audio issues because
the cyclic DMA callback wasn't executing on period boundaries.

Fix this by adding the missing total_len update.

Signed-off-by: Matthias Reichl <hias@horus.com>

Signed-off-by: Martin Sperl <kernel@martin.sperl.org>

Tested-by: Clive Messer <clive.messer@digitaldreamtime.co.uk>

Reviewed-by: Eric Anholt <eric@anholt.net>

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

(cherry picked from commit 2201ac6129fa162ac24da089a034bb0971648ebb)
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

 drivers/dma/bcm2835-dma.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)



diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
index e18dc59..6204cc3 100644
--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c
@@ -251,8 +251,11 @@  static void bcm2835_dma_create_cb_set_length(
 	/* have we filled in period_length yet? */
-	if (*total_len + control_block->length < period_len)
+	if (*total_len + control_block->length < period_len) {
+		/* update number of bytes in this period so far */
+		*total_len += control_block->length;
+	}
 	/* calculate the length that remains to reach period_length */
 	control_block->length = period_len - *total_len;