From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 03997C432C0 for ; Fri, 22 Nov 2019 10:41:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE1B720637 for ; Fri, 22 Nov 2019 10:41:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419260; bh=lgzmDY7hvgwZlBz91lc4Dp9NshUnGaue5baV8VcMsmk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0j2/mN1fnEI8dLkMIfuWUs22YT1Nom/rbbXUeainv6OZ+t5GMIL1JjozHeEPkmkZk f/PhjIkqbg5zS4pkCyWb2Ol6d0nw5Ccq8QozwZ2LQpVIRi2zM2tn/uXViYSivLQq7U QWS/JGvpROkPJ2S702+SyuWXnkfxe+FAu/gbGQjc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728543AbfKVKk7 (ORCPT ); Fri, 22 Nov 2019 05:40:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:45204 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728963AbfKVKk4 (ORCPT ); Fri, 22 Nov 2019 05:40:56 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B86C620637; Fri, 22 Nov 2019 10:40:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419256; bh=lgzmDY7hvgwZlBz91lc4Dp9NshUnGaue5baV8VcMsmk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vON+vK9ruulMx4sLQyChIvt8K4D8ho2AVvrQtHmAdJtRAkpAuVX1S6VYf70QExXsh iALHpt4Mqs/IlrSt2WaoRq7+9KqVgtc1S0ugR9gK9qI9aYOjZ0YvruWzKg7IfebK6B LCbViE2di0J642BEHEOs0lbbK+4nP0adcLgU//CE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Silsby , Paul Cercueil , Mathieu Malaterre , Vinod Koul , Sasha Levin Subject: [PATCH 4.9 050/222] dmaengine: dma-jz4780: Further residue status fix Date: Fri, 22 Nov 2019 11:26:30 +0100 Message-Id: <20191122100854.095019917@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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