dma: pl330: Simplify platform data for pl330 driver

With the change in dma channels private data information, the pl330 channel filter function is modified to look for a simple u8 value instead of the now unused 'struct dma_pl330_peri' value.

Signed-off-by Thomas Abraham <[email protected]>

---
 arch/arm/plat-samsung/dma-ops.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

arch/arm/plat-samsung/dma-ops.c +0 -0

index 6e3d9ab..4f1430b 100644

Quoted 14 lines · Thomas Abraham

With the change in dma channels private data information, the pl330 channel filter function is modified to look for a simple u8 value instead of the now unused 'struct dma_pl330_peri' value.

Signed-off-by Thomas Abraham <[email protected]>

---
?arch/arm/plat-samsung/dma-ops.c | ? ?4 ++--
?1 files changed, 2 insertions(+), 2 deletions(-)

arch/arm/plat-samsung/dma-ops.c +0 -0

index 6e3d9ab..4f1430b 100644

arch/arm/plat-samsung/dma-ops.c line 24

Quoted 8 lines

arch/arm/plat-samsung/dma-ops.c +2 -2

@@ -19,8 +19,8 @@
 
 ?static inline bool pl330_filter(struct dma_chan *chan, void *param)
 ?{
- ? ? struct dma_pl330_peri *peri = chan->private;
- ? ? return peri->peri_id == (unsigned)param;
+ ? ? u8 *peri_id = chan->private;
+ ? ? return *peri_id == (unsigned)param;
 ?}

As a word of warning - this will fail horribly if you have mixed DMA engines in the system. ?While we wait for a better scheme, we really need to sort out these filter functions properly and stop poking about in data which may not be what we expect.

One solution to that is to move pl330_filter() into drivers/dma/pl330.c and have it check chan->device->dev->driver == &pl330_driver.driver _before_ we start accessing chan->private.

That's not a comment against your patch - you're not really changing the brokenness of this function. ?It would be good to see a follow up patch fixing it properly though.

Sent: Tuesday, August 23, 2011 7:00 AM
To: linux-arm-kernel at lists.infradead.org
Cc: linux-samsung-soc at vger.kernel.org; kgene.kim at samsung.com; vinod.koul at intel.com; Jassi Brar; Boojin Kim
Subject: [PATCH 1/3] DMA: PL330: Infer transfer direction from transfer request instead of platform data

The transfer direction for a channel can be inferred from the transfer request and the need for specifying transfer direction in platfrom data
can be eliminated. So the structure definition 'struct dma_pl330_peri' is no longer required.

With the 'struct dma_pl330_peri' removed, the dma controller transfer capabilities cannot be inferred any longer. Hence, the dma controller capabilities is specified using platforme data.

Cc Jassi Brar <[email protected]>

Cc Boojin Kim <[email protected]>

Signed-off-by Thomas Abraham <[email protected]>

---
 drivers/dma/pl330.c        |   56 ++++++++------------------------------
------
 include/linux/amba/pl330.h |   14 +++--------
 2 files changed, 14 insertions(+), 56 deletions(-)

drivers/dma/pl330.c +1 -1

index 3a0baac..6592b9a 100644
@@ -507,7 +507,7 @@ pluck_desc(struct dma_pl330_dmac *pdmac)
 static struct dma_pl330_desc *pl330_get_desc(struct dma_pl330_chan
 *pch)
 {
 	struct dma_pl330_dmac *pdmac = pch->dmac;
-	struct dma_pl330_peri *peri = pch->chan.private;
+	u8 *peri_id = pch->chan.private;
 	struct dma_pl330_desc *desc;
 

drivers/dma/pl330.c +3 -8

 	/* Pluck one desc from the pool of DMAC */

@@ -531,14 +531,7 @@ static struct dma_pl330_desc
 *pl330_get_desc(struct dma_pl330_chan *pch)
 	desc->pchan = pch;
 	desc->txd.cookie = 0;
 	async_tx_ack(&desc->txd);
-
-	if (peri) {
-		desc->req.rqtype = peri->rqtype;
-		desc->req.peri = pch->chan.chan_id;
-	} else {
-		desc->req.rqtype = MEMTOMEM;
-		desc->req.peri = 0;
-	}
+	desc->req.peri = (peri_id) ? pch->chan.chan_id : 0;
 
 	dma_async_tx_descriptor_init(&desc->txd, &pch->chan);

@@ -625,12 +618,14 @@ static struct dma_async_tx_descriptor
 *pl330_prep_dma_cyclic(
 	case DMA_TO_DEVICE:
 		desc->rqcfg.src_inc = 1;
 		desc->rqcfg.dst_inc = 0;
+		desc->req.rqtype = MEMTODEV;
 		src = dma_addr;
 		dst = pch->fifo_addr;
 		break;
 	case DMA_FROM_DEVICE:
 		desc->rqcfg.src_inc = 0;
 		desc->rqcfg.dst_inc = 1;
+		desc->req.rqtype = DEVTOMEM;
 		src = pch->fifo_addr;
 		dst = dma_addr;

drivers/dma/pl330.c +0 -4

 		break;

@@ -657,16 +652,12 @@ pl330_prep_dma_memcpy(struct dma_chan *chan,
 dma_addr_t dst,
 {
 	struct dma_pl330_desc *desc;
 	struct dma_pl330_chan *pch = to_pchan(chan);
-	struct dma_pl330_peri *peri = chan->private;
 	struct pl330_info *pi;
 	int burst;
 
 	if (unlikely(!pch || !len))
 		return NULL;
 
-	if (peri && peri->rqtype != MEMTOMEM)
-		return NULL;
-
 	pi = &pch->dmac->pif;
 

drivers/dma/pl330.c +1 -0

 	desc = __pl330_prep_dma_memcpy(pch, dst, src, len);

@@ -675,6 +666,7 @@ pl330_prep_dma_memcpy(struct dma_chan *chan,
 dma_addr_t dst,
 
 	desc->rqcfg.src_inc = 1;
 	desc->rqcfg.dst_inc = 1;
+	desc->req.rqtype = MEMTOMEM;
 
 	/* Select max possible burst size */

drivers/dma/pl330.c +1 -12

 	burst = pi->pcfg.data_bus_width / 8;

@@ -703,25 +695,14 @@ pl330_prep_slave_sg(struct dma_chan *chan,
 struct scatterlist *sgl,
 {
 	struct dma_pl330_desc *first, *desc = NULL;
 	struct dma_pl330_chan *pch = to_pchan(chan);
-	struct dma_pl330_peri *peri = chan->private;
 	struct scatterlist *sg;
 	unsigned long flags;
 	int i;
 	dma_addr_t addr;
 
-	if (unlikely(!pch || !sgl || !sg_len || !peri))
+	if (unlikely(!pch || !sgl || !sg_len))
 		return NULL;
 
-	/* Make sure the direction is consistent */
-	if ((direction == DMA_TO_DEVICE &&
-				peri->rqtype != MEMTODEV) ||
-			(direction == DMA_FROM_DEVICE &&
-				peri->rqtype != DEVTOMEM)) {
-		dev_err(pch->dmac->pif.dev, "%s:%d Invalid Direction\n",
-				__func__, __LINE__);
-		return NULL;
-	}
-
 	addr = pch->fifo_addr;
 

drivers/dma/pl330.c +2 -0

 	first = NULL;

@@ -761,11 +742,13 @@ pl330_prep_slave_sg(struct dma_chan *chan,
 struct scatterlist *sgl,
 		if (direction == DMA_TO_DEVICE) {
 			desc->rqcfg.src_inc = 1;
 			desc->rqcfg.dst_inc = 0;
+			desc->req.rqtype = MEMTODEV;
 			fill_px(&desc->px,
 				addr, sg_dma_address(sg), sg_dma_len(sg));
 		} else {
 			desc->rqcfg.src_inc = 0;
 			desc->rqcfg.dst_inc = 1;
+			desc->req.rqtype = DEVTOMEM;
 			fill_px(&desc->px,
 				sg_dma_address(sg), addr, sg_dma_len(sg));

drivers/dma/pl330.c +0 -2

 		}

@@ -872,27 +855,7 @@ pl330_probe(struct amba_device *adev, const
 struct amba_id *id)
 
 	for (i = 0; i < num_chan; i++) {
 		pch = &pdmac->peripherals[i];
-		if (pdat) {
-			struct dma_pl330_peri *peri = &pdat->peri[i];

drivers/dma/pl330.c +1 -9

-			default:
-				dev_err(&adev->dev, "DEVTODEV Not
 Supported\n");
-				continue;
-			}
-			pch->chan.private = peri;
-		} else {
-			dma_cap_set(DMA_MEMCPY, pd->cap_mask);
-			pch->chan.private = NULL;
-		}
+		pch->chan.private = (pdat) ? &pdat->peri_id[i] : NULL;
 

drivers/dma/pl330.c +1 -0

 		INIT_LIST_HEAD(&pch->work_list);
 		spin_lock_init(&pch->lock);

@@ -907,6 +870,7 @@ pl330_probe(struct amba_device *adev, const struct
 amba_id *id)
 	}
 
 	pd->dev = &adev->dev;
+	pd->cap_mask = pdat->cap_mask;
 
 	pd->device_alloc_chan_resources = pl330_alloc_chan_resources;

drivers/dma/pl330.c +0 -0

 	pd->device_free_chan_resources = pl330_free_chan_resources;

include/linux/amba/pl330.h +4 -11

index d12f077..0b87300 100644
@@ -13,15 +13,7 @@
 #define	__AMBA_PL330_H_
 
 #include <asm/hardware/pl330.h>
-
-struct dma_pl330_peri {
-	/*
-	 * Peri_Req i/f of the DMAC that is
-	 * peripheral could be reached from.
-	 */
-	u8 peri_id; /* specific dma id */
-	enum pl330_reqtype rqtype;
-};
+#include <linux/dmaengine.h>
 
 struct dma_pl330_platdata {
 	/*

@@ -33,7 +25,9 @@ struct dma_pl330_platdata {
 	 */
 	u8 nr_valid_peri;
 	/* Array of valid peripherals */
-	struct dma_pl330_peri *peri;
+	u8 *peri_id;
+	/* Operational capabilities */
+	dma_cap_mask_t cap_mask;
 	/* Bytes to allocate for MC buffer */
 	unsigned mcbuf_sz;
 };
--

1.6.6.rc2

--
To unsubscribe from this list: send the line "unsubscribe linux- samsung-soc" in
the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 26 lines · Thomas Abraham

Sent: Tuesday, August 23, 2011 7:00 AM
To: linux-arm-kernel at lists.infradead.org
Cc: linux-samsung-soc at vger.kernel.org; kgene.kim at samsung.com; vinod.koul at intel.com; Jassi Brar; Boojin Kim
Subject: [PATCH 1/3] DMA: PL330: Infer transfer direction from transfer request instead of platform data

The transfer direction for a channel can be inferred from the transfer request and the need for specifying transfer direction in platfrom data
can be eliminated. So the structure definition 'struct dma_pl330_peri' is no longer required.

With the 'struct dma_pl330_peri' removed, the dma controller transfer capabilities cannot be inferred any longer. Hence, the dma controller capabilities is specified using platforme data.

Cc Jassi Brar <[email protected]>

Cc Boojin Kim <[email protected]>

Signed-off-by Thomas Abraham <[email protected]>

---
?drivers/dma/pl330.c ? ? ? ?| ? 56 ++++++++------------------------------
------
?include/linux/amba/pl330.h | ? 14 +++--------
?2 files changed, 14 insertions(+), 56 deletions(-)

Quoted 6 lines

? ? ? for (i = 0; i < num_chan; i++) {
? ? ? ? ? ? ? pch = &pdmac->peripherals[i];
- ? ? ? ? ? ? if (pdat) {
- ? ? ? ? ? ? ? ? ? ? struct dma_pl330_peri *peri = &pdat->peri[i]; -
- ? ? ? ? ? ? ? ? ? ? switch (peri->rqtype) {

Quoted 8 lines

- ? ? ? ? ? ? ? ? ? ? case MEMTOMEM:
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? dma_cap_set(DMA_MEMCPY, pd->cap_mask);
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? break;
- ? ? ? ? ? ? ? ? ? ? case MEMTODEV:
- ? ? ? ? ? ? ? ? ? ? case DEVTOMEM:
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? dma_cap_set(DMA_SLAVE, pd->cap_mask);
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? dma_cap_set(DMA_CYCLIC, pd->cap_mask);
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? break;

If remove capabilities setting, dmaengine() doesn't search the channel that client requests with specific capability.
So, I think dma_request_channel() would fail.

Sent: Wednesday, August 24, 2011 12:23 PM
To: Boojin Kim
Cc: linux-arm-kernel at lists.infradead.org; linux-samsung- soc at vger.kernel.org; kgene.kim at samsung.com; vinod.koul at intel.com; Jassi Brar
Subject: Re: [PATCH 1/3] DMA: PL330: Infer transfer direction from transfer request instead of platform data

Hi Boojin,

Quoted 9 lines · Boojin Kim

Quoted 8 lines · Thomas Abraham

Sent: Tuesday, August 23, 2011 7:00 AM
To: linux-arm-kernel at lists.infradead.org
Cc: linux-samsung-soc at vger.kernel.org; kgene.kim at samsung.com; vinod.koul at intel.com; Jassi Brar; Boojin Kim
Subject: [PATCH 1/3] DMA: PL330: Infer transfer direction from transfer request instead of platform data

The transfer direction for a channel can be inferred from the

transfer

Quoted 3 lines

Quoted 3 lines

request and the need for specifying transfer direction in platfrom data
can be eliminated. So the structure definition 'struct

dma_pl330_peri'

Quoted 3 lines

Quoted 3 lines

is no longer required.

With the 'struct dma_pl330_peri' removed, the dma controller

transfer

Quoted 1 line

Quoted 1 line

capabilities cannot be inferred any longer. Hence, the dma

controller

Quoted 7 lines

Quoted 7 lines

capabilities is specified using platforme data.

Cc Jassi Brar <[email protected]>

Cc Boojin Kim <[email protected]>

Signed-off-by Thomas Abraham <[email protected]>

---
?drivers/dma/pl330.c ? ? ? ?| ? 56 ++++++++--------------------------

----

Quoted 4 lines

Quoted 4 lines

------
?include/linux/amba/pl330.h | ? 14 +++-------- ?2 files changed, 14 insertions(+), 56 deletions(-)

[...]

Quoted 14 lines

Quoted 6 lines

? ? ? for (i = 0; i < num_chan; i++) {
? ? ? ? ? ? ? pch = &pdmac->peripherals[i];
- ? ? ? ? ? ? if (pdat) {
- ? ? ? ? ? ? ? ? ? ? struct dma_pl330_peri *peri = &pdat->peri[i]; -
- ? ? ? ? ? ? ? ? ? ? switch (peri->rqtype) {

Quoted 8 lines

- ? ? ? ? ? ? ? ? ? ? case MEMTOMEM:
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? dma_cap_set(DMA_MEMCPY, pd->cap_mask);
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? break;
- ? ? ? ? ? ? ? ? ? ? case MEMTODEV:
- ? ? ? ? ? ? ? ? ? ? case DEVTOMEM:
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? dma_cap_set(DMA_SLAVE, pd->cap_mask);
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? dma_cap_set(DMA_CYCLIC, pd->cap_mask);
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? break;

Quoted 1 line

If remove capabilities setting, dmaengine() doesn't search the

channel that

Quoted 2 lines

client requests with specific capability.
So, I think dma_request_channel() would fail.

The capabilities is now supplied using platform data. There is a new member 'cap_mask' added to the pl330 driver platform data structure. The capabilities for a pl330 controller can be specified using cap_mask. For exynos4, the capabilities is set up in the exynos4_dma_init function. These changes are part of the third patch in this patchset.

Thanks for your review.

Regards,
Thomas.

[...]
--
To unsubscribe from this list: send the line "unsubscribe linux- samsung-soc" in
the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

The transfer direction for a channel can be inferred from the transfer request and the need for specifying transfer direction in platfrom data can be eliminated. So the structure definition 'struct dma_pl330_peri' is no longer required.

With the 'struct dma_pl330_peri' removed, the dma controller transfer capabilities cannot be inferred any longer. Hence, the dma controller capabilities is specified using platforme data.

Cc Jassi Brar <[email protected]>

Cc Boojin Kim <[email protected]>

Signed-off-by Thomas Abraham <[email protected]>

---
 drivers/dma/pl330.c        |   56 ++++++++------------------------------------
 include/linux/amba/pl330.h |   14 +++--------
 2 files changed, 14 insertions(+), 56 deletions(-)

drivers/dma/pl330.c +8 -37

index 3a0baac..6592b9a 100644
@@ -507,7 +507,7 @@ pluck_desc(struct dma_pl330_dmac *pdmac)
 static struct dma_pl330_desc *pl330_get_desc(struct dma_pl330_chan *pch)
 {
 	struct dma_pl330_dmac *pdmac = pch->dmac;
-	struct dma_pl330_peri *peri = pch->chan.private;
+	u8 *peri_id = pch->chan.private;
 	struct dma_pl330_desc *desc;
 
 	/* Pluck one desc from the pool of DMAC */

@@ -531,14 +531,7 @@ static struct dma_pl330_desc *pl330_get_desc(struct dma_pl330_chan *pch)
 	desc->pchan = pch;
 	desc->txd.cookie = 0;
 	async_tx_ack(&desc->txd);
-
-	if (peri) {
-		desc->req.rqtype = peri->rqtype;
-		desc->req.peri = pch->chan.chan_id;
-	} else {
-		desc->req.rqtype = MEMTOMEM;
-		desc->req.peri = 0;
-	}
+	desc->req.peri = (peri_id) ? pch->chan.chan_id : 0;
 
 	dma_async_tx_descriptor_init(&desc->txd, &pch->chan);
 

@@ -625,12 +618,14 @@ static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic(
 	case DMA_TO_DEVICE:
 		desc->rqcfg.src_inc = 1;
 		desc->rqcfg.dst_inc = 0;
+		desc->req.rqtype = MEMTODEV;
 		src = dma_addr;
 		dst = pch->fifo_addr;
 		break;
 	case DMA_FROM_DEVICE:
 		desc->rqcfg.src_inc = 0;
 		desc->rqcfg.dst_inc = 1;
+		desc->req.rqtype = DEVTOMEM;
 		src = pch->fifo_addr;
 		dst = dma_addr;
 		break;

@@ -657,16 +652,12 @@ pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst,
 {
 	struct dma_pl330_desc *desc;
 	struct dma_pl330_chan *pch = to_pchan(chan);
-	struct dma_pl330_peri *peri = chan->private;
 	struct pl330_info *pi;
 	int burst;
 
 	if (unlikely(!pch || !len))
 		return NULL;
 
-	if (peri && peri->rqtype != MEMTOMEM)
-		return NULL;
-
 	pi = &pch->dmac->pif;
 
 	desc = __pl330_prep_dma_memcpy(pch, dst, src, len);

@@ -675,6 +666,7 @@ pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst,
 
 	desc->rqcfg.src_inc = 1;
 	desc->rqcfg.dst_inc = 1;
+	desc->req.rqtype = MEMTOMEM;
 
 	/* Select max possible burst size */
 	burst = pi->pcfg.data_bus_width / 8;

@@ -703,25 +695,14 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
 {
 	struct dma_pl330_desc *first, *desc = NULL;
 	struct dma_pl330_chan *pch = to_pchan(chan);
-	struct dma_pl330_peri *peri = chan->private;
 	struct scatterlist *sg;
 	unsigned long flags;
 	int i;
 	dma_addr_t addr;
 
-	if (unlikely(!pch || !sgl || !sg_len || !peri))
+	if (unlikely(!pch || !sgl || !sg_len))
 		return NULL;
 
-	/* Make sure the direction is consistent */
-	if ((direction == DMA_TO_DEVICE &&
-				peri->rqtype != MEMTODEV) ||
-			(direction == DMA_FROM_DEVICE &&
-				peri->rqtype != DEVTOMEM)) {
-		dev_err(pch->dmac->pif.dev, "%s:%d Invalid Direction\n",
-				__func__, __LINE__);
-		return NULL;
-	}
-
 	addr = pch->fifo_addr;
 
 	first = NULL;

@@ -761,11 +742,13 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
 		if (direction == DMA_TO_DEVICE) {
 			desc->rqcfg.src_inc = 1;
 			desc->rqcfg.dst_inc = 0;
+			desc->req.rqtype = MEMTODEV;
 			fill_px(&desc->px,
 				addr, sg_dma_address(sg), sg_dma_len(sg));
 		} else {
 			desc->rqcfg.src_inc = 0;
 			desc->rqcfg.dst_inc = 1;
+			desc->req.rqtype = DEVTOMEM;
 			fill_px(&desc->px,
 				sg_dma_address(sg), addr, sg_dma_len(sg));
 		}

@@ -872,27 +855,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
 
 	for (i = 0; i < num_chan; i++) {
 		pch = &pdmac->peripherals[i];
-		if (pdat) {
-			struct dma_pl330_peri *peri = &pdat->peri[i];
-
-			switch (peri->rqtype) {
-			case MEMTOMEM:
-				dma_cap_set(DMA_MEMCPY, pd->cap_mask);
-				break;
-			case MEMTODEV:
-			case DEVTOMEM:
-				dma_cap_set(DMA_SLAVE, pd->cap_mask);
-				dma_cap_set(DMA_CYCLIC, pd->cap_mask);
-				break;

drivers/dma/pl330.c +0 -0

 	pd->device_alloc_chan_resources = pl330_alloc_chan_resources;
 	pd->device_free_chan_resources = pl330_free_chan_resources;

include/linux/amba/pl330.h +4 -10

index d12f077..0b87300 100644
@@ -13,15 +13,7 @@
 #define	__AMBA_PL330_H_
 
 #include <asm/hardware/pl330.h>
-
-struct dma_pl330_peri {
-	/*
-	 * Peri_Req i/f of the DMAC that is
-	 * peripheral could be reached from.
-	 */
-	u8 peri_id; /* specific dma id */
-	enum pl330_reqtype rqtype;
-};
+#include <linux/dmaengine.h>
 
 struct dma_pl330_platdata {
 	/*

@@ -33,7 +25,9 @@ struct dma_pl330_platdata {
 	 */
 	u8 nr_valid_peri;
 	/* Array of valid peripherals */
-	struct dma_pl330_peri *peri;
+	u8 *peri_id;
+	/* Operational capabilities */
+	dma_cap_mask_t cap_mask;
 	/* Bytes to allocate for MC buffer */
 	unsigned mcbuf_sz;
 };

Thomas,

Quoted 21 lines · Thomas Abraham

The transfer direction for a channel can be inferred from the transfer request and the need for specifying transfer direction in platfrom data can be eliminated. So the structure definition 'struct dma_pl330_peri' is no longer required.

With the 'struct dma_pl330_peri' removed, the dma controller transfer capabilities cannot be inferred any longer. Hence, the dma controller capabilities is specified using platforme data.

Cc Jassi Brar <[email protected]>

Cc Boojin Kim <[email protected]>

Signed-off-by Thomas Abraham <[email protected]>

---
?drivers/dma/pl330.c ? ? ? ?| ? 56 ++++++++------------------------------------ ?include/linux/amba/pl330.h | ? 14 +++--------
?2 files changed, 14 insertions(+), 56 deletions(-)

drivers/dma/pl330.c +0 -0

index 3a0baac..6592b9a 100644

Quoted 20 lines

drivers/dma/pl330.c +0 -16

@@ -872,27 +855,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
 
 ? ? ? for (i = 0; i < num_chan; i++) {
 ? ? ? ? ? ? ? pch = &pdmac->peripherals[i];
- ? ? ? ? ? ? if (pdat) {
- ? ? ? ? ? ? ? ? ? ? struct dma_pl330_peri *peri = &pdat->peri[i];
-
- ? ? ? ? ? ? ? ? ? ? switch (peri->rqtype) {
- ? ? ? ? ? ? ? ? ? ? case MEMTOMEM:
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? dma_cap_set(DMA_MEMCPY, pd->cap_mask);
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? break;
- ? ? ? ? ? ? ? ? ? ? case MEMTODEV:
- ? ? ? ? ? ? ? ? ? ? case DEVTOMEM:
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? dma_cap_set(DMA_SLAVE, pd->cap_mask);
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? dma_cap_set(DMA_CYCLIC, pd->cap_mask);
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? break;
- ? ? ? ? ? ? ? ? ? ? default:
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? dev_err(&adev->dev, "DEVTODEV Not Supported\n");
- ? ? ? ? ? ? ? ? ? ? ? ? ? ? continue;
- ? ? ? ? ? ? ? ? ? ? }

drivers/dma/pl330.c pl330_probe(struct amba_device *adev, const struct amba_id *id) · line 858

Quoted 6 lines

drivers/dma/pl330.c +1 -5

- ? ? ? ? ? ? ? ? ? ? pch->chan.private = peri;
- ? ? ? ? ? ? } else {
- ? ? ? ? ? ? ? ? ? ? dma_cap_set(DMA_MEMCPY, pd->cap_mask);
- ? ? ? ? ? ? ? ? ? ? pch->chan.private = NULL;
- ? ? ? ? ? ? }
+ ? ? ? ? ? ? pch->chan.private = (pdat) ? &pdat->peri_id[i] : NULL;

Don't need parentheses here.

drivers/dma/pl330.c pl330_probe(struct amba_device *adev, const struct amba_id *id) · line 873

Quoted 9 lines

drivers/dma/pl330.c +1 -0

 ? ? ? ? ? ? ? INIT_LIST_HEAD(&pch->work_list);
 ? ? ? ? ? ? ? spin_lock_init(&pch->lock);

@@ -907,6 +870,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
 ? ? ? }
 
 ? ? ? pd->dev = &adev->dev;
+ ? ? pd->cap_mask = pdat->cap_mask;

You are re-introducing the requirement to have platform data which I just made optional. For mem to mem transfers, there is no reason to have platform data. In my case, we only support mem to mem transfers.

How about:
pd->cap_mask = pdat ? pdat->cap_mask : DMA_MEMCPY;

Also, should you be using dma_cap_set here?

Rob