From patchwork Mon Aug 5 16:14:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 2838796 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E93F7BF535 for ; Mon, 5 Aug 2013 16:20:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A3F420290 for ; Mon, 5 Aug 2013 16:20:46 +0000 (UTC) Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2CF412027D for ; Mon, 5 Aug 2013 16:20:41 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id r75GKeai021179 for ; Mon, 5 Aug 2013 11:20:40 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id r75GKemK003265 for ; Mon, 5 Aug 2013 11:20:40 -0500 Received: from dlelxv23.itg.ti.com (172.17.1.198) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.2.342.3; Mon, 5 Aug 2013 11:20:39 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id r75GKehk010940 for ; Mon, 5 Aug 2013 11:20:40 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 16FAE8062B for ; Mon, 5 Aug 2013 11:20:40 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dlelxv90.itg.ti.com (dlelxv90.itg.ti.com [172.17.2.17]) by linux.omap.com (Postfix) with ESMTP id A4BCF80626 for ; Mon, 5 Aug 2013 11:15:14 -0500 (CDT) Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id r75GFE9M022424; Mon, 5 Aug 2013 11:15:14 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.2.342.3; Mon, 5 Aug 2013 11:15:14 -0500 Received: from joel-laptop.itg.ti.com (h0-56.vpn.ti.com [172.24.0.56]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r75GEv1T026253; Mon, 5 Aug 2013 11:15:13 -0500 From: Joel Fernandes To: Tony Lindgren , Sekhar Nori , Santosh Shilimkar , Sricharan R , Rajendra Nayak , Lokesh Vutla , Matt Porter , Grant Likely , Rob Herring , Vinod Koul , Dan Williams , Mark Brown , Benoit Cousson , Russell King , Arnd Bergmann , Olof Johansson , Balaji TK , Gururaja Hebbar , Chris Ball , Jason Kridner Subject: [PATCH v3 11/12] dma: edma: Keep tracking of Pending interrupts (pending_acks) Date: Mon, 5 Aug 2013 11:14:56 -0500 Message-ID: <1375719297-12871-12-git-send-email-joelf@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1375719297-12871-1-git-send-email-joelf@ti.com> References: <1375719297-12871-1-git-send-email-joelf@ti.com> MIME-Version: 1.0 CC: Linux DaVinci Kernel List , Joel Fernandes , Linux MMC List , Linux Kernel Mailing List , Linux OMAP List , Linux ARM Kernel List X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: Errors-To: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, 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 The total_processed variable was being used to keep track of when DMA is completed for a particular descriptor. This doesn't work anymore, as the interrupt for completion can come in much later than when the total_processed variable is updated to reflect that all SG entries have been issues. Introduce another variable that reflects the actual value. This will serve a purpose different from what total_processed was required to help with. Also add code that give special treatment for the first linked set interrupt as pending_acks is handled a bit differently for that case. Signed-off-by: Joel Fernandes --- drivers/dma/edma.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 061f0cf..eca1b47 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -59,6 +59,10 @@ struct edma_desc { int pset_nr; int total_processed; int next_setup_linkset; + + int no_first_ls_ack; + int pending_acks; + struct edmacc_param pset[0]; }; @@ -147,8 +151,7 @@ static void edma_execute(struct edma_chan *echan) struct edmacc_param tmp_param; /* If either we processed all psets or we're still not started */ - if (!echan->edesc || - echan->edesc->pset_nr == echan->edesc->total_processed) { + if (!echan->edesc || !echan->edesc->pending_acks) { /* Get next vdesc */ vdesc = vchan_next_desc(&echan->vchan); if (!vdesc) { @@ -180,6 +183,8 @@ static void edma_execute(struct edma_chan *echan) edesc->total_processed += total_link_set; + edesc->pending_acks += total_link_set; + total_left = edesc->pset_nr - edesc->total_processed; total_link_set = total_left > MAX_NR_LS ? @@ -190,6 +195,8 @@ static void edma_execute(struct edma_chan *echan) where total pset_nr is strictly within MAX_NR size */ if (total_left > total_link_set) edma_enable_interrupt(echan->slot[i]); + else + edesc->no_first_ls_ack = 1; /* Setup link between linked set 0 to set 1 */ edma_link(echan->slot[i], echan->slot[i+1]); @@ -210,6 +217,9 @@ static void edma_execute(struct edma_chan *echan) } edesc->total_processed += total_link_set; + + edesc->pending_acks += total_link_set; + total_left = edesc->pset_nr - edesc->total_processed; if (total_left) @@ -267,6 +277,8 @@ static void edma_execute(struct edma_chan *echan) edesc->total_processed += total_link_set; + edesc->pending_acks += total_link_set; + slot_off = total_link_set + ls_cur_off - 1; if (edesc->total_processed == edesc->pset_nr) @@ -498,8 +510,22 @@ static void edma_callback(unsigned ch_num, u16 ch_status, void *data) edesc = echan->edesc; + if (edesc->pending_acks < MAX_NR_LS) + edesc->pending_acks = 0; + else + edesc->pending_acks -= MAX_NR_LS; + + if (edesc->no_first_ls_ack) { + if (edesc->pending_acks < MAX_NR_LS) + edesc->pending_acks = 0; + else + edesc->pending_acks -= MAX_NR_LS; + + edesc->no_first_ls_ack = 0; + } + if (edesc) { - if (edesc->total_processed == edesc->pset_nr) { + if (!edesc->pending_acks) { dev_dbg(dev, "Transfer complete," " stopping channel %d\n", ch_num); edma_stop(echan->ch_num);