From patchwork Thu Oct 17 10:51:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3060101 Return-Path: X-Original-To: patchwork-linux-sh@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 1C1209F2B6 for ; Thu, 17 Oct 2013 10:51:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 87C59201EF for ; Thu, 17 Oct 2013 10:51:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64B42201BE for ; Thu, 17 Oct 2013 10:51:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753405Ab3JQKvd (ORCPT ); Thu, 17 Oct 2013 06:51:33 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:39184 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752557Ab3JQKvc (ORCPT ); Thu, 17 Oct 2013 06:51:32 -0400 Received: by mail-pb0-f44.google.com with SMTP id xa7so2135600pbc.31 for ; Thu, 17 Oct 2013 03:51:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:to:cc:in-reply-to:references:from:subject :mime-version:content-type; bh=yrE1Qjsp+QkpXoCzKCDHsW3DhRnyTqxO6FW/ERrCJSw=; b=VpgDn0nfpcKQDNG6G9cA3KsPSbPizhTFNQvpKfzybBnsS5QvSEDvbnLkgmg/S+xFgX XP5nZY5aHGVMotYDD/FlBkytm2WNHHe7Dosk4S9qQX8ZS+eDzgOKGoEV/Jrtgsn0w1NN kpr/lobRAt882wHvRNLFHqSL6Nt+bSs+PT8kqki/3ItGd3EwTgf0Koa18TpSAkC9gEjH 9GRVkeaBJwgTXcE03/Q/UtpTem5Odv6RD9FvfzH55mFzdIT8DCdw/dpzyLsw4JmzBi8h oFy/tPn37tXoy8rIyJF5IvrlrLIR4sUPAML17ShJVcl5d+eoouAG6hG7vY1Jr6ZwNYCg ywqg== X-Received: by 10.68.223.131 with SMTP id qu3mr7863637pbc.4.1382007092145; Thu, 17 Oct 2013 03:51:32 -0700 (PDT) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id xe9sm113590556pab.0.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 17 Oct 2013 03:51:31 -0700 (PDT) Date: Thu, 17 Oct 2013 03:51:31 -0700 (PDT) Message-ID: <87hacg187k.wl%kuninori.morimoto.gx@renesas.com> To: Simon , Max Filippov Cc: Magnus , linux-sh@vger.kernel.org, Kuninori Morimoto In-Reply-To: <87k3hc189h.wl%kuninori.morimoto.gx@renesas.com> References: <87k3hc189h.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 2/3] rcar-hpbdma: initialise plane information when halted MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Plane information should be initialized when halted. It may restart from the wrong plane without this patch. Signed-off-by: Kuninori Morimoto --- drivers/dma/sh/rcar-hpbdma.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/dma/sh/rcar-hpbdma.c b/drivers/dma/sh/rcar-hpbdma.c index b1ae8dc..0518135 100644 --- a/drivers/dma/sh/rcar-hpbdma.c +++ b/drivers/dma/sh/rcar-hpbdma.c @@ -286,6 +286,9 @@ static void hpb_dmae_halt(struct shdma_chan *schan) ch_reg_write(chan, HPB_DMAE_DCMDR_DQEND, HPB_DMAE_DCMDR); ch_reg_write(chan, HPB_DMAE_DSTPR_DMSTP, HPB_DMAE_DSTPR); + + chan->plane_idx = 0; + chan->first_desc = true; } static const struct hpb_dmae_slave_config *