From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753470AbaGKKYs (ORCPT ); Fri, 11 Jul 2014 06:24:48 -0400 Received: from mail-by2lp0239.outbound.protection.outlook.com ([207.46.163.239]:20586 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752897AbaGKKYM (ORCPT ); Fri, 11 Jul 2014 06:24:12 -0400 Date: Fri, 11 Jul 2014 18:11:28 +0800 From: Nicolin Chen To: CC: , , Nicolin Chen , , , , , , , , , , , , , , , , , , , , , Subject: Re: [RFC][PATCH 1/2] dma: imx-sdma: Add device to device support Message-ID: <20140711101126.GA667@MrMyself> References: <42744e778ce8a4b424d5642f86d18ef047bcc7cd.1402653667.git.nicoleotsuka@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <42744e778ce8a4b424d5642f86d18ef047bcc7cd.1402653667.git.nicoleotsuka@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:CAL;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(6009001)(24454002)(199002)(189002)(51704005)(2351001)(21056001)(107046002)(85306003)(83322001)(44976005)(19580405001)(80022001)(23726002)(68736004)(106466001)(31966008)(79102001)(77982001)(95666004)(26826002)(102836001)(76482001)(92726001)(110136001)(50466002)(99396002)(105606002)(97736001)(54356999)(97756001)(76176999)(86362001)(575784001)(81542001)(33656002)(83072002)(92566001)(83506001)(84676001)(87936001)(74502001)(20776003)(47776003)(64706001)(4396001)(81342001)(6806004)(74662001)(85852003)(19580395003)(33716001)(50986999)(46406003)(104016003)(46102001);DIR:OUT;SFP:;SCL:1;SRVR:BL2PR03MB436;H:tx30smr01.am.freescale.net;FPR:;MLV:ovrnspm;PTR:InfoDomainNonexistent;MX:1;LANG:en; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-Forefront-PRVS: 02698DF457 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=guangyu.chen@freescale.com; X-OriginatorOrg: freescale.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 13, 2014 at 06:07:04PM +0800, Nicolin Chen wrote: > This patch adds DEV_TO_DEV support for i.MX SDMA driver to support data > tranfer between two peripheral FIFOs. The per_2_per script requires two > peripheral addresses and two DMA requests. So this patch also adds them > into private structure. > > Signed-off-by: Nicolin Chen Hi Vinod, The patch has been here for a month without any comment. Could you please help on the review or give me an ack? I really hope my ASRC driver will be merged within this cycle. Thank you, Nicolin > --- > drivers/dma/imx-sdma.c | 40 ++++++++++++++++++++++++++++++----- > include/linux/platform_data/dma-imx.h | 1 + > 2 files changed, 36 insertions(+), 5 deletions(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index 85561dc..5af1a69 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -258,8 +258,9 @@ struct sdma_channel { > struct sdma_buffer_descriptor *bd; > dma_addr_t bd_phys; > unsigned int pc_from_device, pc_to_device; > + unsigned int device_to_device; > unsigned long flags; > - dma_addr_t per_address; > + dma_addr_t per_address, per_address2; > unsigned long event_mask[2]; > unsigned long watermark_level; > u32 shp_addr, per_addr; > @@ -696,6 +697,7 @@ static void sdma_get_pc(struct sdma_channel *sdmac, > > sdmac->pc_from_device = 0; > sdmac->pc_to_device = 0; > + sdmac->device_to_device = 0; > > switch (peripheral_type) { > case IMX_DMATYPE_MEMORY: > @@ -770,6 +772,7 @@ static void sdma_get_pc(struct sdma_channel *sdmac, > > sdmac->pc_from_device = per_2_emi; > sdmac->pc_to_device = emi_2_per; > + sdmac->device_to_device = per_2_per; > } > > static int sdma_load_context(struct sdma_channel *sdmac) > @@ -782,11 +785,12 @@ static int sdma_load_context(struct sdma_channel *sdmac) > int ret; > unsigned long flags; > > - if (sdmac->direction == DMA_DEV_TO_MEM) { > + if (sdmac->direction == DMA_DEV_TO_MEM) > load_address = sdmac->pc_from_device; > - } else { > + else if (sdmac->direction == DMA_DEV_TO_DEV) > + load_address = sdmac->device_to_device; > + else > load_address = sdmac->pc_to_device; > - } > > if (load_address < 0) > return load_address; > @@ -850,6 +854,12 @@ static int sdma_config_channel(struct sdma_channel *sdmac) > sdma_event_enable(sdmac, sdmac->event_id0); > } > > + if (sdmac->event_id1) { > + if (sdmac->event_id1 >= sdmac->sdma->drvdata->num_events) > + return -EINVAL; > + sdma_event_enable(sdmac, sdmac->event_id1); > + } > + > switch (sdmac->peripheral_type) { > case IMX_DMATYPE_DSP: > sdma_config_ownership(sdmac, false, true, true); > @@ -880,7 +890,12 @@ static int sdma_config_channel(struct sdma_channel *sdmac) > /* Watermark Level */ > sdmac->watermark_level |= sdmac->watermark_level; > /* Address */ > - sdmac->shp_addr = sdmac->per_address; > + if (sdmac->direction == DMA_DEV_TO_DEV) { > + sdmac->shp_addr = sdmac->per_address2; > + sdmac->per_addr = sdmac->per_address; > + } else { > + sdmac->shp_addr = sdmac->per_address; > + } > } else { > sdmac->watermark_level = 0; /* FIXME: M3_BASE_ADDRESS */ > } > @@ -974,6 +989,7 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan) > > sdmac->peripheral_type = data->peripheral_type; > sdmac->event_id0 = data->dma_request; > + sdmac->event_id1 = data->dma_request2; > > clk_enable(sdmac->sdma->clk_ipg); > clk_enable(sdmac->sdma->clk_ahb); > @@ -1213,6 +1229,19 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, > sdmac->watermark_level = dmaengine_cfg->src_maxburst * > dmaengine_cfg->src_addr_width; > sdmac->word_size = dmaengine_cfg->src_addr_width; > + } else if (dmaengine_cfg->direction == DMA_DEV_TO_DEV) { > + sdmac->per_address = dmaengine_cfg->src_addr; > + sdmac->per_address2 = dmaengine_cfg->dst_addr; > + /* > + * For per_2_per sciprt, register r7 requires two > + * watermark levels: the lower placed at bits [0-7] > + * and the higher one placed at bits [16-23]. > + */ > + sdmac->watermark_level = > + dmaengine_cfg->src_maxburst & 0xff; > + sdmac->watermark_level |= > + (dmaengine_cfg->dst_maxburst & 0xff) << 16; > + sdmac->word_size = dmaengine_cfg->dst_addr_width; > } else { > sdmac->per_address = dmaengine_cfg->dst_addr; > sdmac->watermark_level = dmaengine_cfg->dst_maxburst * > @@ -1433,6 +1462,7 @@ static struct dma_chan *sdma_xlate(struct of_phandle_args *dma_spec, > data.dma_request = dma_spec->args[0]; > data.peripheral_type = dma_spec->args[1]; > data.priority = dma_spec->args[2]; > + data.dma_request2 = 0; > > return dma_request_channel(mask, sdma_filter_fn, &data); > } > diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h > index 7aa0e89..6a1357d 100644 > --- a/include/linux/platform_data/dma-imx.h > +++ b/include/linux/platform_data/dma-imx.h > @@ -51,6 +51,7 @@ enum imx_dma_prio { > > struct imx_dma_data { > int dma_request; /* DMA request line */ > + int dma_request2; /* secondary DMA request line */ > enum sdma_peripheral_type peripheral_type; > int priority; > }; > -- > 1.8.4 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolin Chen Subject: Re: [RFC][PATCH 1/2] dma: imx-sdma: Add device to device support Date: Fri, 11 Jul 2014 18:11:28 +0800 Message-ID: <20140711101126.GA667@MrMyself> References: <42744e778ce8a4b424d5642f86d18ef047bcc7cd.1402653667.git.nicoleotsuka@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <42744e778ce8a4b424d5642f86d18ef047bcc7cd.1402653667.git.nicoleotsuka@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: vinod.koul@intel.com Cc: mark.rutland@arm.com, alsa-devel@alsa-project.org, linux-doc@vger.kernel.org, tiwai@suse.de, timur@tabi.org, lgirdwood@gmail.com, b42378@freescale.com, b02247@freescale.com, grant.likely@linaro.org, devicetree@vger.kernel.org, pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, s.hauer@pengutronix.de, b38343@freescale.com, Nicolin Chen , robh+dt@kernel.org, dan.j.williams@intel.com, rdunlap@infradead.org, linux-kernel@vger.kernel.org, broonie@kernel.org, galak@codeaurora.org, dmaengine@vger.kernel.org, linuxppc-dev@lists.ozlabs.org List-Id: devicetree@vger.kernel.org On Fri, Jun 13, 2014 at 06:07:04PM +0800, Nicolin Chen wrote: > This patch adds DEV_TO_DEV support for i.MX SDMA driver to support data > tranfer between two peripheral FIFOs. The per_2_per script requires two > peripheral addresses and two DMA requests. So this patch also adds them > into private structure. > > Signed-off-by: Nicolin Chen Hi Vinod, The patch has been here for a month without any comment. Could you please help on the review or give me an ack? I really hope my ASRC driver will be merged within this cycle. Thank you, Nicolin > --- > drivers/dma/imx-sdma.c | 40 ++++++++++++++++++++++++++++++----- > include/linux/platform_data/dma-imx.h | 1 + > 2 files changed, 36 insertions(+), 5 deletions(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index 85561dc..5af1a69 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -258,8 +258,9 @@ struct sdma_channel { > struct sdma_buffer_descriptor *bd; > dma_addr_t bd_phys; > unsigned int pc_from_device, pc_to_device; > + unsigned int device_to_device; > unsigned long flags; > - dma_addr_t per_address; > + dma_addr_t per_address, per_address2; > unsigned long event_mask[2]; > unsigned long watermark_level; > u32 shp_addr, per_addr; > @@ -696,6 +697,7 @@ static void sdma_get_pc(struct sdma_channel *sdmac, > > sdmac->pc_from_device = 0; > sdmac->pc_to_device = 0; > + sdmac->device_to_device = 0; > > switch (peripheral_type) { > case IMX_DMATYPE_MEMORY: > @@ -770,6 +772,7 @@ static void sdma_get_pc(struct sdma_channel *sdmac, > > sdmac->pc_from_device = per_2_emi; > sdmac->pc_to_device = emi_2_per; > + sdmac->device_to_device = per_2_per; > } > > static int sdma_load_context(struct sdma_channel *sdmac) > @@ -782,11 +785,12 @@ static int sdma_load_context(struct sdma_channel *sdmac) > int ret; > unsigned long flags; > > - if (sdmac->direction == DMA_DEV_TO_MEM) { > + if (sdmac->direction == DMA_DEV_TO_MEM) > load_address = sdmac->pc_from_device; > - } else { > + else if (sdmac->direction == DMA_DEV_TO_DEV) > + load_address = sdmac->device_to_device; > + else > load_address = sdmac->pc_to_device; > - } > > if (load_address < 0) > return load_address; > @@ -850,6 +854,12 @@ static int sdma_config_channel(struct sdma_channel *sdmac) > sdma_event_enable(sdmac, sdmac->event_id0); > } > > + if (sdmac->event_id1) { > + if (sdmac->event_id1 >= sdmac->sdma->drvdata->num_events) > + return -EINVAL; > + sdma_event_enable(sdmac, sdmac->event_id1); > + } > + > switch (sdmac->peripheral_type) { > case IMX_DMATYPE_DSP: > sdma_config_ownership(sdmac, false, true, true); > @@ -880,7 +890,12 @@ static int sdma_config_channel(struct sdma_channel *sdmac) > /* Watermark Level */ > sdmac->watermark_level |= sdmac->watermark_level; > /* Address */ > - sdmac->shp_addr = sdmac->per_address; > + if (sdmac->direction == DMA_DEV_TO_DEV) { > + sdmac->shp_addr = sdmac->per_address2; > + sdmac->per_addr = sdmac->per_address; > + } else { > + sdmac->shp_addr = sdmac->per_address; > + } > } else { > sdmac->watermark_level = 0; /* FIXME: M3_BASE_ADDRESS */ > } > @@ -974,6 +989,7 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan) > > sdmac->peripheral_type = data->peripheral_type; > sdmac->event_id0 = data->dma_request; > + sdmac->event_id1 = data->dma_request2; > > clk_enable(sdmac->sdma->clk_ipg); > clk_enable(sdmac->sdma->clk_ahb); > @@ -1213,6 +1229,19 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, > sdmac->watermark_level = dmaengine_cfg->src_maxburst * > dmaengine_cfg->src_addr_width; > sdmac->word_size = dmaengine_cfg->src_addr_width; > + } else if (dmaengine_cfg->direction == DMA_DEV_TO_DEV) { > + sdmac->per_address = dmaengine_cfg->src_addr; > + sdmac->per_address2 = dmaengine_cfg->dst_addr; > + /* > + * For per_2_per sciprt, register r7 requires two > + * watermark levels: the lower placed at bits [0-7] > + * and the higher one placed at bits [16-23]. > + */ > + sdmac->watermark_level = > + dmaengine_cfg->src_maxburst & 0xff; > + sdmac->watermark_level |= > + (dmaengine_cfg->dst_maxburst & 0xff) << 16; > + sdmac->word_size = dmaengine_cfg->dst_addr_width; > } else { > sdmac->per_address = dmaengine_cfg->dst_addr; > sdmac->watermark_level = dmaengine_cfg->dst_maxburst * > @@ -1433,6 +1462,7 @@ static struct dma_chan *sdma_xlate(struct of_phandle_args *dma_spec, > data.dma_request = dma_spec->args[0]; > data.peripheral_type = dma_spec->args[1]; > data.priority = dma_spec->args[2]; > + data.dma_request2 = 0; > > return dma_request_channel(mask, sdma_filter_fn, &data); > } > diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h > index 7aa0e89..6a1357d 100644 > --- a/include/linux/platform_data/dma-imx.h > +++ b/include/linux/platform_data/dma-imx.h > @@ -51,6 +51,7 @@ enum imx_dma_prio { > > struct imx_dma_data { > int dma_request; /* DMA request line */ > + int dma_request2; /* secondary DMA request line */ > enum sdma_peripheral_type peripheral_type; > int priority; > }; > -- > 1.8.4 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1lp0145.outbound.protection.outlook.com [207.46.163.145]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 54B4A1A01A8 for ; Fri, 11 Jul 2014 20:38:43 +1000 (EST) Date: Fri, 11 Jul 2014 18:11:28 +0800 From: Nicolin Chen To: Subject: Re: [RFC][PATCH 1/2] dma: imx-sdma: Add device to device support Message-ID: <20140711101126.GA667@MrMyself> References: <42744e778ce8a4b424d5642f86d18ef047bcc7cd.1402653667.git.nicoleotsuka@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" In-Reply-To: <42744e778ce8a4b424d5642f86d18ef047bcc7cd.1402653667.git.nicoleotsuka@gmail.com> Cc: mark.rutland@arm.com, alsa-devel@alsa-project.org, linux-doc@vger.kernel.org, tiwai@suse.de, timur@tabi.org, lgirdwood@gmail.com, b42378@freescale.com, b02247@freescale.com, grant.likely@linaro.org, devicetree@vger.kernel.org, pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, s.hauer@pengutronix.de, b38343@freescale.com, Nicolin Chen , robh+dt@kernel.org, dan.j.williams@intel.com, perex@perex.cz, rdunlap@infradead.org, linux-kernel@vger.kernel.org, broonie@kernel.org, galak@codeaurora.org, dmaengine@vger.kernel.org, linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Fri, Jun 13, 2014 at 06:07:04PM +0800, Nicolin Chen wrote: > This patch adds DEV_TO_DEV support for i.MX SDMA driver to support data > tranfer between two peripheral FIFOs. The per_2_per script requires two > peripheral addresses and two DMA requests. So this patch also adds them > into private structure. > > Signed-off-by: Nicolin Chen Hi Vinod, The patch has been here for a month without any comment. Could you please help on the review or give me an ack? I really hope my ASRC driver will be merged within this cycle. Thank you, Nicolin > --- > drivers/dma/imx-sdma.c | 40 ++++++++++++++++++++++++++++++----- > include/linux/platform_data/dma-imx.h | 1 + > 2 files changed, 36 insertions(+), 5 deletions(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index 85561dc..5af1a69 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -258,8 +258,9 @@ struct sdma_channel { > struct sdma_buffer_descriptor *bd; > dma_addr_t bd_phys; > unsigned int pc_from_device, pc_to_device; > + unsigned int device_to_device; > unsigned long flags; > - dma_addr_t per_address; > + dma_addr_t per_address, per_address2; > unsigned long event_mask[2]; > unsigned long watermark_level; > u32 shp_addr, per_addr; > @@ -696,6 +697,7 @@ static void sdma_get_pc(struct sdma_channel *sdmac, > > sdmac->pc_from_device = 0; > sdmac->pc_to_device = 0; > + sdmac->device_to_device = 0; > > switch (peripheral_type) { > case IMX_DMATYPE_MEMORY: > @@ -770,6 +772,7 @@ static void sdma_get_pc(struct sdma_channel *sdmac, > > sdmac->pc_from_device = per_2_emi; > sdmac->pc_to_device = emi_2_per; > + sdmac->device_to_device = per_2_per; > } > > static int sdma_load_context(struct sdma_channel *sdmac) > @@ -782,11 +785,12 @@ static int sdma_load_context(struct sdma_channel *sdmac) > int ret; > unsigned long flags; > > - if (sdmac->direction == DMA_DEV_TO_MEM) { > + if (sdmac->direction == DMA_DEV_TO_MEM) > load_address = sdmac->pc_from_device; > - } else { > + else if (sdmac->direction == DMA_DEV_TO_DEV) > + load_address = sdmac->device_to_device; > + else > load_address = sdmac->pc_to_device; > - } > > if (load_address < 0) > return load_address; > @@ -850,6 +854,12 @@ static int sdma_config_channel(struct sdma_channel *sdmac) > sdma_event_enable(sdmac, sdmac->event_id0); > } > > + if (sdmac->event_id1) { > + if (sdmac->event_id1 >= sdmac->sdma->drvdata->num_events) > + return -EINVAL; > + sdma_event_enable(sdmac, sdmac->event_id1); > + } > + > switch (sdmac->peripheral_type) { > case IMX_DMATYPE_DSP: > sdma_config_ownership(sdmac, false, true, true); > @@ -880,7 +890,12 @@ static int sdma_config_channel(struct sdma_channel *sdmac) > /* Watermark Level */ > sdmac->watermark_level |= sdmac->watermark_level; > /* Address */ > - sdmac->shp_addr = sdmac->per_address; > + if (sdmac->direction == DMA_DEV_TO_DEV) { > + sdmac->shp_addr = sdmac->per_address2; > + sdmac->per_addr = sdmac->per_address; > + } else { > + sdmac->shp_addr = sdmac->per_address; > + } > } else { > sdmac->watermark_level = 0; /* FIXME: M3_BASE_ADDRESS */ > } > @@ -974,6 +989,7 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan) > > sdmac->peripheral_type = data->peripheral_type; > sdmac->event_id0 = data->dma_request; > + sdmac->event_id1 = data->dma_request2; > > clk_enable(sdmac->sdma->clk_ipg); > clk_enable(sdmac->sdma->clk_ahb); > @@ -1213,6 +1229,19 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, > sdmac->watermark_level = dmaengine_cfg->src_maxburst * > dmaengine_cfg->src_addr_width; > sdmac->word_size = dmaengine_cfg->src_addr_width; > + } else if (dmaengine_cfg->direction == DMA_DEV_TO_DEV) { > + sdmac->per_address = dmaengine_cfg->src_addr; > + sdmac->per_address2 = dmaengine_cfg->dst_addr; > + /* > + * For per_2_per sciprt, register r7 requires two > + * watermark levels: the lower placed at bits [0-7] > + * and the higher one placed at bits [16-23]. > + */ > + sdmac->watermark_level = > + dmaengine_cfg->src_maxburst & 0xff; > + sdmac->watermark_level |= > + (dmaengine_cfg->dst_maxburst & 0xff) << 16; > + sdmac->word_size = dmaengine_cfg->dst_addr_width; > } else { > sdmac->per_address = dmaengine_cfg->dst_addr; > sdmac->watermark_level = dmaengine_cfg->dst_maxburst * > @@ -1433,6 +1462,7 @@ static struct dma_chan *sdma_xlate(struct of_phandle_args *dma_spec, > data.dma_request = dma_spec->args[0]; > data.peripheral_type = dma_spec->args[1]; > data.priority = dma_spec->args[2]; > + data.dma_request2 = 0; > > return dma_request_channel(mask, sdma_filter_fn, &data); > } > diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h > index 7aa0e89..6a1357d 100644 > --- a/include/linux/platform_data/dma-imx.h > +++ b/include/linux/platform_data/dma-imx.h > @@ -51,6 +51,7 @@ enum imx_dma_prio { > > struct imx_dma_data { > int dma_request; /* DMA request line */ > + int dma_request2; /* secondary DMA request line */ > enum sdma_peripheral_type peripheral_type; > int priority; > }; > -- > 1.8.4 >