Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795054818; b=jvwNFbzgedYO3T8JxP5n2eXn9AjfU3ZnwiujZ1uR1lG63rMQj2EGw0nLjM6NhPHZZj5D RJlwqtVhboSSy8mkj3RIppxLA0ImSJFf+mOCx0tl7b/oVs5c7DIhEKwrepmrMTkFB8za3 YUGF2+uUuRuG7Du8Q2Y97/3FlCUpUxnMEaptPOVgWiL12nzi57pXxlMSoHwws3xWbyqMe 0gzJuwB32sbbiBgMRsVPg59nVzY+bkfPcJQc/rprdd/uKDFtkoIKEUVhB2TUNwMzGUrR7 8jJVmMNqVashf2yw1LQSJmkFuTH1nLcpR53g5FpASGgv7e3YFJyPpBDx2/9Jbd2P5MQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795054818; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=PUeJeYP4MtGYxVM0NOKHUx7KauhjK0/LtZYXsmUYXk0=; b=G3CECiJTCYbua2nKVXn63mT/csZ56ApkNNO4qhOymMgggVuuKIcJZtc3z8DCBUrjea7g PP8PV8g2XQOxW6lptA9hKx/L9Y18OsljZZ/43bgB/mQ+dBYSOJSYjsdpak2Lg6fB9Wbrx hvYzjFIMfMiZ+nkaAJwyzdMNtHVpHKiozS9lNjKFWNmj7oaD/OtS21HS6lfGvWImMhrk4 NGPl6AaFtuEB1WwTVPG4qnq0w/jcjBJExb2xolvbKtYSO0Jj/pTK+7GtEBXphP3w/6myZ 9xDOsBRzHZi6XOmKmnRMfWCOdst9JdxDwh2MvJLtFw3sZSLV6r2TKQLu2qdieO+9oGA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="ZGdIyy/O"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E731606A330; Thu, 19 Nov 2026 02:20:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=ZGdIyy/O Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5F9BA1F000C4; Thu, 19 Nov 2026 02:20:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795054817; bh=PUeJeYP4MtGYxVM0NOKHUx7KauhjK0/LtZYXsmUYXk0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZGdIyy/OOamrb4ppr+KEw5dBWE0bA46XzFVzOIGmJFSih8llCQc2M5w0QbD4RfIn/ /DWZ0jbIuxn2oO5RGcZ68mFHv9HJYZWTCwIP+j2OQ2MV6qAcUByTSbeLXCnu6av8C3 ov6AOGUqR9OAsZ0NdzyWo6ktp2G4mZD2MUFK3wB0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Abin Joseph , Radhey Shyam Pandey , Vinod Koul , Sasha Levin Subject: [PATCH 5.15 1409/2214] dmaengine: zynqmp_dma: Add support for AMD Versal Gen 2 DMA IP Date: Wed, 18 Nov 2026 15:51:25 +0100 Message-ID: <20261118150107.623070071@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Abin Joseph [ Upstream commit 13113f750a4ae0b1770fa25dc94852977ebfb942 ] 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 Reviewed-by: Radhey Shyam Pandey Link: https://lore.kernel.org/r/20240808100024.317497-3-abin.joseph@amd.com Signed-off-by: Vinod Koul Stable-dep-of: 0266dac57019 ("dmaengine: zynqmp_dma: Fix chan probe/remove error handling") Signed-off-by: Sasha Levin --- drivers/dma/xilinx/zynqmp_dma.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/dma/xilinx/zynqmp_dma.c b/drivers/dma/xilinx/zynqmp_dma.c index 931c292e990f7..15289537bb429 100644 --- a/drivers/dma/xilinx/zynqmp_dma.c +++ b/drivers/dma/xilinx/zynqmp_dma.c @@ -24,10 +24,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) #define ZYNQMP_DMA_CTRL0 0x110 #define ZYNQMP_DMA_CTRL1 0x114 #define ZYNQMP_DMA_DATA_ATTR 0x120 @@ -147,6 +147,9 @@ #define tx_to_desc(tx) container_of(tx, struct zynqmp_dma_desc_sw, \ async_tx) +/* IRQ Register offset for Versal Gen 2 */ +#define IRQ_REG_OFFSET 0x308 + /** * struct zynqmp_dma_desc_ll - Hw linked list descriptor * @addr: Buffer address @@ -213,6 +216,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; @@ -237,6 +241,7 @@ struct zynqmp_dma_chan { u32 bus_width; u32 src_burst_len; u32 dst_burst_len; + u32 irq_offset; }; /** @@ -255,6 +260,14 @@ struct zynqmp_dma_device { struct clk *clk_apb; }; +struct zynqmp_dma_config { + u32 offset; +}; + +static const struct zynqmp_dma_config versal2_dma_config = { + .offset = IRQ_REG_OFFSET, +}; + static inline void zynqmp_dma_writeq(struct zynqmp_dma_chan *chan, u32 reg, u64 value) { @@ -878,6 +891,7 @@ static int zynqmp_dma_chan_probe(struct zynqmp_dma_device *zdev, struct zynqmp_dma_chan *chan; struct resource *res; struct device_node *node = pdev->dev.of_node; + const struct zynqmp_dma_config *match_data; int err; chan = devm_kzalloc(zdev->dev, sizeof(*chan), GFP_KERNEL); @@ -906,6 +920,10 @@ static int zynqmp_dma_chan_probe(struct zynqmp_dma_device *zdev, return -EINVAL; } + match_data = of_device_get_match_data(&pdev->dev); + if (match_data) + chan->irq_offset = match_data->offset; + chan->is_dmacoherent = of_property_read_bool(node, "dma-coherent"); zdev->chan = chan; tasklet_setup(&chan->tasklet, zynqmp_dma_do_tasklet); @@ -1139,6 +1157,7 @@ static int zynqmp_dma_remove(struct platform_device *pdev) } static const struct of_device_id zynqmp_dma_of_match[] = { + { .compatible = "amd,versal2-dma-1.0", .data = &versal2_dma_config }, { .compatible = "xlnx,zynqmp-dma-1.0", }, {} }; -- 2.53.0