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

Commit 3bbdd498 authored by Dan Williams's avatar Dan Williams
Browse files

async_raid6_recov: 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: keep temporary dma_dest array in async_mult()]
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 173e86b2

crypto/async_tx/async_raid6_recov.c

+49 −20
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/dma-mapping.h>

#include <linux/raid/pq.h>

#include <linux/async_tx.h>

#include <linux/dmaengine.h>



static struct dma_async_tx_descriptor *

async_sum_product(struct page *dest, struct page **srcs, unsigned char *coef,
@@ -34,35 +35,47 @@ async_sum_product(struct page *dest, struct page **srcs, unsigned char *coef, 
	struct dma_chan *chan = async_tx_find_channel(submit, DMA_PQ,

						      &dest, 1, srcs, 2, len);

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

	struct dmaengine_unmap_data *unmap = NULL;

	const u8 *amul, *bmul;

	u8 ax, bx;

	u8 *a, *b, *c;



	if (dma) {

		dma_addr_t dma_dest[2];

		dma_addr_t dma_src[2];

	if (dma)

		unmap = dmaengine_get_unmap_data(dma->dev, 3, GFP_NOIO);



	if (unmap) {

		struct device *dev = dma->dev;

		dma_addr_t pq[2];

		struct dma_async_tx_descriptor *tx;

		enum dma_ctrl_flags dma_flags = DMA_PREP_PQ_DISABLE_P;

		enum dma_ctrl_flags dma_flags = DMA_COMPL_SKIP_SRC_UNMAP |

						DMA_COMPL_SKIP_DEST_UNMAP |

						DMA_PREP_PQ_DISABLE_P;



		if (submit->flags & ASYNC_TX_FENCE)

			dma_flags |= DMA_PREP_FENCE;

		dma_dest[1] = dma_map_page(dev, dest, 0, len, DMA_BIDIRECTIONAL);

		dma_src[0] = dma_map_page(dev, srcs[0], 0, len, DMA_TO_DEVICE);

		dma_src[1] = dma_map_page(dev, srcs[1], 0, len, DMA_TO_DEVICE);

		tx = dma->device_prep_dma_pq(chan, dma_dest, dma_src, 2, coef,

		unmap->addr[0] = dma_map_page(dev, srcs[0], 0, len, DMA_TO_DEVICE);

		unmap->addr[1] = dma_map_page(dev, srcs[1], 0, len, DMA_TO_DEVICE);

		unmap->to_cnt = 2;



		unmap->addr[2] = dma_map_page(dev, dest, 0, len, DMA_BIDIRECTIONAL);

		unmap->bidi_cnt = 1;

		/* engine only looks at Q, but expects it to follow P */

		pq[1] = unmap->addr[2];



		unmap->len = len;

		tx = dma->device_prep_dma_pq(chan, pq, unmap->addr, 2, coef,

					     len, dma_flags);

		if (tx) {

			dma_set_unmap(tx, unmap);

			async_tx_submit(chan, tx, submit);

			dmaengine_unmap_put(unmap);

			return tx;

		}



		/* could not get a descriptor, unmap and fall through to

		 * the synchronous path

		 */

		dma_unmap_page(dev, dma_dest[1], len, DMA_BIDIRECTIONAL);

		dma_unmap_page(dev, dma_src[0], len, DMA_TO_DEVICE);

		dma_unmap_page(dev, dma_src[1], len, DMA_TO_DEVICE);

		dmaengine_unmap_put(unmap);

	}



	/* run the operation synchronously */
@@ -89,23 +102,40 @@ async_mult(struct page *dest, struct page *src, u8 coef, size_t len, 
	struct dma_chan *chan = async_tx_find_channel(submit, DMA_PQ,

						      &dest, 1, &src, 1, len);

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

	struct dmaengine_unmap_data *unmap = NULL;

	const u8 *qmul; /* Q multiplier table */

	u8 *d, *s;



	if (dma) {

	if (dma)

		unmap = dmaengine_get_unmap_data(dma->dev, 3, GFP_NOIO);



	if (unmap) {

		dma_addr_t dma_dest[2];

		dma_addr_t dma_src[1];

		struct device *dev = dma->dev;

		struct dma_async_tx_descriptor *tx;

		enum dma_ctrl_flags dma_flags = DMA_PREP_PQ_DISABLE_P;

		enum dma_ctrl_flags dma_flags = DMA_COMPL_SKIP_SRC_UNMAP |

						DMA_COMPL_SKIP_DEST_UNMAP |

						DMA_PREP_PQ_DISABLE_P;



		if (submit->flags & ASYNC_TX_FENCE)

			dma_flags |= DMA_PREP_FENCE;

		dma_dest[1] = dma_map_page(dev, dest, 0, len, DMA_BIDIRECTIONAL);

		dma_src[0] = dma_map_page(dev, src, 0, len, DMA_TO_DEVICE);

		tx = dma->device_prep_dma_pq(chan, dma_dest, dma_src, 1, &coef,

					     len, dma_flags);

		unmap->addr[0] = dma_map_page(dev, src, 0, len, DMA_TO_DEVICE);

		unmap->to_cnt++;

		unmap->addr[1] = dma_map_page(dev, dest, 0, len, DMA_BIDIRECTIONAL);

		dma_dest[1] = unmap->addr[1];

		unmap->bidi_cnt++;

		unmap->len = len;



		/* this looks funny, but the engine looks for Q at

		 * dma_dest[1] and ignores dma_dest[0] as a dest

		 * due to DMA_PREP_PQ_DISABLE_P

		 */

		tx = dma->device_prep_dma_pq(chan, dma_dest, unmap->addr,

					     1, &coef, len, dma_flags);



		if (tx) {

			dma_set_unmap(tx, unmap);

			dmaengine_unmap_put(unmap);

			async_tx_submit(chan, tx, submit);

			return tx;

		}
@@ -113,8 +143,7 @@ async_mult(struct page *dest, struct page *src, u8 coef, size_t len, 
		/* could not get a descriptor, unmap and fall through to

		 * the synchronous path

		 */

		dma_unmap_page(dev, dma_dest[1], len, DMA_BIDIRECTIONAL);

		dma_unmap_page(dev, dma_src[0], len, DMA_TO_DEVICE);

		dmaengine_unmap_put(unmap);

	}



	/* no channel available, or failed to allocate a descriptor, so