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 E7097C3DA4A for ; Mon, 5 Aug 2024 16:54:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=X9zqk+zl/du34Fk+QSjpvBV7tAXvu2MVEdC8kxwc1d4=; b=z/cJ2l9tRU+monNOCzL709NKl6 ZJhdERUEAcA45F8GRVfqYfJwlfEzqsNqce1IR73VcbXksyNeHG5WJFRpZ3CBrXHOHILXmA6Q8UGPZ zk5B6I2NgD1/w8e58DgmoVw0IHqgjCtqkCrof4jjsaQJcaOMdhhzYaWZGZjM7HMI9EhUpIkKYvNJI FRBwR+ixG6uJCmeI1r5KDH/wD0hKq4J0MmCSgljXgFbilCTm9NAXffJ6+sPxdBAmYRFXCpUXe2Jr2 ESOEcbmxv1VBbRrZwRP/ZZgLj5Oi7isX3+2Kv9nP82G6Ousm/JdRXAzoJH3tS8/TzB6NW8Rg13fdh MxrWDLHQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sb0xt-0000000Ga6E-1E6Q; Mon, 05 Aug 2024 16:53:45 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sb0xN-0000000Ga1Q-02A4 for linux-arm-kernel@lists.infradead.org; Mon, 05 Aug 2024 16:53:14 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id D7320CE09EB; Mon, 5 Aug 2024 16:53:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5472DC32782; Mon, 5 Aug 2024 16:53:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722876790; bh=o9ugM3P0drPcA1zifw1SGACj0yG51DJhSlYgmmJa+2o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=DsVKimyh3athBWR61d5V+zWcMbrGm0KNFU0aqiYQyyEChSGD97CArvLf6R/PCv1Kx QJbMA5a3gBih/V0ziYR6u3/0LfI7tQdM+ZAN5L1l67k88eQwBIcrxl3JTJlk1j3jfc qYHfEzhESzRY1WWY6AL3BXPVG/rPjEnpJVIdQxy3yZnu+rLa//MdmQdIQ7rb70lUzF av9frt1FOdyg/C06WJdaSoztX4s3PwZzMDsVQ0kwOoBZvX3aiz/AbeDpiVQzvyzaWE XQxafxShE42D7/4Fh489pgfX1Wc9ANJmfrdXE1ObX+7aJFKj7UaxVBTs90eAEmJ2ZH dU2Z49Prd6JAg== Date: Mon, 5 Aug 2024 22:23:05 +0530 From: Vinod Koul To: Abin Joseph Cc: michal.simek@amd.com, robh@kernel.org, u.kleine-koenig@pengutronix.de, krzk+dt@kernel.org, conor+dt@kernel.org, radhey.shyam.pandey@amd.com, harini.katakam@amd.com, git@amd.com, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] dmaengine: zynqmp_dma: Add support for AMD Versal Gen 2 DMA IP Message-ID: References: <20240726062639.2609974-1-abin.joseph@amd.com> <20240726062639.2609974-3-abin.joseph@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240726062639.2609974-3-abin.joseph@amd.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240805_095313_421292_0A603316 X-CRM114-Status: GOOD ( 20.30 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 26-07-24, 11:56, Abin Joseph wrote: > ZynqMp DMA IP and AMD Versal Gen 2 DMA IP are similar but have different > interrupt register offset. Create a dedicated compatible string to > support Versal Gen 2 DMA IP with Irq register offset for interrupt > Enable/Disable/Status/Mask functionality. > > Signed-off-by: Abin Joseph > --- > drivers/dma/xilinx/zynqmp_dma.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/drivers/dma/xilinx/zynqmp_dma.c b/drivers/dma/xilinx/zynqmp_dma.c > index f31631bef961..a5d84d746929 100644 > --- a/drivers/dma/xilinx/zynqmp_dma.c > +++ b/drivers/dma/xilinx/zynqmp_dma.c > @@ -22,10 +22,10 @@ > #include "../dmaengine.h" > > /* Register Offsets */ > -#define ZYNQMP_DMA_ISR 0x100 > -#define ZYNQMP_DMA_IMR 0x104 > -#define ZYNQMP_DMA_IER 0x108 > -#define ZYNQMP_DMA_IDS 0x10C > +#define ZYNQMP_DMA_ISR (chan->irq_offset + 0x100) > +#define ZYNQMP_DMA_IMR (chan->irq_offset + 0x104) > +#define ZYNQMP_DMA_IER (chan->irq_offset + 0x108) > +#define ZYNQMP_DMA_IDS (chan->irq_offset + 0x10C) Lower case please > #define ZYNQMP_DMA_CTRL0 0x110 > #define ZYNQMP_DMA_CTRL1 0x114 > #define ZYNQMP_DMA_DATA_ATTR 0x120 > @@ -145,6 +145,9 @@ > #define tx_to_desc(tx) container_of(tx, struct zynqmp_dma_desc_sw, \ > async_tx) > > +/* IRQ Register offset for VersalGen2 */ > +#define IRQ_REG_OFFSET 0x308 > + > /** > * struct zynqmp_dma_desc_ll - Hw linked list descriptor > * @addr: Buffer address > @@ -211,6 +214,7 @@ struct zynqmp_dma_desc_sw { > * @bus_width: Bus width > * @src_burst_len: Source burst length > * @dst_burst_len: Dest burst length > + * @irq_offset: Irq register offset > */ > struct zynqmp_dma_chan { > struct zynqmp_dma_device *zdev; > @@ -235,6 +239,7 @@ struct zynqmp_dma_chan { > u32 bus_width; > u32 src_burst_len; > u32 dst_burst_len; > + u32 irq_offset; > }; > > /** > @@ -919,6 +924,9 @@ static int zynqmp_dma_chan_probe(struct zynqmp_dma_device *zdev, > return -EINVAL; > } > > + if (of_device_is_compatible(node, "amd,versal2-dma-1.0")) > + chan->irq_offset = IRQ_REG_OFFSET; This should be added as driver_data > + > chan->is_dmacoherent = of_property_read_bool(node, "dma-coherent"); > zdev->chan = chan; > tasklet_setup(&chan->tasklet, zynqmp_dma_do_tasklet); > @@ -1162,6 +1170,7 @@ static void zynqmp_dma_remove(struct platform_device *pdev) > > static const struct of_device_id zynqmp_dma_of_match[] = { > { .compatible = "xlnx,zynqmp-dma-1.0", }, > + { .compatible = "amd,versal2-dma-1.0", }, > {} > }; > MODULE_DEVICE_TABLE(of, zynqmp_dma_of_match); > -- > 2.25.1 -- ~Vinod