From patchwork Sun Jan 10 20:54:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TcOlbnMgUnVsbGfDpXJk?= X-Patchwork-Id: 7997991 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D2DF79F1CC for ; Sun, 10 Jan 2016 20:54:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 02C0F20384 for ; Sun, 10 Jan 2016 20:54:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3302C20383 for ; Sun, 10 Jan 2016 20:54:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757341AbcAJUyT (ORCPT ); Sun, 10 Jan 2016 15:54:19 -0500 Received: from unicorn.mansr.com ([81.2.72.234]:54168 "EHLO unicorn.mansr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757332AbcAJUyT (ORCPT ); Sun, 10 Jan 2016 15:54:19 -0500 Received: by unicorn.mansr.com (Postfix, from userid 51770) id 613D015393; Sun, 10 Jan 2016 20:54:10 +0000 (GMT) From: Mans Rullgard To: Viresh Kumar , Andy Shevchenko , Dan Williams , Vinod Koul , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dmaengine: dw: fix cyclic transfers Date: Sun, 10 Jan 2016 20:54:03 +0000 Message-Id: <1452459243-23739-1-git-send-email-mans@mansr.com> X-Mailer: git-send-email 2.7.0 Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Commit 61e183f83069 ("dmaengine/dw_dmac: Reconfigure interrupt and chan_cfg register on resume") moved some channel initialisation to a new function which must be called before starting a transfer. This adds the necessary dwc_initialize() call to dw_dma_cyclic_start() which was missed in the original commit. Fixes: 61e183f83069 ("dmaengine/dw_dmac: Reconfigure interrupt and chan_cfg register on resume") Signed-off-by: Mans Rullgard --- Andy, do you want to collect this with your other patches? It's trivial enough that it can go in separately without conflicts too. --- drivers/dma/dw/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c index 7067b6ddc1db..2917f75b67b4 100644 --- a/drivers/dma/dw/core.c +++ b/drivers/dma/dw/core.c @@ -1265,6 +1265,8 @@ int dw_dma_cyclic_start(struct dma_chan *chan) return -EBUSY; } + dwc_initialize(dwc); + dma_writel(dw, CLEAR.ERROR, dwc->mask); dma_writel(dw, CLEAR.XFER, dwc->mask);