Commit 0e819e35 authored by Vinod Koul's avatar Vinod Koul
Browse files

dmaengine: fsl-edma: remove dma_slave_config direction usage 



dma_slave_config direction was marked as deprecated quite some
time back, remove the usage from this driver so that the field
can be removed

Tested-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Tested-by: default avatarAngelo Dureghello <angelo@sysam.it>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 5b7d0c94

drivers/dma/fsl-edma-common.c

+43 −31
Original line number Original line Diff line number Diff line
@@ -178,19 +178,7 @@ int fsl_edma_slave_config(struct dma_chan *chan, 
{

{

	struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);

	struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);





	fsl_chan->fsc.dir = cfg->direction;

	memcpy(&fsl_chan->cfg, cfg, sizeof(*cfg));

	if (cfg->direction == DMA_DEV_TO_MEM) {

		fsl_chan->fsc.dev_addr = cfg->src_addr;

		fsl_chan->fsc.addr_width = cfg->src_addr_width;

		fsl_chan->fsc.burst = cfg->src_maxburst;

		fsl_chan->fsc.attr = fsl_edma_get_tcd_attr(cfg->src_addr_width);

	} else if (cfg->direction == DMA_MEM_TO_DEV) {

		fsl_chan->fsc.dev_addr = cfg->dst_addr;

		fsl_chan->fsc.addr_width = cfg->dst_addr_width;

		fsl_chan->fsc.burst = cfg->dst_maxburst;

		fsl_chan->fsc.attr = fsl_edma_get_tcd_attr(cfg->dst_addr_width);

	} else

		return -EINVAL;





	return 0;

	return 0;

}

}
@@ -202,7 +190,7 @@ static size_t fsl_edma_desc_residue(struct fsl_edma_chan *fsl_chan, 
	struct fsl_edma_desc *edesc = fsl_chan->edesc;

	struct fsl_edma_desc *edesc = fsl_chan->edesc;

	struct edma_regs *regs = &fsl_chan->edma->regs;

	struct edma_regs *regs = &fsl_chan->edma->regs;

	u32 ch = fsl_chan->vchan.chan.chan_id;

	u32 ch = fsl_chan->vchan.chan.chan_id;

	enum dma_transfer_direction dir = fsl_chan->fsc.dir;

	enum dma_transfer_direction dir = edesc->dirn;

	dma_addr_t cur_addr, dma_addr;

	dma_addr_t cur_addr, dma_addr;

	size_t len, size;

	size_t len, size;

	int i;

	int i;
@@ -387,7 +375,7 @@ struct dma_async_tx_descriptor *fsl_edma_prep_dma_cyclic( 
	u32 src_addr, dst_addr, last_sg, nbytes;

	u32 src_addr, dst_addr, last_sg, nbytes;

	u16 soff, doff, iter;

	u16 soff, doff, iter;





	if (!is_slave_direction(fsl_chan->fsc.dir))

	if (!is_slave_direction(direction))

		return NULL;

		return NULL;





	sg_len = buf_len / period_len;

	sg_len = buf_len / period_len;
@@ -395,9 +383,21 @@ struct dma_async_tx_descriptor *fsl_edma_prep_dma_cyclic( 
	if (!fsl_desc)

	if (!fsl_desc)

		return NULL;

		return NULL;

	fsl_desc->iscyclic = true;

	fsl_desc->iscyclic = true;

	fsl_desc->dirn = direction;





	dma_buf_next = dma_addr;

	dma_buf_next = dma_addr;

	nbytes = fsl_chan->fsc.addr_width * fsl_chan->fsc.burst;

	if (direction == DMA_MEM_TO_DEV) {

		fsl_chan->attr =

			fsl_edma_get_tcd_attr(fsl_chan->cfg.dst_addr_width);

		nbytes = fsl_chan->cfg.dst_addr_width *

			fsl_chan->cfg.dst_maxburst;

	} else {

		fsl_chan->attr =

			fsl_edma_get_tcd_attr(fsl_chan->cfg.src_addr_width);

		nbytes = fsl_chan->cfg.src_addr_width *

			fsl_chan->cfg.src_maxburst;

	}



	iter = period_len / nbytes;

	iter = period_len / nbytes;





	for (i = 0; i < sg_len; i++) {

	for (i = 0; i < sg_len; i++) {
@@ -407,20 +407,20 @@ struct dma_async_tx_descriptor *fsl_edma_prep_dma_cyclic( 
		/* get next sg's physical address */

		/* get next sg's physical address */

		last_sg = fsl_desc->tcd[(i + 1) % sg_len].ptcd;

		last_sg = fsl_desc->tcd[(i + 1) % sg_len].ptcd;





		if (fsl_chan->fsc.dir == DMA_MEM_TO_DEV) {

		if (direction == DMA_MEM_TO_DEV) {

			src_addr = dma_buf_next;

			src_addr = dma_buf_next;

			dst_addr = fsl_chan->fsc.dev_addr;

			dst_addr = fsl_chan->cfg.dst_addr;

			soff = fsl_chan->fsc.addr_width;

			soff = fsl_chan->cfg.dst_addr_width;

			doff = 0;

			doff = 0;

		} else {

		} else {

			src_addr = fsl_chan->fsc.dev_addr;

			src_addr = fsl_chan->cfg.src_addr;

			dst_addr = dma_buf_next;

			dst_addr = dma_buf_next;

			soff = 0;

			soff = 0;

			doff = fsl_chan->fsc.addr_width;

			doff = fsl_chan->cfg.src_addr_width;

		}

		}





		fsl_edma_fill_tcd(fsl_desc->tcd[i].vtcd, src_addr, dst_addr,

		fsl_edma_fill_tcd(fsl_desc->tcd[i].vtcd, src_addr, dst_addr,

				  fsl_chan->fsc.attr, soff, nbytes, 0, iter,

				  fsl_chan->attr, soff, nbytes, 0, iter,

				  iter, doff, last_sg, true, false, true);

				  iter, doff, last_sg, true, false, true);

		dma_buf_next += period_len;

		dma_buf_next += period_len;

	}

	}
@@ -441,42 +441,54 @@ struct dma_async_tx_descriptor *fsl_edma_prep_slave_sg( 
	u16 soff, doff, iter;

	u16 soff, doff, iter;

	int i;

	int i;





	if (!is_slave_direction(fsl_chan->fsc.dir))

	if (!is_slave_direction(direction))

		return NULL;

		return NULL;





	fsl_desc = fsl_edma_alloc_desc(fsl_chan, sg_len);

	fsl_desc = fsl_edma_alloc_desc(fsl_chan, sg_len);

	if (!fsl_desc)

	if (!fsl_desc)

		return NULL;

		return NULL;

	fsl_desc->iscyclic = false;

	fsl_desc->iscyclic = false;

	fsl_desc->dirn = direction;



	if (direction == DMA_MEM_TO_DEV) {

		fsl_chan->attr =

			fsl_edma_get_tcd_attr(fsl_chan->cfg.dst_addr_width);

		nbytes = fsl_chan->cfg.dst_addr_width *

			fsl_chan->cfg.dst_maxburst;

	} else {

		fsl_chan->attr =

			fsl_edma_get_tcd_attr(fsl_chan->cfg.src_addr_width);

		nbytes = fsl_chan->cfg.src_addr_width *

			fsl_chan->cfg.src_maxburst;

	}





	nbytes = fsl_chan->fsc.addr_width * fsl_chan->fsc.burst;

	for_each_sg(sgl, sg, sg_len, i) {

	for_each_sg(sgl, sg, sg_len, i) {

		/* get next sg's physical address */

		/* get next sg's physical address */

		last_sg = fsl_desc->tcd[(i + 1) % sg_len].ptcd;

		last_sg = fsl_desc->tcd[(i + 1) % sg_len].ptcd;





		if (fsl_chan->fsc.dir == DMA_MEM_TO_DEV) {

		if (direction == DMA_MEM_TO_DEV) {

			src_addr = sg_dma_address(sg);

			src_addr = sg_dma_address(sg);

			dst_addr = fsl_chan->fsc.dev_addr;

			dst_addr = fsl_chan->cfg.dst_addr;

			soff = fsl_chan->fsc.addr_width;

			soff = fsl_chan->cfg.dst_addr_width;

			doff = 0;

			doff = 0;

		} else {

		} else {

			src_addr = fsl_chan->fsc.dev_addr;

			src_addr = fsl_chan->cfg.src_addr;

			dst_addr = sg_dma_address(sg);

			dst_addr = sg_dma_address(sg);

			soff = 0;

			soff = 0;

			doff = fsl_chan->fsc.addr_width;

			doff = fsl_chan->cfg.src_addr_width;

		}

		}





		iter = sg_dma_len(sg) / nbytes;

		iter = sg_dma_len(sg) / nbytes;

		if (i < sg_len - 1) {

		if (i < sg_len - 1) {

			last_sg = fsl_desc->tcd[(i + 1)].ptcd;

			last_sg = fsl_desc->tcd[(i + 1)].ptcd;

			fsl_edma_fill_tcd(fsl_desc->tcd[i].vtcd, src_addr,

			fsl_edma_fill_tcd(fsl_desc->tcd[i].vtcd, src_addr,

					  dst_addr, fsl_chan->fsc.attr, soff,

					  dst_addr, fsl_chan->attr, soff,

					  nbytes, 0, iter, iter, doff, last_sg,

					  nbytes, 0, iter, iter, doff, last_sg,

					  false, false, true);

					  false, false, true);

		} else {

		} else {

			last_sg = 0;

			last_sg = 0;

			fsl_edma_fill_tcd(fsl_desc->tcd[i].vtcd, src_addr,

			fsl_edma_fill_tcd(fsl_desc->tcd[i].vtcd, src_addr,

					  dst_addr, fsl_chan->fsc.attr, soff,

					  dst_addr, fsl_chan->attr, soff,

					  nbytes, 0, iter, iter, doff, last_sg,

					  nbytes, 0, iter, iter, doff, last_sg,

					  true, true, false);

					  true, true, false);

		}

		}

drivers/dma/fsl-edma-common.h

+3 −9
Original line number Original line Diff line number Diff line
@@ -109,14 +109,6 @@ struct fsl_edma_sw_tcd { 
	struct fsl_edma_hw_tcd		*vtcd;

	struct fsl_edma_hw_tcd		*vtcd;

};

};





struct fsl_edma_slave_config {

	enum dma_transfer_direction	dir;

	enum dma_slave_buswidth		addr_width;

	u32				dev_addr;

	u32				burst;

	u32				attr;

};



struct fsl_edma_chan {

struct fsl_edma_chan {

	struct virt_dma_chan		vchan;

	struct virt_dma_chan		vchan;

	enum dma_status			status;

	enum dma_status			status;
@@ -125,7 +117,8 @@ struct fsl_edma_chan { 
	u32				slave_id;

	u32				slave_id;

	struct fsl_edma_engine		*edma;

	struct fsl_edma_engine		*edma;

	struct fsl_edma_desc		*edesc;

	struct fsl_edma_desc		*edesc;

	struct fsl_edma_slave_config	fsc;

	struct dma_slave_config		cfg;

	u32				attr;

	struct dma_pool			*tcd_pool;

	struct dma_pool			*tcd_pool;

};

};
@@ -133,6 +126,7 @@ struct fsl_edma_desc { 
	struct virt_dma_desc		vdesc;

	struct virt_dma_desc		vdesc;

	struct fsl_edma_chan		*echan;

	struct fsl_edma_chan		*echan;

	bool				iscyclic;

	bool				iscyclic;

	enum dma_transfer_direction	dirn;

	unsigned int			n_tcds;

	unsigned int			n_tcds;

	struct fsl_edma_sw_tcd		tcd[];

	struct fsl_edma_sw_tcd		tcd[];

};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE