Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751883Ab3GXGMp (ORCPT ); Wed, 24 Jul 2013 02:12:45 -0400 Received: from mail-pb0-f42.google.com ([209.85.160.42]:52876 "EHLO mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751085Ab3GXGMn (ORCPT ); Wed, 24 Jul 2013 02:12:43 -0400 Date: Tue, 23 Jul 2013 23:12:41 -0700 (PDT) Message-ID: <87bo5sv63u.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH resend] shdma: fixup sh_dmae_get_partial() calculation error User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") To: Olof Johansson Cc: Simon Horman , Linux-SH , Guennadi , linux-kernel@vger.kernel.org In-Reply-To: <87d2q8v6fs.wl%kuninori.morimoto.gx@renesas.com> References: <1373422152-29976-1-git-send-email-horms+renesas@verge.net.au> <20130716012041.GA942@verge.net.au> <20130723023907.GC14983@quad.lixom.net> <20130723041220.GA22253@verge.net.au> <87zjtddgtg.wl%kuninori.morimoto.gx@renesas.com> <20130724034009.GA18355@verge.net.au> <87d2q8v6fs.wl%kuninori.morimoto.gx@renesas.com> Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1274 Lines: 38 sh_desc->hw.tcr is controlling real data size, and, register TCR is controlling data transfer count which was xmit_shifted value of hw.tcr. Current sh_dmae_get_partial() is calculating in different unit. This patch fixes it. Signed-off-by: Kuninori Morimoto --- >> Guennadi Could you please check this patch, and give it your Acked-by ? drivers/dma/sh/shdma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c index b70709b..d670b8b 100644 --- a/drivers/dma/sh/shdma.c +++ b/drivers/dma/sh/shdma.c @@ -388,8 +388,8 @@ static size_t sh_dmae_get_partial(struct shdma_chan *schan, shdma_chan); struct sh_dmae_desc *sh_desc = container_of(sdesc, struct sh_dmae_desc, shdma_desc); - return (sh_desc->hw.tcr - sh_dmae_readl(sh_chan, TCR)) << - sh_chan->xmit_shift; + return sh_desc->hw.tcr - + (sh_dmae_readl(sh_chan, TCR) << sh_chan->xmit_shift); } /* Called from error IRQ or NMI */ -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/