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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75FFBC43334 for ; Wed, 8 Jun 2022 08:12:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232291AbiFHIMz (ORCPT ); Wed, 8 Jun 2022 04:12:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229825AbiFHIMM (ORCPT ); Wed, 8 Jun 2022 04:12:12 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF72A2CDB0B for ; Wed, 8 Jun 2022 00:41:10 -0700 (PDT) Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nyqJF-0001uw-Ts; Wed, 08 Jun 2022 09:40:57 +0200 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1nyqJF-0003MB-G2; Wed, 08 Jun 2022 09:40:57 +0200 Date: Wed, 8 Jun 2022 09:40:57 +0200 From: Sascha Hauer To: Shengjiu Wang Cc: vkoul@kernel.org, shawnguo@kernel.org, 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: <20220608074057.GU1615@pengutronix.de> References: <1654163627-30836-1-git-send-email-shengjiu.wang@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1654163627-30836-1-git-send-email-shengjiu.wang@nxp.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: dmaengine@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org On Thu, Jun 02, 2022 at 05:53:47PM +0800, Shengjiu Wang wrote: > 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 > + * @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 I think 'stride' better describes what you mean here and is more commonly used for the distance between registers. > + * @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. The description seems wrong. words_per_fifo is used like this above: sdmac->watermark_level |= FIELD_PREP(SDMA_WATERMARK_LEVEL_WORDS_PER_FIFO, (words_per_fifo - 1)); A value of 0 for words_per_fifo doesn't look sane. Generally it would be nice to see this patch together with patches that use these new features. Sascha -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |