Skip to contentSkip to conversation

Add support for ADMA

PATCH Applied Abin Joseph 4 participants 6 messages Aug 8, 2024 – Aug 29, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover Add support for ADMA

Add support for Versal Gen 2 DMA IP by adding a compatible string and separate Versal Gen 2 DMA IP register offset.

---

Changes in v2:

1/2:
- Remove example binding documentation.
- Rearrange the order of compatible.

2/2:
- Use lower case for hexa decimal values.
- Update the logic to use of_device_get_match_data instead of of_device_is_compatible.

Changes in v1:
https://lore.kernel.org/linux-arm-kernel/[email protected]/

---

Abin Joseph (2):
dt-bindings: dmaengine: zynqmp_dma: Add a new compatible string
dmaengine: zynqmp_dma: Add support for AMD Versal Gen 2 DMA IP

 .../dma/xilinx/xlnx,zynqmp-dma-1.0.yaml       |  4 ++-
 drivers/dma/xilinx/zynqmp_dma.c               | 27 ++++++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 1/2 dt-bindings: dmaengine: zynqmp_dma: Add a new compatible string

Add compatible string "amd,versal2-dma-1.0" to support AMD Versal Gen 2 platform.

AMD Versal Gen 2 has 8 LPD DMA IPs in PS that can be used as general purpose DMAs which is designed to support memory to memory and memory to IO buffer transfer. Versal Gen 2 DMA IP has different interrupt register offset.

---

Changes in v2:
- Rearrange the order of compatible.
- Remove example binding documentation.

---
 .../devicetree/bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml +3 -1
index 769ce23aaac2..ac3198953b8e 100644
@@ -24,7 +24,9 @@ properties:
     const: 1
 
   compatible:
-    const: xlnx,zynqmp-dma-1.0
+    enum:
+      - amd,versal2-dma-1.0
+      - xlnx,zynqmp-dma-1.0
 
   reg:
     description: memory map for gdma/adma module access
Signature · 1 line
2.34.1
Acked-by on v2 1/2
#2 lore raw

Re: [PATCH v2 1/2] dt-bindings: dmaengine: zynqmp_dma: Add a new compatible string

Quoted 10 lines · Abin Joseph

Add compatible string "amd,versal2-dma-1.0" to support AMD Versal Gen 2 platform.

AMD Versal Gen 2 has 8 LPD DMA IPs in PS that can be used as general purpose DMAs which is designed to support memory to memory and memory to IO buffer transfer. Versal Gen 2 DMA IP has different interrupt register offset.

---

Best regards,
Krzysztof

#3 lore raw

PATCH v2 2/2 dmaengine: zynqmp_dma: Add support for AMD Versal Gen 2 DMA IP

In reply to Abin Joseph

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.

---

Changes in v2:
- Update the logic to use of_device_get_match_data instead of of_device_is_compatible.
- Use lower case hexa decimal value for macros.

---
 drivers/dma/xilinx/zynqmp_dma.c | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)
drivers/dma/xilinx/zynqmp_dma.c +23 -4
index f31631bef961..9ae46f1198fe 100644
@@ -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)
 #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 Versal Gen 2 */
+#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;
 };
 
 /**
@@ -253,6 +258,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)
 {
@@ -892,6 +905,7 @@ static int zynqmp_dma_chan_probe(struct zynqmp_dma_device *zdev,
 {
 	struct zynqmp_dma_chan *chan;
 	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);
@@ -919,6 +933,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);
@@ -1161,6 +1179,7 @@ static void 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", },
 	{}
 };
Signature · 1 line
2.34.1
Reviewed-by on v2 2/2
#4 lore raw

RE: [PATCH v2 2/2] dmaengine: zynqmp_dma: Add support for AMD Versal Gen 2 DMA IP

Quoted 15 lines

-----Original Message-----
From: Abin Joseph <[email protected]>
Sent: Thursday, August 8, 2024 3:30 PM
To: [email protected]; Simek, Michal <[email protected]>; [email protected]; [email protected]; [email protected]; u.kleine- [email protected]; Pandey, Radhey Shyam <[email protected]>; Katakam, Harini <[email protected]>
Cc: git (AMD-Xilinx) <[email protected]>; Joseph, Abin <[email protected]>; [email protected]; [email protected]; [email protected]; linux- [email protected]
Subject: [PATCH v2 2/2] dmaengine: zynqmp_dma: Add support for AMD Versal Gen 2 DMA IP

Quoted 6 lines

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.

Thanks!

Quoted 108 lines

---

Changes in v2:
- Update the logic to use of_device_get_match_data instead of of_device_is_compatible.
- Use lower case hexa decimal value for macros.

---
 drivers/dma/xilinx/zynqmp_dma.c | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)
drivers/dma/xilinx/zynqmp_dma.c +7 -4
index f31631bef961..9ae46f1198fe 100644
@@ -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)
 #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 Versal Gen 2 */
+#define IRQ_REG_OFFSET			0x308
+
 /**
  * struct zynqmp_dma_desc_ll - Hw linked list descriptor

* @addr: Buffer address

drivers/dma/xilinx/zynqmp_dma.c +10 -0
@@ -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;
 };
 
 /**
@@ -253,6 +258,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)

{

drivers/dma/xilinx/zynqmp_dma.c +1 -0
@@ -892,6 +905,7 @@ static int zynqmp_dma_chan_probe(struct
 zynqmp_dma_device *zdev,
 {
 	struct zynqmp_dma_chan *chan;
 	struct device_node *node = pdev->dev.of_node;
+	const struct zynqmp_dma_config *match_data;
 	int err;
 
drivers/dma/xilinx/zynqmp_dma.c +4 -0
 	chan = devm_kzalloc(zdev->dev, sizeof(*chan), GFP_KERNEL);
@@ -919,6 +933,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");
drivers/dma/xilinx/zynqmp_dma.c +1 -0
 	zdev->chan = chan;
 	tasklet_setup(&chan->tasklet, zynqmp_dma_do_tasklet);
@@ -1161,6 +1179,7 @@ static void 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.34.1

maintainer Applied
#5 lore raw
In reply to Abin Joseph
Quoted 3 lines · Abin Joseph

Add support for Versal Gen 2 DMA IP by adding a compatible string and separate Versal Gen 2 DMA IP register offset.

Applied, thanks!

[1/2] dt-bindings: dmaengine: zynqmp_dma: Add a new compatible string

      commit: 36545c6a68b858671cfeb71df682e8cc58b082da
[2/2] dmaengine: zynqmp_dma: Add support for AMD Versal Gen 2 DMA IP
      commit: 13113f750a4ae0b1770fa25dc94852977ebfb942

Best regards,

Signature · 1 line
~Vinod