Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D99F2FC6194 for ; Fri, 8 Nov 2019 11:46:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4C112247A for ; Fri, 8 Nov 2019 11:46:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213596; bh=lgzmDY7hvgwZlBz91lc4Dp9NshUnGaue5baV8VcMsmk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=c72da+CY379Rcz0U7SDQgZnpEtU+HxxaY7x+qE4AyJKOUdK8TWoXKSLlj8Q2Du6qR NFkhFzaBMOQk//fubHh9K8OnHxHTHYvJF21G3tXMpiSc355wvLpp/MgGyeExppi5ip a4TNXLYua1r2u958CslYlVjC5mKEavo57qLHC1U8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391371AbfKHLqe (ORCPT ); Fri, 8 Nov 2019 06:46:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:34336 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391367AbfKHLqe (ORCPT ); Fri, 8 Nov 2019 06:46:34 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B0C57222D4; Fri, 8 Nov 2019 11:46:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213593; bh=lgzmDY7hvgwZlBz91lc4Dp9NshUnGaue5baV8VcMsmk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zSCoHkKjZLSbCDO02+ZP65Fx0Rk51LEjqULJsXdtJAqlZFqqAO9VJliosqgeMX2VP 6M2aP6BBF34vilOmrEsg64AIfQlcKv0WP+yzJ84y4NdpSRwev8kSFt47kFUTs4BgiF KRhXPkGSlyTF3hSZy4epcZchH3q63B8d7tJC8Mf8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Daniel Silsby , Paul Cercueil , Mathieu Malaterre , Vinod Koul , Sasha Levin , dmaengine@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 35/64] dmaengine: dma-jz4780: Further residue status fix Date: Fri, 8 Nov 2019 06:45:16 -0500 Message-Id: <20191108114545.15351-35-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108114545.15351-1-sashal@kernel.org> References: <20191108114545.15351-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org From: Daniel Silsby [ Upstream commit 83ef4fb7556b6a673f755da670cbacab7e2c7f1b ] Func jz4780_dma_desc_residue() expects the index to the next hw descriptor as its last parameter. Caller func jz4780_dma_tx_status(), however, applied modulus before passing it. When the current hw descriptor was last in the list, the index passed became zero. The resulting excess of reported residue especially caused problems with cyclic DMA transfer clients, i.e. ALSA AIC audio output, which rely on this for determining current DMA location within buffer. Combined with the recent and related residue-reporting fixes, spurious ALSA audio underruns on jz4770 hardware are now fixed. Signed-off-by: Daniel Silsby Signed-off-by: Paul Cercueil Tested-by: Mathieu Malaterre Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/dma-jz4780.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c index 803cfb4523b08..aca2d6fd92d56 100644 --- a/drivers/dma/dma-jz4780.c +++ b/drivers/dma/dma-jz4780.c @@ -580,7 +580,7 @@ static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan, to_jz4780_dma_desc(vdesc), 0); } else if (cookie == jzchan->desc->vdesc.tx.cookie) { txstate->residue = jz4780_dma_desc_residue(jzchan, jzchan->desc, - (jzchan->curr_hwdesc + 1) % jzchan->desc->count); + jzchan->curr_hwdesc + 1); } else txstate->residue = 0; -- 2.20.1