From patchwork Mon Feb 10 15:57:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 3619681 Return-Path: X-Original-To: patchwork-linux-omap@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 D86919F39B for ; Mon, 10 Feb 2014 15:57:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F1D22201DD for ; Mon, 10 Feb 2014 15:57:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0871F201D3 for ; Mon, 10 Feb 2014 15:57:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752881AbaBJP5W (ORCPT ); Mon, 10 Feb 2014 10:57:22 -0500 Received: from gw-1.arm.linux.org.uk ([78.32.30.217]:60072 "EHLO pandora.arm.linux.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752416AbaBJP5W (ORCPT ); Mon, 10 Feb 2014 10:57:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=pandora; h=Date:Sender:Message-Id:Subject:Cc:To:From:References:In-Reply-To; bh=HhlYlPprTZu1xe5HzFEBb5yFrRRy+L0LKRyZYBV8bmk=; b=iHz0NNuZAKdFkokTaxJ+MZITF95e1A0GCC5sruqKazU9Kc+dm/OXtvCi/pElgtf3G1f3BKgXrXy7AzCprLnVEYRIgWiJZpREBO1dNbhW8FNuOY3OuxPHxw0SEBY86VMDr7TkvudM7xmtMPWMxhsfrZcB0r2F3pz55jddFlSGTnY=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:49385 helo=rmk-PC.arm.linux.org.uk) by pandora.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1WCtEW-00054b-K6; Mon, 10 Feb 2014 15:57:20 +0000 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1WCtEW-0006X8-7k; Mon, 10 Feb 2014 15:57:20 +0000 In-Reply-To: <20140210155531.GB26684@n2100.arm.linux.org.uk> References: <20140210155531.GB26684@n2100.arm.linux.org.uk> From: Russell King To: dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Cc: Dan Williams , Vinod Koul Subject: [PATCH 17/26] dmaengine: omap-dma: cleanup errata 3.3 handling Message-Id: Date: Mon, 10 Feb 2014 15:57:20 +0000 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 Signed-off-by: Russell King --- drivers/dma/omap-dma.c | 52 ++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index a1baada7dcd4..1e0018f36384 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -451,28 +451,39 @@ static size_t omap_dma_desc_size_pos(struct omap_desc *d, dma_addr_t addr) return size; } +/* + * OMAP 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is + * read before the DMA controller finished disabling the channel. + */ +static uint32_t omap_dma_chan_read_3_3(struct omap_chan *c, unsigned reg) +{ + struct omap_dmadev *od = to_omap_dma_dev(c->vc.chan.device); + uint32_t val; + + val = omap_dma_chan_read(c, reg); + if (val == 0 && od->plat->errata & DMA_ERRATA_3_3) + val = omap_dma_chan_read(c, reg); + + return val; +} + static dma_addr_t omap_dma_get_src_pos(struct omap_chan *c) { struct omap_dmadev *od = to_omap_dma_dev(c->vc.chan.device); - dma_addr_t addr; + dma_addr_t addr, cdac; - if (__dma_omap15xx(od->plat->dma_attr)) + if (__dma_omap15xx(od->plat->dma_attr)) { addr = omap_dma_chan_read(c, CPC); - else - addr = omap_dma_chan_read(c, CSAC); - - if (od->plat->errata & DMA_ERRATA_3_3 && addr == 0) - addr = omap_dma_chan_read(c, CSAC); + } else { + addr = omap_dma_chan_read_3_3(c, CSAC); + cdac = omap_dma_chan_read_3_3(c, CDAC); - if (!__dma_omap15xx(od->plat->dma_attr)) { /* * CDAC == 0 indicates that the DMA transfer on the channel has * not been started (no data has been transferred so far). * Return the programmed source start address in this case. */ - if (omap_dma_chan_read(c, CDAC)) - addr = omap_dma_chan_read(c, CSAC); - else + if (cdac == 0) addr = omap_dma_chan_read(c, CSSA); } @@ -487,21 +498,16 @@ static dma_addr_t omap_dma_get_dst_pos(struct omap_chan *c) struct omap_dmadev *od = to_omap_dma_dev(c->vc.chan.device); dma_addr_t addr; - if (__dma_omap15xx(od->plat->dma_attr)) + if (__dma_omap15xx(od->plat->dma_attr)) { addr = omap_dma_chan_read(c, CPC); - else - addr = omap_dma_chan_read(c, CDAC); + } else { + addr = omap_dma_chan_read_3_3(c, CDAC); - /* - * omap 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is - * read before the DMA controller finished disabling the channel. - */ - if (!__dma_omap15xx(od->plat->dma_attr) && addr == 0) { - addr = omap_dma_chan_read(c, CDAC); /* - * CDAC == 0 indicates that the DMA transfer on the channel has - * not been started (no data has been transferred so far). - * Return the programmed destination start address in this case. + * CDAC == 0 indicates that the DMA transfer on the channel + * has not been started (no data has been transferred so + * far). Return the programmed destination start address in + * this case. */ if (addr == 0) addr = omap_dma_chan_read(c, CDSA);