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

Commit 89716462 authored by Dan Williams's avatar Dan Williams
Browse files

async_memcpy: convert to dmaengine_unmap_data 



Use the generic unmap object to unmap dma buffers.

Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Reported-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
[bzolnier: add missing unmap->len initialization]
[bzolnier: fix whitespace damage]
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
[djbw: add DMA_ENGINE=n support]
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 45c463ae

crypto/async_tx/async_memcpy.c

+23 −17
Original line number Diff line number Diff line
@@ -50,33 +50,37 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset, 
						      &dest, 1, &src, 1, len);

	struct dma_device *device = chan ? chan->device : NULL;

	struct dma_async_tx_descriptor *tx = NULL;

	struct dmaengine_unmap_data *unmap = NULL;



	if (device && is_dma_copy_aligned(device, src_offset, dest_offset, len)) {

		dma_addr_t dma_dest, dma_src;

		unsigned long dma_prep_flags = 0;

	if (device)

		unmap = dmaengine_get_unmap_data(device->dev, 2, GFP_NOIO);



	if (unmap && is_dma_copy_aligned(device, src_offset, dest_offset, len)) {

		unsigned long dma_prep_flags = DMA_COMPL_SKIP_SRC_UNMAP |

					       DMA_COMPL_SKIP_DEST_UNMAP;



		if (submit->cb_fn)

			dma_prep_flags |= DMA_PREP_INTERRUPT;

		if (submit->flags & ASYNC_TX_FENCE)

			dma_prep_flags |= DMA_PREP_FENCE;

		dma_dest = dma_map_page(device->dev, dest, dest_offset, len,

					DMA_FROM_DEVICE);



		dma_src = dma_map_page(device->dev, src, src_offset, len,

		unmap->to_cnt = 1;

		unmap->addr[0] = dma_map_page(device->dev, src, src_offset, len,

					      DMA_TO_DEVICE);



		tx = device->device_prep_dma_memcpy(chan, dma_dest, dma_src,

						    len, dma_prep_flags);

		if (!tx) {

			dma_unmap_page(device->dev, dma_dest, len,

		unmap->from_cnt = 1;

		unmap->addr[1] = dma_map_page(device->dev, dest, dest_offset, len,

					      DMA_FROM_DEVICE);

			dma_unmap_page(device->dev, dma_src, len,

				       DMA_TO_DEVICE);

		}

		unmap->len = len;



		tx = device->device_prep_dma_memcpy(chan, unmap->addr[1],

						    unmap->addr[0], len,

						    dma_prep_flags);

	}



	if (tx) {

		pr_debug("%s: (async) len: %zu\n", __func__, len);



		dma_set_unmap(tx, unmap);

		async_tx_submit(chan, tx, submit);

	} else {

		void *dest_buf, *src_buf;
@@ -96,6 +100,8 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset, 
		async_tx_sync_epilog(submit);

	}



	dmaengine_unmap_put(unmap);



	return tx;

}

EXPORT_SYMBOL_GPL(async_memcpy);

drivers/dma/dmaengine.c

+2 −1
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ static int __init dmaengine_init_unmap_pool(void) 
	return -ENOMEM;

}



static struct dmaengine_unmap_data *

struct dmaengine_unmap_data *

dmaengine_get_unmap_data(struct device *dev, int nr, gfp_t flags)

{

	struct dmaengine_unmap_data *unmap;
@@ -1024,6 +1024,7 @@ dmaengine_get_unmap_data(struct device *dev, int nr, gfp_t flags) 


	return unmap;

}

EXPORT_SYMBOL(dmaengine_get_unmap_data);



/**

 * dma_async_memcpy_pg_to_pg - offloaded copy from page to page

include/linux/dmaengine.h

+17 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ struct dma_async_tx_descriptor { 
#endif

};



#ifdef CONFIG_DMA_ENGINE

static inline void dma_set_unmap(struct dma_async_tx_descriptor *tx,

				 struct dmaengine_unmap_data *unmap)

{
@@ -464,7 +465,23 @@ static inline void dma_set_unmap(struct dma_async_tx_descriptor *tx, 
	tx->unmap = unmap;

}



struct dmaengine_unmap_data *

dmaengine_get_unmap_data(struct device *dev, int nr, gfp_t flags);

void dmaengine_unmap_put(struct dmaengine_unmap_data *unmap);

#else

static inline void dma_set_unmap(struct dma_async_tx_descriptor *tx,

				 struct dmaengine_unmap_data *unmap)

{

}

static inline struct dmaengine_unmap_data *

dmaengine_get_unmap_data(struct device *dev, int nr, gfp_t flags)

{

	return NULL;

}

static inline void dmaengine_unmap_put(struct dmaengine_unmap_data *unmap)

{

}

#endif



static inline void dma_descriptor_unmap(struct dma_async_tx_descriptor *tx)

{