From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C657CC43334 for ; Thu, 9 Jun 2022 06:09:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hSqzaLNYBOkRuFFev+2hR0lhCM9uaTTn7+fFXsYQuPA=; b=te1xHTANNsyPAA lo7EjhpMiBr4HBQSb/opTM4wCl8MJuIH9jfhWhedLAbynCQ6DI6Q72VNChT+fdk52tRqn8pa+Vf7H cl9eZ9DnzIQ5jlD7Tm5NQFHfXrTZziMOVkcx0FDYV5xEdR6X7tyjbHFDwRstfC6J6m7zMn+50jS3b uETh++Y5VWoz/FC4qDOa4GsDZLjh8TVza3WD66SeAiX7U3JpNxQMvCplASOHt9vtkE3g6S2npnboo f/3lasrMYCdLEbZKzH+32MgIhq0oVKJaVvEVRXR1r7MAipvoufigo8XiI3od4z+IVN1YxAI5tezGk YX3HpQpHO3AmVc9N2/Kg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nzBLc-00H09L-Vm; Thu, 09 Jun 2022 06:08:49 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nzBLZ-00H07I-GV for linux-arm-kernel@lists.infradead.org; Thu, 09 Jun 2022 06:08:47 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 80D8961D74; Thu, 9 Jun 2022 06:08:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7EEBC34114; Thu, 9 Jun 2022 06:08:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654754921; bh=rRyh6mUIdjpNaoFvIEvMubMdp2SSy0/D0Unf7o8kRrA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=QNSnlWsCWErljOe9PHQ67cSyld0USpnwcn2om9xWHqZQXD4lPLZlaaIsMGA8q6Te+ vjpkPktw1+zyIXbEI/rxkaNgVyjAamAkaxSkK9lZ2NAFu6aGqjJhfbC6Lg7A5CR9bz pO9sU//NQUEJdl2Yn5YYFF8As1+gp6RBWGfWf9/sKauDeHQEHVog+8Hyic+PZbAo1q WOY2eHEAMScDFgwNwxm67Ta0ulMYPqgLrtFFyFDhsVaSiLEbwI3BWCJE2uMT0DrTD4 4g8m81nyE4+OJ6I7YTMAb0NhHAwqh49H8TcyktXsnwx1nrGR4ujp6IclDdyInmenUT 25w/YGu/KDgQw== Date: Thu, 9 Jun 2022 11:38:37 +0530 From: Vinod Koul To: Shengjiu Wang Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, shengjiu.wang@gmail.com, joy.zou@nxp.com, linux-imx@nxp.com, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] dma: imx-sdma: Add FIFO offset support for multi FIFO script Message-ID: References: <1654163627-30836-1-git-send-email-shengjiu.wang@nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1654163627-30836-1-git-send-email-shengjiu.wang@nxp.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220608_230845_668938_ABD6BDEA X-CRM114-Status: GOOD ( 27.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 02-06-22, 17:53, Shengjiu Wang wrote: subsystem tag should be dmaengine > The peripheral may have several FIFOs, but some case just select > some FIFOs from them for data transfer, which means FIFO0 and FIFO2 > may be selected. So add FIFO address offset support, 0 means all FIFOs > are continuous, 1 means 1 word offset between FIFOs. All offset between > FIFOs should be same. > > Another option words_per_fifo means how many audio channel data copied > to one FIFO one time, 0 means one channel per FIFO, 1 means 2 channels > per FIFO. > > If 'n_fifos_src = 4' and 'words_per_fifo = 1', it means the first two > words(channels) fetch from FIFO0 and then jump to FIFO1 for next two words, > and so on after the last FIFO3 fetched, roll back to FIFO0. > > Signed-off-by: Joy Zou > Signed-off-by: Shengjiu Wang > --- > drivers/dma/imx-sdma.c | 26 ++++++++++++++++++++++++-- > include/linux/dma/imx-dma.h | 13 +++++++++++++ > 2 files changed, 37 insertions(+), 2 deletions(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index 111beb7138e0..3c95719286bc 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -183,6 +183,8 @@ > BIT(DMA_DEV_TO_DEV)) > > #define SDMA_WATERMARK_LEVEL_N_FIFOS GENMASK(15, 12) > +#define SDMA_WATERMARK_LEVEL_OFF_FIFOS GENMASK(19, 16) > +#define SDMA_WATERMARK_LEVEL_WORDS_PER_FIFO GENMASK(31, 28) > #define SDMA_WATERMARK_LEVEL_SW_DONE BIT(23) > > #define SDMA_DONE0_CONFIG_DONE_SEL BIT(7) > @@ -429,6 +431,9 @@ struct sdma_desc { > * @n_fifos_src: number of source device fifos > * @n_fifos_dst: number of destination device fifos > * @sw_done: software done flag > + * @off_fifos_src: offset for source device FIFOs > + * @off_fifos_dst: offset for destination device FIFOs Will both of these be used together...? > + * @words_per_fifo: copy number of words one time for one FIFO > */ > struct sdma_channel { > struct virt_dma_chan vc; > @@ -456,6 +461,9 @@ struct sdma_channel { > bool is_ram_script; > unsigned int n_fifos_src; > unsigned int n_fifos_dst; > + unsigned int off_fifos_src; > + unsigned int off_fifos_dst; > + unsigned int words_per_fifo; > bool sw_done; > }; > > @@ -1245,17 +1253,28 @@ static void sdma_set_watermarklevel_for_p2p(struct sdma_channel *sdmac) > static void sdma_set_watermarklevel_for_sais(struct sdma_channel *sdmac) > { > unsigned int n_fifos; > + unsigned int off_fifos; > + unsigned int words_per_fifo; > > if (sdmac->sw_done) > sdmac->watermark_level |= SDMA_WATERMARK_LEVEL_SW_DONE; > > - if (sdmac->direction == DMA_DEV_TO_MEM) > + if (sdmac->direction == DMA_DEV_TO_MEM) { > n_fifos = sdmac->n_fifos_src; > - else > + off_fifos = sdmac->off_fifos_src; > + } else { > n_fifos = sdmac->n_fifos_dst; > + off_fifos = sdmac->off_fifos_dst; > + } > + > + words_per_fifo = sdmac->words_per_fifo; > > sdmac->watermark_level |= > FIELD_PREP(SDMA_WATERMARK_LEVEL_N_FIFOS, n_fifos); > + sdmac->watermark_level |= > + FIELD_PREP(SDMA_WATERMARK_LEVEL_OFF_FIFOS, off_fifos); > + sdmac->watermark_level |= > + FIELD_PREP(SDMA_WATERMARK_LEVEL_WORDS_PER_FIFO, (words_per_fifo - 1)); > } > > static int sdma_config_channel(struct dma_chan *chan) > @@ -1769,6 +1788,9 @@ static int sdma_config(struct dma_chan *chan, > } > sdmac->n_fifos_src = sdmacfg->n_fifos_src; > sdmac->n_fifos_dst = sdmacfg->n_fifos_dst; > + sdmac->off_fifos_src = sdmacfg->off_fifos_src; > + sdmac->off_fifos_dst = sdmacfg->off_fifos_dst; > + sdmac->words_per_fifo = sdmacfg->words_per_fifo; > sdmac->sw_done = sdmacfg->sw_done; > } > > diff --git a/include/linux/dma/imx-dma.h b/include/linux/dma/imx-dma.h > index 8887762360d4..0c739d571956 100644 > --- a/include/linux/dma/imx-dma.h > +++ b/include/linux/dma/imx-dma.h > @@ -70,6 +70,16 @@ static inline int imx_dma_is_general_purpose(struct dma_chan *chan) > * struct sdma_peripheral_config - SDMA config for audio > * @n_fifos_src: Number of FIFOs for recording > * @n_fifos_dst: Number of FIFOs for playback > + * @off_fifos_src: FIFO address offset for recording, 0 means all FIFOs are > + * continuous, 1 means 1 word offset between FIFOs. All offset > + * between FIFOs should be same. > + * @off_fifos_dst: FIFO address offset for playback > + * @words_per_fifo: numbers of words per FIFO fetch/fill, 0 means > + * one channel per FIFO, 1 means 2 channels per FIFO.. > + * If 'n_fifos_src = 4' and 'words_per_fifo = 1', it > + * means the first two words(channels) fetch from FIFO0 > + * and then jump to FIFO1 for next two words, and so on > + * after the last FIFO3 fetched, roll back to FIFO0. > * @sw_done: Use software done. Needed for PDM (micfil) > * > * Some i.MX Audio devices (SAI, micfil) have multiple successive FIFO > @@ -82,6 +92,9 @@ static inline int imx_dma_is_general_purpose(struct dma_chan *chan) > struct sdma_peripheral_config { > int n_fifos_src; > int n_fifos_dst; > + int off_fifos_src; > + int off_fifos_dst; > + int words_per_fifo; > bool sw_done; > }; > > -- > 2.17.1 -- ~Vinod _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel