Skip to content

Commit 13113f7

Browse files
abinJoseph25k07vinodkoul
authored andcommitted
dmaengine: zynqmp_dma: Add support for AMD Versal Gen 2 DMA IP
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 <[email protected]> Reviewed-by: Radhey Shyam Pandey <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent 36545c6 commit 13113f7

File tree

1 file changed

+23
-4
lines changed

1 file changed

+23
-4
lines changed

drivers/dma/xilinx/zynqmp_dma.c

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#include "../dmaengine.h"
2323

2424
/* Register Offsets */
25-
#define ZYNQMP_DMA_ISR 0x100
26-
#define ZYNQMP_DMA_IMR 0x104
27-
#define ZYNQMP_DMA_IER 0x108
28-
#define ZYNQMP_DMA_IDS 0x10C
25+
#define ZYNQMP_DMA_ISR (chan->irq_offset + 0x100)
26+
#define ZYNQMP_DMA_IMR (chan->irq_offset + 0x104)
27+
#define ZYNQMP_DMA_IER (chan->irq_offset + 0x108)
28+
#define ZYNQMP_DMA_IDS (chan->irq_offset + 0x10c)
2929
#define ZYNQMP_DMA_CTRL0 0x110
3030
#define ZYNQMP_DMA_CTRL1 0x114
3131
#define ZYNQMP_DMA_DATA_ATTR 0x120
@@ -145,6 +145,9 @@
145145
#define tx_to_desc(tx) container_of(tx, struct zynqmp_dma_desc_sw, \
146146
async_tx)
147147

148+
/* IRQ Register offset for Versal Gen 2 */
149+
#define IRQ_REG_OFFSET 0x308
150+
148151
/**
149152
* struct zynqmp_dma_desc_ll - Hw linked list descriptor
150153
* @addr: Buffer address
@@ -211,6 +214,7 @@ struct zynqmp_dma_desc_sw {
211214
* @bus_width: Bus width
212215
* @src_burst_len: Source burst length
213216
* @dst_burst_len: Dest burst length
217+
* @irq_offset: Irq register offset
214218
*/
215219
struct zynqmp_dma_chan {
216220
struct zynqmp_dma_device *zdev;
@@ -235,6 +239,7 @@ struct zynqmp_dma_chan {
235239
u32 bus_width;
236240
u32 src_burst_len;
237241
u32 dst_burst_len;
242+
u32 irq_offset;
238243
};
239244

240245
/**
@@ -253,6 +258,14 @@ struct zynqmp_dma_device {
253258
struct clk *clk_apb;
254259
};
255260

261+
struct zynqmp_dma_config {
262+
u32 offset;
263+
};
264+
265+
static const struct zynqmp_dma_config versal2_dma_config = {
266+
.offset = IRQ_REG_OFFSET,
267+
};
268+
256269
static inline void zynqmp_dma_writeq(struct zynqmp_dma_chan *chan, u32 reg,
257270
u64 value)
258271
{
@@ -892,6 +905,7 @@ static int zynqmp_dma_chan_probe(struct zynqmp_dma_device *zdev,
892905
{
893906
struct zynqmp_dma_chan *chan;
894907
struct device_node *node = pdev->dev.of_node;
908+
const struct zynqmp_dma_config *match_data;
895909
int err;
896910

897911
chan = devm_kzalloc(zdev->dev, sizeof(*chan), GFP_KERNEL);
@@ -919,6 +933,10 @@ static int zynqmp_dma_chan_probe(struct zynqmp_dma_device *zdev,
919933
return -EINVAL;
920934
}
921935

936+
match_data = of_device_get_match_data(&pdev->dev);
937+
if (match_data)
938+
chan->irq_offset = match_data->offset;
939+
922940
chan->is_dmacoherent = of_property_read_bool(node, "dma-coherent");
923941
zdev->chan = chan;
924942
tasklet_setup(&chan->tasklet, zynqmp_dma_do_tasklet);
@@ -1161,6 +1179,7 @@ static void zynqmp_dma_remove(struct platform_device *pdev)
11611179
}
11621180

11631181
static const struct of_device_id zynqmp_dma_of_match[] = {
1182+
{ .compatible = "amd,versal2-dma-1.0", .data = &versal2_dma_config },
11641183
{ .compatible = "xlnx,zynqmp-dma-1.0", },
11651184
{}
11661185
};

0 commit comments

Comments
 (0)