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 X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E579C43381 for ; Sat, 16 Mar 2019 11:13:42 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 2F52D218D0 for ; Sat, 16 Mar 2019 11:13:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dd+s3aDh"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="hcH5UNUx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2F52D218D0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject: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=YqXsJ3358aWT4N3+O4e3srhtJGmu61jl1ZsH4yAyh+U=; b=dd+s3aDh7sXAhr RC7voLs3oAQLKIJ/qoDvclq7oru9mXY9FdCo/jBSq0H/rzSCTFkO51g+OGkEQjo33nRkeW+w8d1Jh 6F3ccwwbB8LJrmvNBa096nQ6GsAonEE8ug47YNMFymEhPYGpZQIFlEs9P8x+RuH/vwyb9vllOPyjz VF0+xoE0nSdKP0B/0S2+Va06AMSeHLidHTpwk7Gr13Vv8Di4Aw3eRuG083eSrfxG/6ugeOsFLXem7 eaWUTgIziizs3kng02THkLuT7H/Buhh9LTlmqvDt+FtC+A6UnLSrI9PlpdKgeqG+UpU7KsnHMKzn1 ohN3ZN8Ugibs7A0XiSTg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h57Fw-0004Pq-Iw; Sat, 16 Mar 2019 11:13:36 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h57Fu-0004PP-7O for linux-arm-kernel@lists.infradead.org; Sat, 16 Mar 2019 11:13:35 +0000 Received: from localhost (unknown [122.167.125.161]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D9B18218D0; Sat, 16 Mar 2019 11:13:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552734813; bh=z5Exqi4TeyYAuZw8+v0Q0pSSJT4jA7B75Z9mnIzr9DU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=hcH5UNUxP8qVPkjzO/JDSgHLW2BYyvYFowjm/tAmfoZO+Thr+3j1Qfq59CDzsZTpk 6adTYZ2Y3+7KfjsddwfhnuDJp0dWG1uJ/nmITO3CknRly7ijk2jfkNHSc1q7soKvuM HRZDZlYhbPR/FSRg+CQOUCVmlpt0a8yyCjjraVkk= Date: Sat, 16 Mar 2019 16:43:24 +0530 From: Vinod Koul To: Jernej Skrabec Subject: Re: [PATCH 5/6] dmaengine: sun6i: Add support for H6 DMA Message-ID: <20190316111324.GI5348@vkoul-mobl> References: <20190307165829.9086-1-jernej.skrabec@siol.net> <20190307165829.9086-6-jernej.skrabec@siol.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190307165829.9086-6-jernej.skrabec@siol.net> User-Agent: Mutt/1.11.3 (2019-02-01) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190316_041334_303318_2582A1EE X-CRM114-Status: GOOD ( 21.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, maxime.ripard@bootlin.com, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, wens@csie.org, robh+dt@kernel.org, dmaengine@vger.kernel.org, dan.j.williams@intel.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 07-03-19, 17:58, Jernej Skrabec wrote: > H6 DMA has more than 32 supported DRQs, which means that configuration > register is slightly rearranged. It also needs additional clock to be > enabled. Okay how many register are rearraged in the new IP block. If there are large changes, consider using regmap_fields to abstract the register and bit differences.. > > Add support for it. > > Signed-off-by: Jernej Skrabec > --- > drivers/dma/sun6i-dma.c | 44 +++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 42 insertions(+), 2 deletions(-) > > diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c > index 6a37f8bb39b1..eceedd139651 100644 > --- a/drivers/dma/sun6i-dma.c > +++ b/drivers/dma/sun6i-dma.c > @@ -69,14 +69,19 @@ > > #define DMA_CHAN_CUR_CFG 0x0c > #define DMA_CHAN_MAX_DRQ_A31 0x1f > +#define DMA_CHAN_MAX_DRQ_H6 0x3f > #define DMA_CHAN_CFG_SRC_DRQ_A31(x) ((x) & DMA_CHAN_MAX_DRQ_A31) > +#define DMA_CHAN_CFG_SRC_DRQ_H6(x) ((x) & DMA_CHAN_MAX_DRQ_H6) > #define DMA_CHAN_CFG_SRC_MODE_A31(x) (((x) & 0x1) << 5) > +#define DMA_CHAN_CFG_SRC_MODE_H6(x) (((x) & 0x1) << 8) > #define DMA_CHAN_CFG_SRC_BURST_A31(x) (((x) & 0x3) << 7) > #define DMA_CHAN_CFG_SRC_BURST_H3(x) (((x) & 0x3) << 6) > #define DMA_CHAN_CFG_SRC_WIDTH(x) (((x) & 0x3) << 9) > > #define DMA_CHAN_CFG_DST_DRQ_A31(x) (DMA_CHAN_CFG_SRC_DRQ_A31(x) << 16) > +#define DMA_CHAN_CFG_DST_DRQ_H6(x) (DMA_CHAN_CFG_SRC_DRQ_H6(x) << 16) > #define DMA_CHAN_CFG_DST_MODE_A31(x) (DMA_CHAN_CFG_SRC_MODE_A31(x) << 16) > +#define DMA_CHAN_CFG_DST_MODE_H6(x) (DMA_CHAN_CFG_SRC_MODE_H6(x) << 16) > #define DMA_CHAN_CFG_DST_BURST_A31(x) (DMA_CHAN_CFG_SRC_BURST_A31(x) << 16) > #define DMA_CHAN_CFG_DST_BURST_H3(x) (DMA_CHAN_CFG_SRC_BURST_H3(x) << 16) > #define DMA_CHAN_CFG_DST_WIDTH(x) (DMA_CHAN_CFG_SRC_WIDTH(x) << 16) > @@ -319,12 +324,24 @@ static void sun6i_set_drq_a31(u32 *p_cfg, s8 src_drq, s8 dst_drq) > DMA_CHAN_CFG_DST_DRQ_A31(dst_drq); > } > > +static void sun6i_set_drq_h6(u32 *p_cfg, s8 src_drq, s8 dst_drq) > +{ > + *p_cfg |= DMA_CHAN_CFG_SRC_DRQ_H6(src_drq) | > + DMA_CHAN_CFG_DST_DRQ_H6(dst_drq); > +} > + > static void sun6i_set_mode_a31(u32 *p_cfg, s8 src_mode, s8 dst_mode) > { > *p_cfg |= DMA_CHAN_CFG_SRC_MODE_A31(src_mode) | > DMA_CHAN_CFG_DST_MODE_A31(dst_mode); > } > > +static void sun6i_set_mode_h6(u32 *p_cfg, s8 src_mode, s8 dst_mode) > +{ > + *p_cfg |= DMA_CHAN_CFG_SRC_MODE_H6(src_mode) | > + DMA_CHAN_CFG_DST_MODE_H6(dst_mode); > +} > + > static size_t sun6i_get_chan_size(struct sun6i_pchan *pchan) > { > struct sun6i_desc *txd = pchan->desc; > @@ -1160,6 +1177,28 @@ static struct sun6i_dma_config sun50i_a64_dma_cfg = { > BIT(DMA_SLAVE_BUSWIDTH_8_BYTES), > }; > > +/* > + * The H6 binding uses the number of dma channels from the > + * device tree node. > + */ > +static struct sun6i_dma_config sun50i_h6_dma_cfg = { > + .clock_autogate_enable = sun6i_enable_clock_autogate_h3, > + .set_burst_length = sun6i_set_burst_length_h3, > + .set_drq = sun6i_set_drq_h6, > + .set_mode = sun6i_set_mode_h6, > + .src_burst_lengths = BIT(1) | BIT(4) | BIT(8) | BIT(16), > + .dst_burst_lengths = BIT(1) | BIT(4) | BIT(8) | BIT(16), > + .src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | > + BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | > + BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | > + BIT(DMA_SLAVE_BUSWIDTH_8_BYTES), > + .dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | > + BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | > + BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | > + BIT(DMA_SLAVE_BUSWIDTH_8_BYTES), > + .mbus_clk = true, > +}; > + > /* > * The V3s have only 8 physical channels, a maximum DRQ port id of 23, > * and a total of 24 usable source and destination endpoints. > @@ -1190,6 +1229,7 @@ static const struct of_device_id sun6i_dma_match[] = { > { .compatible = "allwinner,sun8i-h3-dma", .data = &sun8i_h3_dma_cfg }, > { .compatible = "allwinner,sun8i-v3s-dma", .data = &sun8i_v3s_dma_cfg }, > { .compatible = "allwinner,sun50i-a64-dma", .data = &sun50i_a64_dma_cfg }, > + { .compatible = "allwinner,sun50i-h6-dma", .data = &sun50i_h6_dma_cfg }, > { /* sentinel */ } > }; > MODULE_DEVICE_TABLE(of, sun6i_dma_match); > @@ -1288,8 +1328,8 @@ static int sun6i_dma_probe(struct platform_device *pdev) > ret = of_property_read_u32(np, "dma-requests", &sdc->max_request); > if (ret && !sdc->max_request) { > dev_info(&pdev->dev, "Missing dma-requests, using %u.\n", > - DMA_CHAN_MAX_DRQ_A31); > - sdc->max_request = DMA_CHAN_MAX_DRQ_A31; > + DMA_CHAN_MAX_DRQ_H6); > + sdc->max_request = DMA_CHAN_MAX_DRQ_H6; > } > > /* > -- > 2.21.0 -- ~Vinod _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel