From patchwork Fri Mar 7 12:16:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: R Sricharan X-Patchwork-Id: 3790351 Return-Path: X-Original-To: patchwork-linux-arm@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 F2872BF540 for ; Fri, 7 Mar 2014 12:19:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1361A202A1 for ; Fri, 7 Mar 2014 12:19:07 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 181B020274 for ; Fri, 7 Mar 2014 12:19:06 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WLtj2-0004RY-PH; Fri, 07 Mar 2014 12:18:05 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WLtip-00073m-MT; Fri, 07 Mar 2014 12:17:51 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WLtiT-000706-Ej for linux-arm-kernel@merlin.infradead.org; Fri, 07 Mar 2014 12:17:29 +0000 Received: from bear.ext.ti.com ([192.94.94.41]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WLtiP-00048k-13 for linux-arm-kernel@lists.infradead.org; Fri, 07 Mar 2014 12:17:27 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s27CH2bx002996; Fri, 7 Mar 2014 06:17:02 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s27CH1NX001120; Fri, 7 Mar 2014 06:17:02 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Fri, 7 Mar 2014 06:17:01 -0600 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s27CGhw0003967; Fri, 7 Mar 2014 06:16:57 -0600 From: Sricharan R To: , , , , , Subject: [RFC PATCH 3/9] drivers: dma: omap-dma: Add a seperate xlate function to get router data Date: Fri, 7 Mar 2014 17:46:10 +0530 Message-ID: <1394194576-23741-4-git-send-email-r.sricharan@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1394194576-23741-1-git-send-email-r.sricharan@ti.com> References: <1394194576-23741-1-git-send-email-r.sricharan@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140307_121725_291778_E1F2D750 X-CRM114-Status: GOOD ( 15.23 ) X-Spam-Score: -6.9 (------) Cc: nm@ti.com, linux@arm.linux.org.uk, tony@atomide.com, rnayak@ti.com, nsekhar@ti.com, vinod.koul@intel.com, santosh.shilimkar@ti.com, dan.j.williams@intel.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, 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 Each dma-request channel can be connected to the dma-controller either directly or through a crossbar router. In such cases request lines should be routed to the dma-controller. Adding a xlate function which would retrieve and store the router data associated with a particular channel in the dma-channel specific structure. This is used to map/unmap the dma request lines. Signed-off-by: Sricharan R --- drivers/dma/omap-dma.c | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index a0d6639..38407f9 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -44,6 +44,8 @@ struct omap_chan { uint32_t ccr; struct dma_slave_config cfg; + struct dma_xbar_device *router; + unsigned dma_sig; bool cyclic; bool paused; @@ -75,6 +77,11 @@ struct omap_desc { struct omap_sg sg[0]; }; +struct omap_dma_filter_args { + void *router_data; + unsigned chan; +}; + enum { CCR_FS = BIT(5), CCR_READ_PRIORITY = BIT(6), @@ -586,6 +593,7 @@ static void omap_dma_free_chan_resources(struct dma_chan *chan) c->channel_base = NULL; od->lch_map[c->dma_ch] = NULL; vchan_free_chan_resources(&c->vc); + omap_free_dma(c->dma_ch); dev_dbg(od->ddev.dev, "freeing channel for %u\n", c->dma_sig); @@ -1088,6 +1096,34 @@ static void omap_dma_free(struct omap_dmadev *od) } } +static struct dma_chan *of_omap_dma_xlate(struct of_phandle_args *dma_spec, + struct of_dma *ofdma) +{ + int count = dma_spec->args_count; + struct of_dma_filter_info *info = ofdma->of_dma_data; + struct omap_dma_filter_args args; + struct dma_xbar_device *c = NULL; + + if (!info || !info->filter_fn) + return NULL; + + if ((count != 1) && (count != 2)) + return NULL; + + args.chan = dma_spec->args[0]; + args.router_data = NULL; + + if (count == 2) { + c = of_dma_get_router_data(dma_spec->args[1]); + + if (c && c->ops && c->ops->map && c->ops->unmap) + args.router_data = c; + } + + return dma_request_channel(info->dma_cap, info->filter_fn, + &args); +} + static int omap_dma_probe(struct platform_device *pdev) { struct omap_dmadev *od; @@ -1167,7 +1203,7 @@ static int omap_dma_probe(struct platform_device *pdev) /* Device-tree DMA controller registration */ rc = of_dma_controller_register(pdev->dev.of_node, - of_dma_simple_xlate, &omap_dma_info); + of_omap_dma_xlate, &omap_dma_info); if (rc) { pr_warn("OMAP-DMA: failed to register DMA controller\n"); dma_async_device_unregister(&od->ddev); @@ -1221,11 +1257,16 @@ static struct platform_driver omap_dma_driver = { bool omap_dma_filter_fn(struct dma_chan *chan, void *param) { + struct omap_dma_filter_args *args = param; + if (chan->device->dev->driver == &omap_dma_driver.driver) { struct omap_chan *c = to_omap_dma_chan(chan); - unsigned req = *(unsigned *)param; + unsigned req = args->chan; - return req == c->dma_sig; + if (req == c->dma_sig) { + c->router = args->router_data; + return true; + } } return false; }