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

Commit 4ce98c0a authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul
Browse files

dmaengine: omap-dma: Add support for memcpy 



The sDMA controller is capable of performing memory copy operation. It need
to be configured to software triggered mode and without HW synchronization.
The sDMA can copy data which is aligned to 8, 16 or 32 bits.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 5ebe6afa

drivers/dma/omap-dma.c

+49 −2
Original line number Original line Diff line number Diff line
@@ -362,7 +362,7 @@ static void omap_dma_start_sg(struct omap_chan *c, struct omap_desc *d, 
	struct omap_sg *sg = d->sg + idx;

	struct omap_sg *sg = d->sg + idx;

	unsigned cxsa, cxei, cxfi;

	unsigned cxsa, cxei, cxfi;





	if (d->dir == DMA_DEV_TO_MEM) {

	if (d->dir == DMA_DEV_TO_MEM || d->dir == DMA_MEM_TO_MEM) {

		cxsa = CDSA;

		cxsa = CDSA;

		cxei = CDEI;

		cxei = CDEI;

		cxfi = CDFI;

		cxfi = CDFI;
@@ -408,7 +408,7 @@ static void omap_dma_start_desc(struct omap_chan *c) 
	if (dma_omap1())

	if (dma_omap1())

		omap_dma_chan_write(c, CCR2, d->ccr >> 16);

		omap_dma_chan_write(c, CCR2, d->ccr >> 16);





	if (d->dir == DMA_DEV_TO_MEM) {

	if (d->dir == DMA_DEV_TO_MEM || d->dir == DMA_MEM_TO_MEM) {

		cxsa = CSSA;

		cxsa = CSSA;

		cxei = CSEI;

		cxei = CSEI;

		cxfi = CSFI;

		cxfi = CSFI;
@@ -948,6 +948,51 @@ static struct dma_async_tx_descriptor *omap_dma_prep_dma_cyclic( 
	return vchan_tx_prep(&c->vc, &d->vd, flags);

	return vchan_tx_prep(&c->vc, &d->vd, flags);

}

}





static struct dma_async_tx_descriptor *omap_dma_prep_dma_memcpy(

	struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,

	size_t len, unsigned long tx_flags)

{

	struct omap_chan *c = to_omap_dma_chan(chan);

	struct omap_desc *d;

	uint8_t data_type;



	d = kzalloc(sizeof(*d) + sizeof(d->sg[0]), GFP_ATOMIC);

	if (!d)

		return NULL;



	data_type = __ffs((src | dest | len));

	if (data_type > CSDP_DATA_TYPE_32)

		data_type = CSDP_DATA_TYPE_32;



	d->dir = DMA_MEM_TO_MEM;

	d->dev_addr = src;

	d->fi = 0;

	d->es = data_type;

	d->sg[0].en = len / BIT(data_type);

	d->sg[0].fn = 1;

	d->sg[0].addr = dest;

	d->sglen = 1;

	d->ccr = c->ccr;

	d->ccr |= CCR_DST_AMODE_POSTINC | CCR_SRC_AMODE_POSTINC;



	d->cicr = CICR_DROP_IE;

	if (tx_flags & DMA_PREP_INTERRUPT)

		d->cicr |= CICR_FRAME_IE;



	d->csdp = data_type;



	if (dma_omap1()) {

		d->cicr |= CICR_TOUT_IE;

		d->csdp |= CSDP_DST_PORT_EMIFF | CSDP_SRC_PORT_EMIFF;

	} else {

		d->csdp |= CSDP_DST_PACKED | CSDP_SRC_PACKED;

		d->cicr |= CICR_MISALIGNED_ERR_IE | CICR_TRANS_ERR_IE;

		d->csdp |= CSDP_DST_BURST_64 | CSDP_SRC_BURST_64;

	}



	return vchan_tx_prep(&c->vc, &d->vd, tx_flags);

}



static int omap_dma_slave_config(struct dma_chan *chan, struct dma_slave_config *cfg)

static int omap_dma_slave_config(struct dma_chan *chan, struct dma_slave_config *cfg)

{

{

	struct omap_chan *c = to_omap_dma_chan(chan);

	struct omap_chan *c = to_omap_dma_chan(chan);
@@ -1094,12 +1139,14 @@ static int omap_dma_probe(struct platform_device *pdev) 




	dma_cap_set(DMA_SLAVE, od->ddev.cap_mask);

	dma_cap_set(DMA_SLAVE, od->ddev.cap_mask);

	dma_cap_set(DMA_CYCLIC, od->ddev.cap_mask);

	dma_cap_set(DMA_CYCLIC, od->ddev.cap_mask);

	dma_cap_set(DMA_MEMCPY, od->ddev.cap_mask);

	od->ddev.device_alloc_chan_resources = omap_dma_alloc_chan_resources;

	od->ddev.device_alloc_chan_resources = omap_dma_alloc_chan_resources;

	od->ddev.device_free_chan_resources = omap_dma_free_chan_resources;

	od->ddev.device_free_chan_resources = omap_dma_free_chan_resources;

	od->ddev.device_tx_status = omap_dma_tx_status;

	od->ddev.device_tx_status = omap_dma_tx_status;

	od->ddev.device_issue_pending = omap_dma_issue_pending;

	od->ddev.device_issue_pending = omap_dma_issue_pending;

	od->ddev.device_prep_slave_sg = omap_dma_prep_slave_sg;

	od->ddev.device_prep_slave_sg = omap_dma_prep_slave_sg;

	od->ddev.device_prep_dma_cyclic = omap_dma_prep_dma_cyclic;

	od->ddev.device_prep_dma_cyclic = omap_dma_prep_dma_cyclic;

	od->ddev.device_prep_dma_memcpy = omap_dma_prep_dma_memcpy;

	od->ddev.device_config = omap_dma_slave_config;

	od->ddev.device_config = omap_dma_slave_config;

	od->ddev.device_pause = omap_dma_pause;

	od->ddev.device_pause = omap_dma_pause;

	od->ddev.device_resume = omap_dma_resume;

	od->ddev.device_resume = omap_dma_resume;