From patchwork Thu Feb 14 09:03:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 14792 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8669023F72 for ; Thu, 14 Feb 2013 09:03:25 +0000 (UTC) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by fiordland.canonical.com (Postfix) with ESMTP id 1D84CA19173 for ; Thu, 14 Feb 2013 09:03:25 +0000 (UTC) Received: by mail-ve0-f180.google.com with SMTP id jx10so1833887veb.39 for ; Thu, 14 Feb 2013 01:03:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=zQRqXIFagg0WhCjTQn3yUQmblUZbdY7SPIOX7PHZqAA=; b=SFQ3zk1zHzEVAHvL3JUOOruXKFhteY8STZmObVtTf7ceVd3L8w8R3ItRilYeIaDiU8 i0xSx6IuwUcCVDyTr1HPx0S51qDqMQjfTclLtPYU5cyxJ/7znV5W7QXAViabPciX64Yy icbEjsEfen19wsB1DWHyMlFHhcjQSuOPuAi4cl8t2oMzXfye5+YgqMBFlOh21DzSxSsl +vH9OBgxZVcPq1dyyhr7foqb0HEnCMAD+c3ka6i+qTXwHwph+XuHW408Ebp/bh0fn7NY 110lTrhYu5XEQRH7oXiO+2z8P53QNg6dspPMRm+4wXpjZutWysj7vDVBM/EkCpxzv4EN eBYw== X-Received: by 10.58.12.200 with SMTP id a8mr33013791vec.52.1360832604389; Thu, 14 Feb 2013 01:03:24 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.221.4.5 with SMTP id oa5csp248159vcb; Thu, 14 Feb 2013 01:03:23 -0800 (PST) X-Received: by 10.14.183.67 with SMTP id p43mr85493721eem.10.1360832603128; Thu, 14 Feb 2013 01:03:23 -0800 (PST) Received: from mail-ea0-f181.google.com (mail-ea0-f181.google.com [209.85.215.181]) by mx.google.com with ESMTPS id i43si9283272eem.154.2013.02.14.01.03.22 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Feb 2013 01:03:23 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.181 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=209.85.215.181; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.215.181 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) smtp.mail=fabio.baltieri@linaro.org Received: by mail-ea0-f181.google.com with SMTP id i13so839886eaa.12 for ; Thu, 14 Feb 2013 01:03:22 -0800 (PST) X-Received: by 10.14.3.133 with SMTP id 5mr52464553eeh.43.1360832602383; Thu, 14 Feb 2013 01:03:22 -0800 (PST) Received: from localhost ([2a01:2003:1:1e91:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPS id l8sm43328350een.10.2013.02.14.01.03.17 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 14 Feb 2013 01:03:21 -0800 (PST) From: Fabio Baltieri To: Vinod Koul Cc: Dan Williams , linux-kernel@vger.kernel.org, Srinidhi Kasagar , Linus Walleij , Fabio Baltieri Subject: [PATCH] dmaengine: ste_dma40: do not remove descriptors for cyclic transfers Date: Thu, 14 Feb 2013 10:03:10 +0100 Message-Id: <1360832590-26562-1-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.7.12.1 X-Gm-Message-State: ALoCoQmhMJDAmaEnEDTXrQbpKlURU43yudDoeIdWgYdQnFEEI7yGY58Pf2XEgB/3cebtwBG3OZUR Fix dma_tc_handle() to call d40_desc_remove() and d40_desc_done() only for non-cyclic transfers, as this was breaking ux500_pcm since introduced in: d49278e dmaengine: dma40: Add support to split up large elements Reported-by: Shreshtha Kumar Sahu Acked-by: Linus Walleij Signed-off-by: Fabio Baltieri --- Hello Vinod, the bug fixed by this patch was around for some time, but the affected driver (ux500_pcm) will be enabled in next release cycle for other reasons so this patch can safely go on -next. Would you take it your tree? Thanks, Fabio drivers/dma/ste_dma40.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index ad860a2..1734fee 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -1570,10 +1570,10 @@ static void dma_tc_handle(struct d40_chan *d40c) d40c->busy = false; pm_runtime_mark_last_busy(d40c->base->dev); pm_runtime_put_autosuspend(d40c->base->dev); - } - d40_desc_remove(d40d); - d40_desc_done(d40c, d40d); + d40_desc_remove(d40d); + d40_desc_done(d40c, d40d); + } d40c->pending_tx++; tasklet_schedule(&d40c->tasklet);