Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 527a2759 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul
Browse files

dmaengine: omap-dma: Fix the port_window support 



We do not yet have users of port_window. The following errors were found
when converting the tusb6010_omap.c musb driver:

- The peripheral side must have SRC_/DST_PACKED disabled
- when configuring the burst for the peripheral side the memory side
  configuration were overwritten: d->csdp = ... -> d->csdp |= ...
- The EI and FI were configured for the wrong sides of the transfers.

With these changes and the converted tus6010_omap.c I was able to verify
that things are working as they expected to work.

Fixes: 201ac486 ("dmaengine: omap-dma: Support for slave devices with data port window")
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 21d25f6a

drivers/dma/omap-dma.c

+16 −15
Original line number Diff line number Diff line
@@ -938,21 +938,14 @@ static struct dma_async_tx_descriptor *omap_dma_prep_slave_sg( 
		d->ccr |= CCR_DST_AMODE_POSTINC;

		if (port_window) {

			d->ccr |= CCR_SRC_AMODE_DBLIDX;

			d->ei = 1;

			/*

			 * One frame covers the port_window and by  configure

			 * the source frame index to be -1 * (port_window - 1)

			 * we instruct the sDMA that after a frame is processed

			 * it should move back to the start of the window.

			 */

			d->fi = -(port_window_bytes - 1);



			if (port_window_bytes >= 64)

				d->csdp = CSDP_SRC_BURST_64 | CSDP_SRC_PACKED;

				d->csdp |= CSDP_SRC_BURST_64;

			else if (port_window_bytes >= 32)

				d->csdp = CSDP_SRC_BURST_32 | CSDP_SRC_PACKED;

				d->csdp |= CSDP_SRC_BURST_32;

			else if (port_window_bytes >= 16)

				d->csdp = CSDP_SRC_BURST_16 | CSDP_SRC_PACKED;

				d->csdp |= CSDP_SRC_BURST_16;



		} else {

			d->ccr |= CCR_SRC_AMODE_CONSTANT;

		}
@@ -962,13 +955,21 @@ static struct dma_async_tx_descriptor *omap_dma_prep_slave_sg( 
		d->ccr |= CCR_SRC_AMODE_POSTINC;

		if (port_window) {

			d->ccr |= CCR_DST_AMODE_DBLIDX;

			d->ei = 1;

			/*

			 * One frame covers the port_window and by  configure

			 * the source frame index to be -1 * (port_window - 1)

			 * we instruct the sDMA that after a frame is processed

			 * it should move back to the start of the window.

			 */

			d->fi = -(port_window_bytes - 1);



			if (port_window_bytes >= 64)

				d->csdp = CSDP_DST_BURST_64 | CSDP_DST_PACKED;

				d->csdp |= CSDP_DST_BURST_64;

			else if (port_window_bytes >= 32)

				d->csdp = CSDP_DST_BURST_32 | CSDP_DST_PACKED;

				d->csdp |= CSDP_DST_BURST_32;

			else if (port_window_bytes >= 16)

				d->csdp = CSDP_DST_BURST_16 | CSDP_DST_PACKED;

				d->csdp |= CSDP_DST_BURST_16;

		} else {

			d->ccr |= CCR_DST_AMODE_CONSTANT;

		}
@@ -1017,7 +1018,7 @@ static struct dma_async_tx_descriptor *omap_dma_prep_slave_sg( 
		osg->addr = sg_dma_address(sgent);

		osg->en = en;

		osg->fn = sg_dma_len(sgent) / frame_bytes;

		if (port_window && dir == DMA_MEM_TO_DEV) {

		if (port_window && dir == DMA_DEV_TO_MEM) {

			osg->ei = 1;

			/*

			 * One frame covers the port_window and by  configure