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

Commit 359291a1 authored by Javier Martin's avatar Javier Martin Committed by Vinod Koul
Browse files

dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function. 



Removing this function allows moving 'ccr_to_device' and
'ccr_from_device' from internal struct to channel struct.
This repesents a step forward towards removing auxiliary
'internal' structure.

Signed-off-by: default avatarJavier Martin <javier.martin@vista-silicon.com>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent bdc0c753

drivers/dma/imx-dma.c

+35 −63
Original line number Diff line number Diff line
@@ -134,9 +134,6 @@ struct imxdma_channel_internal { 


	int in_use;



	u32 ccr_from_device;

	u32 ccr_to_device;



	struct timer_list watchdog;



	int hw_chaining;
@@ -182,6 +179,8 @@ struct imxdma_channel { 
	enum dma_status			status;

	int				dma_request;

	struct scatterlist		*sg_list;

	u32				ccr_from_device;

	u32				ccr_to_device;

};



struct imxdma_engine {
@@ -313,58 +312,6 @@ static void imxdma_disable_hw(struct imxdma_channel *imxdmac) 
	local_irq_restore(flags);

}



static int

imxdma_setup_sg_hw(struct imxdma_desc *d,

		 struct scatterlist *sg, unsigned int sgcount,

		 unsigned int dma_length, unsigned int dev_addr,

		 enum dma_transfer_direction direction)

{

	struct imxdma_channel *imxdmac = to_imxdma_chan(d->desc.chan);

	int channel = imxdmac->channel;



	if (imxdmac->internal.in_use)

		return -EBUSY;



	imxdmac->internal.sg = sg;

	imxdmac->internal.resbytes = dma_length;



	if (!sg || !sgcount) {

		printk(KERN_ERR "imxdma%d: imx_dma_setup_sg empty sg list\n",

		       channel);

		return -EINVAL;

	}



	if (!sg->length) {

		printk(KERN_ERR "imxdma%d: imx_dma_setup_sg zero length\n",

		       channel);

		return -EINVAL;

	}



	if (direction == DMA_DEV_TO_MEM) {

		pr_debug("imxdma%d: %s sg=%p sgcount=%d total length=%d "

			"dev_addr=0x%08x for read\n",

			channel, __func__, sg, sgcount, dma_length, dev_addr);



		imx_dmav1_writel(dev_addr, DMA_SAR(channel));

		imx_dmav1_writel(imxdmac->internal.ccr_from_device, DMA_CCR(channel));

	} else if (direction == DMA_MEM_TO_DEV) {

		pr_debug("imxdma%d: %s sg=%p sgcount=%d total length=%d "

			"dev_addr=0x%08x for write\n",

			channel, __func__, sg, sgcount, dma_length, dev_addr);



		imx_dmav1_writel(dev_addr, DMA_DAR(channel));

		imx_dmav1_writel(imxdmac->internal.ccr_to_device, DMA_CCR(channel));

	} else {

		printk(KERN_ERR "imxdma%d: imx_dma_setup_sg bad dmamode\n",

		       channel);

		return -EINVAL;

	}



	imxdma_sg_next(d, sg);



	return 0;

}



static void imxdma_watchdog(unsigned long data)

{

	struct imxdma_channel *imxdmac = (struct imxdma_channel *)data;
@@ -526,7 +473,6 @@ static int imxdma_xfer_desc(struct imxdma_desc *d) 
{

	struct imxdma_channel *imxdmac = to_imxdma_chan(d->desc.chan);

	struct imxdma_engine *imxdma = imxdmac->imxdma;

	int ret;



	/* Configure and enable */

	switch (d->type) {
@@ -548,10 +494,37 @@ static int imxdma_xfer_desc(struct imxdma_desc *d) 
	/* Cyclic transfer is the same as slave_sg with special sg configuration. */

	case IMXDMA_DESC_CYCLIC:

	case IMXDMA_DESC_SLAVE_SG:

		ret = imxdma_setup_sg_hw(d, d->sg, d->sgcount, d->len,

					 imxdmac->per_address, d->direction);

		if (ret < 0)

			return ret;

		imxdmac->internal.sg = d->sg;

		imxdmac->internal.resbytes = d->len;



		if (d->direction == DMA_DEV_TO_MEM) {

			imx_dmav1_writel(imxdmac->per_address,

					 DMA_SAR(imxdmac->channel));

			imx_dmav1_writel(imxdmac->ccr_from_device,

					 DMA_CCR(imxdmac->channel));



			dev_dbg(imxdma->dev, "%s channel: %d sg=%p sgcount=%d "

				"total length=%d dev_addr=0x%08x (dev2mem)\n",

				__func__, imxdmac->channel, d->sg, d->sgcount,

				d->len, imxdmac->per_address);

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

			imx_dmav1_writel(imxdmac->per_address,

					 DMA_DAR(imxdmac->channel));

			imx_dmav1_writel(imxdmac->ccr_to_device,

					 DMA_CCR(imxdmac->channel));



			dev_dbg(imxdma->dev, "%s channel: %d sg=%p sgcount=%d "

				"total length=%d dev_addr=0x%08x (mem2dev)\n",

				__func__, imxdmac->channel, d->sg, d->sgcount,

				d->len, imxdmac->per_address);

		} else {

			dev_err(imxdma->dev, "%s channel: %d bad dma mode\n",

				__func__, imxdmac->channel);

			return -EINVAL;

		}



		imxdma_sg_next(d, d->sg);



		break;

	default:

		return -EINVAL;
@@ -641,11 +614,10 @@ static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, 
		imxdmac->internal.hw_chaining = 1;

		if (!imxdma_hw_chain(&imxdmac->internal))

			return -EINVAL;

		imxdmac->internal.ccr_from_device =

			(mode | IMX_DMA_TYPE_FIFO) |

		imxdmac->ccr_from_device = (mode | IMX_DMA_TYPE_FIFO) |

			((IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR) << 2) |

			CCR_REN;

		imxdmac->internal.ccr_to_device =

		imxdmac->ccr_to_device =

			(IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR) |

			((mode | IMX_DMA_TYPE_FIFO) << 2) | CCR_REN;

		imx_dmav1_writel(imxdmac->dma_request,