From patchwork Fri Aug 15 17:42:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 4728631 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8DDBE9F3EE for ; Fri, 15 Aug 2014 17:45:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C931220117 for ; Fri, 15 Aug 2014 17:45:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC2422016C for ; Fri, 15 Aug 2014 17:45:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751589AbaHORnB (ORCPT ); Fri, 15 Aug 2014 13:43:01 -0400 Received: from www.linutronix.de ([62.245.132.108]:57642 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751512AbaHORm6 (ORCPT ); Fri, 15 Aug 2014 13:42:58 -0400 Received: from localhost ([127.0.0.1] helo=bazinga.breakpoint.cc) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1XILWi-0006sE-Ec; Fri, 15 Aug 2014 19:42:56 +0200 From: Sebastian Andrzej Siewior To: linux-serial@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, tony@atomide.com, balbi@ti.com, Vinod Koul , Greg Kroah-Hartman , Sebastian Andrzej Siewior , Russell King Subject: [PATCH 09/15] dmaengine: omap-dma: complete the transfer on terminate_all Date: Fri, 15 Aug 2014 19:42:37 +0200 Message-Id: <1408124563-31541-10-git-send-email-bigeasy@linutronix.de> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1408124563-31541-1-git-send-email-bigeasy@linutronix.de> References: <1408124563-31541-1-git-send-email-bigeasy@linutronix.de> X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1, SHORTCIRCUIT=-0.0001 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The rx path of the 8250_dma user in the RX-timeout case: - it starts the RX transfer - if the rx-timeout interrupt occurs, it dmaengine_pause() the transfer - step two is dmaengine_terminate_all() on this channel. - the rx interrupt occurs, it does not start the RX-transfer because according to dmaengine_tx_status() the status of the current transfer is still DMA_IN_PROGRESS because the earlier dmaengine_terminate_all() did not reset this. To fix this problem, the patch adds dma_cookie_complete() "complete" the current cookie. Cc: Russell King Signed-off-by: Sebastian Andrzej Siewior --- drivers/dma/omap-dma.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index b19f04f..81ede01 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -970,6 +970,12 @@ static int omap_dma_terminate_all(struct omap_chan *c) /* Prevent this channel being scheduled */ spin_lock(&d->lock); + if (!c->desc && !list_empty(&c->node)) { + struct virt_dma_desc *vd = vchan_next_desc(&c->vc); + + if (vd) + dma_cookie_complete(&vd->tx); + } list_del_init(&c->node); spin_unlock(&d->lock); @@ -979,6 +985,7 @@ static int omap_dma_terminate_all(struct omap_chan *c) * c->desc is NULL and exit.) */ if (c->desc) { + dma_cookie_complete(&c->desc->vd.tx); c->desc = NULL; /* Avoid stopping the dma twice */ if (!c->paused)