Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752378AbdHAUKD (ORCPT ); Tue, 1 Aug 2017 16:10:03 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:34845 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752303AbdHAUKA (ORCPT ); Tue, 1 Aug 2017 16:10:00 -0400 From: Antonio Borneo To: dmaengine@vger.kernel.org, Vinod Koul , Dan Williams Cc: Antonio Borneo , linux-kernel@vger.kernel.org, John Stultz , Zhangfei Gao Subject: [PATCH v2 1/3] dmaengine: k3dma: fix non-cyclic mode Date: Tue, 1 Aug 2017 22:09:25 +0200 Message-Id: <20170801200928.24661-2-borneo.antonio@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170801200928.24661-1-borneo.antonio@gmail.com> References: <20170801200928.24661-1-borneo.antonio@gmail.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1464 Lines: 49 Commit 36387a2b1f62b5c087c5fe6f0f7b23b94f722ad7 ("k3dma: Fix memory handling in preparation for cyclic mode") broke the logic around ds_run/ds_done in case of non-cyclic DMA. This went unnoticed as the only user of k3dma was the i2s audio driver but, with a patch set to enable dma on SPI, the issue popped out. The fix re-applies the initialization to ds_run/ds_done in k3_dma_start_txd() that were removed by the commit above. Also, one of the calls to k3_dma_start_txd() is triggered by (ds_done != NULL), so remove the noisy and useless call to WARN_ON_ONCE(). Signed-off-by: Antonio Borneo --- To: dmaengine@vger.kernel.org To: Vinod Koul To: Dan Williams Cc: linux-kernel@vger.kernel.org Cc: John Stultz Cc: Zhangfei Gao --- drivers/dma/k3dma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index 01e25c6..c00eb12 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -275,12 +275,14 @@ static int k3_dma_start_txd(struct k3_dma_chan *c) list_del(&ds->vd.node); WARN_ON_ONCE(c->phy->ds_run); - WARN_ON_ONCE(c->phy->ds_done); c->phy->ds_run = ds; + c->phy->ds_done = NULL; /* start dma */ k3_dma_set_desc(c->phy, &ds->desc_hw[0]); return 0; } + c->phy->ds_run = NULL; + c->phy->ds_done = NULL; return -EAGAIN; } -- 1.9.1