From patchwork Tue Oct 4 16:55:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 9362367 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 43D1260752 for ; Tue, 4 Oct 2016 22:48:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3394928B31 for ; Tue, 4 Oct 2016 22:48:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2807228C5D; Tue, 4 Oct 2016 22:48:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B228E28B31 for ; Tue, 4 Oct 2016 22:48:36 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 4AEF2267051; Wed, 5 Oct 2016 00:48:35 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 2F639266FA4; Wed, 5 Oct 2016 00:46:15 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 2F595266F06; Tue, 4 Oct 2016 18:56:00 +0200 (CEST) Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by alsa0.perex.cz (Postfix) with ESMTP id 25B99266E84 for ; Tue, 4 Oct 2016 18:55:54 +0200 (CEST) Received: by mail.free-electrons.com (Postfix, from userid 110) id 07B7C2D6; Tue, 4 Oct 2016 18:55:54 +0200 (CEST) Received: from localhost (LFbn-1-2281-83.w90-76.abo.wanadoo.fr [90.76.98.83]) by mail.free-electrons.com (Postfix) with ESMTPSA id BD1791DD; Tue, 4 Oct 2016 18:55:53 +0200 (CEST) Date: Tue, 4 Oct 2016 18:55:54 +0200 From: Maxime Ripard To: Jean-Francois Moine Message-ID: <20161004165553.GS5228@lukather> References: <3a2404510b5f8b16ae3bb193982d70f158700b2b.1475571575.git.mylene.josserand@free-electrons.com> <20161004124011.d7f5754a082d5f17d5185fc4@free.fr> MIME-Version: 1.0 In-Reply-To: <20161004124011.d7f5754a082d5f17d5185fc4@free.fr> User-Agent: Mutt/1.5.24 (2015-08-30) Cc: mark.rutland@arm.com, thomas.petazzoni@free-electrons.com, alsa-devel@alsa-project.org, linux-sunxi@googlegroups.com, devicetree@vger.kernel.org, vinod.koul@intel.com, linux-kernel@vger.kernel.org, mturquette@baylibre.com, tiwai@suse.com, sboyd@codeaurora.org, lgirdwood@gmail.com, robh+dt@kernel.org, wens@csie.org, broonie@kernel.org, alexandre.belloni@free-electrons.com, dmaengine@vger.kernel.org, =?iso-8859-1?Q?Myl=E8ne?= Josserand , lee.jones@linaro.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [alsa-devel] [PATCH 01/14] dma: sun6i-dma: Add burst case of 4 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" 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 X-Virus-Scanned: ClamAV using ClamSMTP On Tue, Oct 04, 2016 at 12:40:11PM +0200, Jean-Francois Moine wrote: > On Tue, 4 Oct 2016 11:46:14 +0200 > Mylène Josserand wrote: > > > Add the case of a burst of 4 which is handled by the SoC. > > > > Signed-off-by: Mylène Josserand > > --- > > drivers/dma/sun6i-dma.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c > > index 8346199..0485204 100644 > > --- a/drivers/dma/sun6i-dma.c > > +++ b/drivers/dma/sun6i-dma.c > > @@ -240,6 +240,8 @@ static inline s8 convert_burst(u32 maxburst) > > switch (maxburst) { > > case 1: > > return 0; > > + case 4: > > + return 1; > > case 8: > > return 2; > > default: > > -- > > 2.9.3 > > This patch has already been rejected by Maxime in the threads > http://www.spinics.net/lists/dmaengine/msg08610.html > and > http://www.spinics.net/lists/dmaengine/msg08719.html > > I hope you will find the way he wants for this maxburst to be added. I was talking about something along these lines (not tested): -------8<--------- Maxime diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index 83461994e418..573ac4608293 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -240,6 +240,8 @@ static inline s8 convert_burst(u32 maxburst) switch (maxburst) { case 1: return 0; + case 4: + return 1; case 8: return 2; default: @@ -1110,11 +1112,19 @@ static int sun6i_dma_probe(struct platform_device *pdev) sdc->slave.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); + sdc->slave.dst_bursts = BIT(1) | BIT(8); + sdc->slave.src_bursts = BIT(1) | BIT(8); sdc->slave.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); sdc->slave.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; sdc->slave.dev = &pdev->dev; + if (of_device_is_compatible(pdev->dev.of_node, + "allwinner,sun8i-h3-dma")) { + sdc->slave.dst_bursts |= BIT(4); + sdc->slave.src_bursts |= BIT(4); + } + sdc->pchans = devm_kcalloc(&pdev->dev, sdc->cfg->nr_max_channels, sizeof(struct sun6i_pchan), GFP_KERNEL); if (!sdc->pchans) diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index cc535a478bae..f7bbec24bb58 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -673,6 +673,8 @@ struct dma_filter { * each type of direction, the dma controller should fill (1 << * ) and same should be checked by controller as well * @max_burst: max burst capability per-transfer + * @dst_bursts: bitfield of the available burst sizes for the destination + * @src_bursts: bitfield of the available burst sizes for the source * @residue_granularity: granularity of the transfer residue reported * by tx_status * @device_alloc_chan_resources: allocate resources and return the @@ -800,6 +802,14 @@ struct dma_device { static inline int dmaengine_slave_config(struct dma_chan *chan, struct dma_slave_config *config) { + if (config->src_maxburst && config->device->src_bursts && + !(BIT(config->src_maxburst) & config->device->src_bursts)) + return -EINVAL; + + if (config->dst_maxburst && config->device->dst_bursts && + !(BIT(config->dst_maxburst) & config->device->dst_bursts)) + return -EINVAL; + if (chan->device->device_config) return chan->device->device_config(chan, config); -------8<------------