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

Commit 4facfe7f authored by Maxime Ripard's avatar Maxime Ripard Committed by Vinod Koul
Browse files

dmaengine: hdmac: Split device_control 



Split the device_control callback of the Atmel HDMAC 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>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent bcd1b0b9

drivers/dma/at_hdmac.c

+73 −48
Original line number Diff line number Diff line
@@ -972,11 +972,13 @@ atc_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len, 
	return NULL;

}



static int set_runtime_config(struct dma_chan *chan,

static int atc_config(struct dma_chan *chan,

		      struct dma_slave_config *sconfig)

{

	struct at_dma_chan	*atchan = to_at_dma_chan(chan);



	dev_vdbg(chan2dev(chan), "%s\n", __func__);



	/* Check if it is chan is configured for slave transfers */

	if (!chan->private)

		return -EINVAL;
@@ -989,9 +991,7 @@ static int set_runtime_config(struct dma_chan *chan, 
	return 0;

}





static int atc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,

		       unsigned long arg)

static int atc_pause(struct dma_chan *chan)

{

	struct at_dma_chan	*atchan = to_at_dma_chan(chan);

	struct at_dma		*atdma = to_at_dma(chan->device);
@@ -1000,16 +1000,29 @@ static int atc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, 


	LIST_HEAD(list);



	dev_vdbg(chan2dev(chan), "atc_control (%d)\n", cmd);

	dev_vdbg(chan2dev(chan), "%s\n", __func__);



	if (cmd == DMA_PAUSE) {

	spin_lock_irqsave(&atchan->lock, flags);



	dma_writel(atdma, CHER, AT_DMA_SUSP(chan_id));

	set_bit(ATC_IS_PAUSED, &atchan->status);



	spin_unlock_irqrestore(&atchan->lock, flags);

	} else if (cmd == DMA_RESUME) {



	return 0;

}



static int atc_resume(struct dma_chan *chan)

{

	struct at_dma_chan	*atchan = to_at_dma_chan(chan);

	struct at_dma		*atdma = to_at_dma(chan->device);

	int			chan_id = atchan->chan_common.chan_id;

	unsigned long		flags;



	LIST_HEAD(list);



	dev_vdbg(chan2dev(chan), "%s\n", __func__);



	if (!atc_chan_is_paused(atchan))

		return 0;
@@ -1019,8 +1032,22 @@ static int atc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, 
	clear_bit(ATC_IS_PAUSED, &atchan->status);



	spin_unlock_irqrestore(&atchan->lock, flags);

	} else if (cmd == DMA_TERMINATE_ALL) {



	return 0;

}



static int atc_terminate_all(struct dma_chan *chan)

{

	struct at_dma_chan	*atchan = to_at_dma_chan(chan);

	struct at_dma		*atdma = to_at_dma(chan->device);

	int			chan_id = atchan->chan_common.chan_id;

	struct at_desc		*desc, *_desc;

	unsigned long		flags;



	LIST_HEAD(list);



	dev_vdbg(chan2dev(chan), "%s\n", __func__);



	/*

	 * This is only called when something went wrong elsewhere, so

	 * we don't really care about the data. Just disable the
@@ -1049,11 +1076,6 @@ static int atc_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, 
	clear_bit(ATC_IS_CYCLIC, &atchan->status);



	spin_unlock_irqrestore(&atchan->lock, flags);

	} else if (cmd == DMA_SLAVE_CONFIG) {

		return set_runtime_config(chan, (struct dma_slave_config *)arg);

	} else {

		return -ENXIO;

	}



	return 0;

}
@@ -1505,7 +1527,10 @@ static int __init at_dma_probe(struct platform_device *pdev) 
		/* controller can do slave DMA: can trigger cyclic transfers */

		dma_cap_set(DMA_CYCLIC, atdma->dma_common.cap_mask);

		atdma->dma_common.device_prep_dma_cyclic = atc_prep_dma_cyclic;

		atdma->dma_common.device_control = atc_control;

		atdma->dma_common.device_config = atc_config;

		atdma->dma_common.device_pause = atc_pause;

		atdma->dma_common.device_resume = atc_resume;

		atdma->dma_common.device_terminate_all = atc_terminate_all;

	}



	dma_writel(atdma, EN, AT_DMA_ENABLE);
@@ -1622,7 +1647,7 @@ static void atc_suspend_cyclic(struct at_dma_chan *atchan) 
	if (!atc_chan_is_paused(atchan)) {

		dev_warn(chan2dev(chan),

		"cyclic channel not paused, should be done by channel user\n");

		atc_control(chan, DMA_PAUSE, 0);

		atc_pause(chan);

	}



	/* now preserve additional data for cyclic operations */