From patchwork Tue Aug 1 20:09:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Borneo X-Patchwork-Id: 9875439 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0337160365 for ; Tue, 1 Aug 2017 20:11:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB3D128396 for ; Tue, 1 Aug 2017 20:11:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E010D28740; Tue, 1 Aug 2017 20:11:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8200628396 for ; Tue, 1 Aug 2017 20:11:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752169AbdHAUKC (ORCPT ); Tue, 1 Aug 2017 16:10:02 -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 Received: by mail-wr0-f193.google.com with SMTP id c24so2223551wra.2; Tue, 01 Aug 2017 13:09:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=HAiOd+pws96POosWTjbQrLvXnP0xyqozptGwAmQaFx4=; b=lYvJbCFykLknIThLxZgvWxLwKlZpdAVFSxcfEAQ1AUFlP7XZUCfwUDOOAZVu+CnF1G ys1GIZXG+HPCDIvs+4RaOUjsKRcuvPd3YGKzMN0TRpxHgyWaqJldSudfmc8V2vJ1TvIl G3I6ByCGOPr0BPgh+xv4OykxiA/857DI8f+4dOKayrACUr3fe+suEtuqKbx7mQDpMTT1 VhLejbvu31cCEH1iHxRXg4mSR5t8xuVpl1dnAxf6LGEHrVl+NNKYP+0ZHc9Oo4Fpy8KO RA14X0RnbF5azRqhM7sgmQSq4UwmF/Dy32S8ghlezCuVTixJqxV0tXiybkQEGMZBBAjV 1NgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=HAiOd+pws96POosWTjbQrLvXnP0xyqozptGwAmQaFx4=; b=GtpjEyuIFdc1j38VPw2qta3DWCuQCExMJ93IlVj25xQlDdKTDL32it8CjHhs7nsKDr s4Ir86gJkzOIsS8ccOKPUfLTTD1/cqRv9adPofgjG0e7NuUnD9w/pjUXai0H7EXj7jGm npCDNiAtAS5hipD+QoS47Rsy71HmTzs29m825YuniQESqgfCXFBXVrsdMTB/moJgboSS Yr7no9sdEW8X2Ira19aYX6I3vlRq463jYE2czy8WoiX8SIJAEBVGvjtQ/M0YlCuWbUK0 2fukzZFZNE7hBP3tdIT4HVtfTL4AzV9kkzvChDq0HqLqmM+3IH+8erhBf5LmzJvl/ttz Thww== X-Gm-Message-State: AIVw111gal6eKiWsJlKfegQ7G/YUOa0P/AMXx7vdZwlDT1UAx92D9B6f tKcbj9orQUtNc4zIJSs= X-Received: by 10.223.133.146 with SMTP id 18mr16194852wrt.214.1501618198565; Tue, 01 Aug 2017 13:09:58 -0700 (PDT) Received: from localhost.localdomain ([2a01:e34:edb8:72e0:f7c2:bbb1:de32:ba2a]) by smtp.gmail.com with ESMTPSA id i7sm29722581wrb.19.2017.08.01.13.09.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2017 13:09:57 -0700 (PDT) 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: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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; }