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

Commit 3d992e1a authored by Russell King - ARM Linux's avatar Russell King - ARM Linux Committed by Dan Williams
Browse files

ARM: PL08x: implement unmapping of memcpy buffers 



The DMA engine API requires DMA engine implementations to unmap buffers
passed into the non-slave DMA methods unless the relevant completion
flag is set.  We aren't doing this, so implement this facility.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent c0428794

drivers/dma/amba-pl08x.c

+39 −13
Original line number Original line Diff line number Diff line
@@ -1527,13 +1527,33 @@ static void pl08x_ensure_on(struct pl08x_driver_data *pl08x) 
	writel(val, pl08x->base + PL080_CONFIG);

	writel(val, pl08x->base + PL080_CONFIG);

}

}





static void pl08x_unmap_buffers(struct pl08x_txd *txd)

{

	struct device *dev = txd->tx.chan->device->dev;



	if (!(txd->tx.flags & DMA_COMPL_SKIP_SRC_UNMAP)) {

		if (txd->tx.flags & DMA_COMPL_SRC_UNMAP_SINGLE)

			dma_unmap_single(dev, txd->src_addr, txd->len,

				DMA_TO_DEVICE);

		else

			dma_unmap_page(dev, txd->src_addr, txd->len,

				DMA_TO_DEVICE);

	}

	if (!(txd->tx.flags & DMA_COMPL_SKIP_DEST_UNMAP)) {

		if (txd->tx.flags & DMA_COMPL_DEST_UNMAP_SINGLE)

			dma_unmap_single(dev, txd->dst_addr, txd->len,

				DMA_FROM_DEVICE);

		else

			dma_unmap_page(dev, txd->dst_addr, txd->len,

				DMA_FROM_DEVICE);

	}

}



static void pl08x_tasklet(unsigned long data)

static void pl08x_tasklet(unsigned long data)

{

{

	struct pl08x_dma_chan *plchan = (struct pl08x_dma_chan *) data;

	struct pl08x_dma_chan *plchan = (struct pl08x_dma_chan *) data;

	struct pl08x_driver_data *pl08x = plchan->host;

	struct pl08x_driver_data *pl08x = plchan->host;

	struct pl08x_txd *txd;

	struct pl08x_txd *txd;

	dma_async_tx_callback callback = NULL;

	void *callback_param = NULL;

	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&plchan->lock, flags);

	spin_lock_irqsave(&plchan->lock, flags);
@@ -1542,18 +1562,10 @@ static void pl08x_tasklet(unsigned long data) 
	plchan->at = NULL;

	plchan->at = NULL;





	if (txd) {

	if (txd) {

		callback = txd->tx.callback;

		callback_param = txd->tx.callback_param;



		/*

		/*

		 * Update last completed

		 * Update last completed

		 */

		 */

		plchan->lc = txd->tx.cookie;

		plchan->lc = txd->tx.cookie;



		/*

		 * Free the descriptor

		 */

		pl08x_free_txd(pl08x, txd);

	}

	}

	/*

	/*

	 * If a new descriptor is queued, set it up

	 * If a new descriptor is queued, set it up
@@ -1605,10 +1617,24 @@ static void pl08x_tasklet(unsigned long data) 




	spin_unlock_irqrestore(&plchan->lock, flags);

	spin_unlock_irqrestore(&plchan->lock, flags);





	if (txd) {

		dma_async_tx_callback callback = txd->tx.callback;

		void *callback_param = txd->tx.callback_param;



		/* Don't try to unmap buffers on slave channels */

		if (!plchan->slave)

			pl08x_unmap_buffers(txd);



		/* Free the descriptor */

		spin_lock_irqsave(&plchan->lock, flags);

		pl08x_free_txd(pl08x, txd);

		spin_unlock_irqrestore(&plchan->lock, flags);



		/* Callback to signal completion */

		/* Callback to signal completion */

		if (callback)

		if (callback)

			callback(callback_param);

			callback(callback_param);

	}

	}

}





static irqreturn_t pl08x_irq(int irq, void *dev)

static irqreturn_t pl08x_irq(int irq, void *dev)

{

{