From patchwork Tue Apr 4 06:17:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96678 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp48152qgd; Mon, 3 Apr 2017 23:17:53 -0700 (PDT) X-Received: by 10.98.47.4 with SMTP id v4mr20972585pfv.86.1491286673195; Mon, 03 Apr 2017 23:17:53 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9si746909pgf.57.2017.04.03.23.17.53; Mon, 03 Apr 2017 23:17:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751130AbdDDGRw (ORCPT + 6 others); Tue, 4 Apr 2017 02:17:52 -0400 Received: from mail-pg0-f54.google.com ([74.125.83.54]:34638 "EHLO mail-pg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750962AbdDDGRw (ORCPT ); Tue, 4 Apr 2017 02:17:52 -0400 Received: by mail-pg0-f54.google.com with SMTP id 21so142754680pgg.1 for ; Mon, 03 Apr 2017 23:17:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=npA6z32Ekq1KR9faVmOm9RjjDwIR5Sp0t0EtlJQILWc=; b=Wpp49jILiNLvrEDGvICUp+X/SLn9OlO5K4IKZlG2IdmcbYlnyojIC0dTGsJ+ldhmYv U79MCfd40PSwN2xuKnn7ek+/eisRfDz+wA+HeWEfgCT68vk2LIkKIPTjxuBLTS4LHW3g oVl+hlgDvoyvrjU5qvgT69WQxKu0tUx2Kalso= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=npA6z32Ekq1KR9faVmOm9RjjDwIR5Sp0t0EtlJQILWc=; b=VUFS3iJRK2Kij+errvMgnRfzU98tVAsOb0whrKAIe3lTK5Vrs8nWU9xTVxzOa8G1xS /5NJNjvJHzCoWmQX94Hq9OGrt2nbJ0RiXj3Wwa3txVunCpvOspo6peJs6JRvfxnJTl9z UmQDkn9MyVL+LE452qeXJeIlD5O8+Q4QPfg/MovrC/RY3qF8Iv6hEHuL+4tgYcjidTdi zQSB6qn9XZdRnNag3PPcP86hT0VZFVO4OpyrjCHWwZoDhOsJyETkirXeeV0s8EPypNah vdPlnJ3A4reLi7jhREsnmtzpPOSOIuDVSbjJG1RIUnW3Aa/pQA/+pbqLgodrkAUgNUzZ /zWQ== X-Gm-Message-State: AFeK/H2Wv0nmhrjP8zKWgG7/CuOrlag16Ejrw6ymACSJU9M98C5N9GCGpLL5KK5e7u0rrsbv X-Received: by 10.99.127.12 with SMTP id a12mr21950916pgd.5.1491286671191; Mon, 03 Apr 2017 23:17:51 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id l126sm29224804pfl.56.2017.04.03.23.17.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Apr 2017 23:17:50 -0700 (PDT) From: Amit Pundir To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, Matthias Reichl , Martin Sperl , Vinod Koul Subject: [PATCH 16/33] dmaengine: bcm2835: Fix cyclic DMA period splitting Date: Tue, 4 Apr 2017 11:47:30 +0530 Message-Id: <1491286653-31193-7-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491286653-31193-1-git-send-email-amit.pundir@linaro.org> References: <1491286653-31193-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Matthias Reichl 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 Signed-off-by: Martin Sperl Tested-by: Clive Messer Reviewed-by: Eric Anholt Signed-off-by: Vinod Koul (cherry picked from commit 2201ac6129fa162ac24da089a034bb0971648ebb) Signed-off-by: Amit Pundir --- drivers/dma/bcm2835-dma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.7.4 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; return; + } /* calculate the length that remains to reach period_length */ control_block->length = period_len - *total_len;