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

Commit 740aa957 authored by Maxime Ripard's avatar Maxime Ripard Committed by Vinod Koul
Browse files

dmaengine: pl330: Split device_control 



Split the device_control callback of the AMBA PL330 DMA driver to make use
of the newly introduced callbacks, that will eventually be used to retrieve
slave capabilities.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 78ea4fe7

drivers/dma/pl330.c

+51 −65
Original line number Original line Diff line number Diff line
@@ -2086,20 +2086,39 @@ static int pl330_alloc_chan_resources(struct dma_chan *chan) 
	return 1;

	return 1;

}

}





static int pl330_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, unsigned long arg)

static int pl330_config(struct dma_chan *chan,

			struct dma_slave_config *slave_config)

{

	struct dma_pl330_chan *pch = to_pchan(chan);



	if (slave_config->direction == DMA_MEM_TO_DEV) {

		if (slave_config->dst_addr)

			pch->fifo_addr = slave_config->dst_addr;

		if (slave_config->dst_addr_width)

			pch->burst_sz = __ffs(slave_config->dst_addr_width);

		if (slave_config->dst_maxburst)

			pch->burst_len = slave_config->dst_maxburst;

	} else if (slave_config->direction == DMA_DEV_TO_MEM) {

		if (slave_config->src_addr)

			pch->fifo_addr = slave_config->src_addr;

		if (slave_config->src_addr_width)

			pch->burst_sz = __ffs(slave_config->src_addr_width);

		if (slave_config->src_maxburst)

			pch->burst_len = slave_config->src_maxburst;

	}



	return 0;

}



static int pl330_terminate_all(struct dma_chan *chan)

{

{

	struct dma_pl330_chan *pch = to_pchan(chan);

	struct dma_pl330_chan *pch = to_pchan(chan);

	struct dma_pl330_desc *desc;

	struct dma_pl330_desc *desc;

	unsigned long flags;

	unsigned long flags;

	struct pl330_dmac *pl330 = pch->dmac;

	struct pl330_dmac *pl330 = pch->dmac;

	struct dma_slave_config *slave_config;

	LIST_HEAD(list);

	LIST_HEAD(list);





	switch (cmd) {

	case DMA_TERMINATE_ALL:

		pm_runtime_get_sync(pl330->ddma.dev);

	spin_lock_irqsave(&pch->lock, flags);

	spin_lock_irqsave(&pch->lock, flags);



	spin_lock(&pl330->lock);

	spin_lock(&pl330->lock);

	_stop(pch->thread);

	_stop(pch->thread);

	spin_unlock(&pl330->lock);

	spin_unlock(&pl330->lock);
@@ -2119,44 +2138,10 @@ static int pl330_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, unsigned 
		dma_cookie_complete(&desc->txd);

		dma_cookie_complete(&desc->txd);

	}

	}





		list_for_each_entry(desc, &pch->completed_list , node) {

			desc->status = FREE;

			dma_cookie_complete(&desc->txd);

		}



		if (!list_empty(&pch->work_list))

			pm_runtime_put(pl330->ddma.dev);



	list_splice_tail_init(&pch->submitted_list, &pl330->desc_pool);

	list_splice_tail_init(&pch->submitted_list, &pl330->desc_pool);

	list_splice_tail_init(&pch->work_list, &pl330->desc_pool);

	list_splice_tail_init(&pch->work_list, &pl330->desc_pool);

	list_splice_tail_init(&pch->completed_list, &pl330->desc_pool);

	list_splice_tail_init(&pch->completed_list, &pl330->desc_pool);

	spin_unlock_irqrestore(&pch->lock, flags);

	spin_unlock_irqrestore(&pch->lock, flags);

		pm_runtime_mark_last_busy(pl330->ddma.dev);

		pm_runtime_put_autosuspend(pl330->ddma.dev);

		break;

	case DMA_SLAVE_CONFIG:

		slave_config = (struct dma_slave_config *)arg;



		if (slave_config->direction == DMA_MEM_TO_DEV) {

			if (slave_config->dst_addr)

				pch->fifo_addr = slave_config->dst_addr;

			if (slave_config->dst_addr_width)

				pch->burst_sz = __ffs(slave_config->dst_addr_width);

			if (slave_config->dst_maxburst)

				pch->burst_len = slave_config->dst_maxburst;

		} else if (slave_config->direction == DMA_DEV_TO_MEM) {

			if (slave_config->src_addr)

				pch->fifo_addr = slave_config->src_addr;

			if (slave_config->src_addr_width)

				pch->burst_sz = __ffs(slave_config->src_addr_width);

			if (slave_config->src_maxburst)

				pch->burst_len = slave_config->src_maxburst;

		}

		break;

	default:

		dev_err(pch->dmac->ddma.dev, "Not supported command.\n");

		return -ENXIO;

	}





	return 0;

	return 0;

}

}
@@ -2793,7 +2778,8 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) 
	pd->device_prep_dma_cyclic = pl330_prep_dma_cyclic;

	pd->device_prep_dma_cyclic = pl330_prep_dma_cyclic;

	pd->device_tx_status = pl330_tx_status;

	pd->device_tx_status = pl330_tx_status;

	pd->device_prep_slave_sg = pl330_prep_slave_sg;

	pd->device_prep_slave_sg = pl330_prep_slave_sg;

	pd->device_control = pl330_control;

	pd->device_config = pl330_config;

	pd->device_terminate_all = pl330_terminate_all;

	pd->device_issue_pending = pl330_issue_pending;

	pd->device_issue_pending = pl330_issue_pending;

	pd->device_slave_caps = pl330_dma_device_slave_caps;

	pd->device_slave_caps = pl330_dma_device_slave_caps;
@@ -2847,7 +2833,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) 




		/* Flush the channel */

		/* Flush the channel */

		if (pch->thread) {

		if (pch->thread) {

			pl330_control(&pch->chan, DMA_TERMINATE_ALL, 0);

			pl330_terminate_all(&pch->chan);

			pl330_free_chan_resources(&pch->chan);

			pl330_free_chan_resources(&pch->chan);

		}

		}

	}

	}
@@ -2878,7 +2864,7 @@ static int pl330_remove(struct amba_device *adev) 




		/* Flush the channel */

		/* Flush the channel */

		if (pch->thread) {

		if (pch->thread) {

			pl330_control(&pch->chan, DMA_TERMINATE_ALL, 0);

			pl330_terminate_all(&pch->chan);

			pl330_free_chan_resources(&pch->chan);

			pl330_free_chan_resources(&pch->chan);

		}

		}

	}

	}