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

Commit 47437b2c authored by Dan Williams's avatar Dan Williams
Browse files

async_tx: allow architecture specific async_tx_find_channel implementations 



The source and destination addresses are included to allow channel
selection based on address alignment.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Reviewed-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
parent d4c56f97

crypto/async_tx/async_memcpy.c

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset, 
	struct dma_async_tx_descriptor *depend_tx,

	dma_async_tx_callback cb_fn, void *cb_param)

{

	struct dma_chan *chan = async_tx_find_channel(depend_tx, DMA_MEMCPY);

	struct dma_chan *chan = async_tx_find_channel(depend_tx, DMA_MEMCPY,

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

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

	struct dma_async_tx_descriptor *tx = NULL;

crypto/async_tx/async_memset.c

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ async_memset(struct page *dest, int val, unsigned int offset, 
	struct dma_async_tx_descriptor *depend_tx,

	dma_async_tx_callback cb_fn, void *cb_param)

{

	struct dma_chan *chan = async_tx_find_channel(depend_tx, DMA_MEMSET);

	struct dma_chan *chan = async_tx_find_channel(depend_tx, DMA_MEMSET,

						      &dest, 1, NULL, 0, len);

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

	struct dma_async_tx_descriptor *tx = NULL;

crypto/async_tx/async_tx.c

+3 −3
Original line number Diff line number Diff line
@@ -361,13 +361,13 @@ static void __exit async_tx_exit(void) 
}



/**

 * async_tx_find_channel - find a channel to carry out the operation or let

 * __async_tx_find_channel - find a channel to carry out the operation or let

 *	the transaction execute synchronously

 * @depend_tx: transaction dependency

 * @tx_type: transaction type

 */

struct dma_chan *

async_tx_find_channel(struct dma_async_tx_descriptor *depend_tx,

__async_tx_find_channel(struct dma_async_tx_descriptor *depend_tx,

	enum dma_transaction_type tx_type)

{

	/* see if we can keep the chain on one channel */
@@ -383,7 +383,7 @@ async_tx_find_channel(struct dma_async_tx_descriptor *depend_tx, 
	} else

		return NULL;

}

EXPORT_SYMBOL_GPL(async_tx_find_channel);

EXPORT_SYMBOL_GPL(__async_tx_find_channel);

#else

static int __init async_tx_init(void)

{

crypto/async_tx/async_xor.c

+6 −2
Original line number Diff line number Diff line
@@ -129,7 +129,9 @@ async_xor(struct page *dest, struct page **src_list, unsigned int offset, 
	struct dma_async_tx_descriptor *depend_tx,

	dma_async_tx_callback cb_fn, void *cb_param)

{

	struct dma_chan *chan = async_tx_find_channel(depend_tx, DMA_XOR);

	struct dma_chan *chan = async_tx_find_channel(depend_tx, DMA_XOR,

						      &dest, 1, src_list,

						      src_cnt, len);

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

	struct dma_async_tx_descriptor *tx = NULL;

	dma_async_tx_callback _cb_fn;
@@ -261,7 +263,9 @@ async_xor_zero_sum(struct page *dest, struct page **src_list, 
	struct dma_async_tx_descriptor *depend_tx,

	dma_async_tx_callback cb_fn, void *cb_param)

{

	struct dma_chan *chan = async_tx_find_channel(depend_tx, DMA_ZERO_SUM);

	struct dma_chan *chan = async_tx_find_channel(depend_tx, DMA_ZERO_SUM,

						      &dest, 1, src_list,

						      src_cnt, len);

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

	struct dma_async_tx_descriptor *tx = NULL;

include/linux/async_tx.h

+9 −2
Original line number Diff line number Diff line
@@ -62,9 +62,15 @@ enum async_tx_flags { 
void async_tx_issue_pending_all(void);

enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx);

void async_tx_run_dependencies(struct dma_async_tx_descriptor *tx);

#ifdef CONFIG_ARCH_HAS_ASYNC_TX_FIND_CHANNEL

#include <asm/async_tx.h>

#else

#define async_tx_find_channel(dep, type, dst, dst_count, src, src_count, len) \

	 __async_tx_find_channel(dep, type)

struct dma_chan *

async_tx_find_channel(struct dma_async_tx_descriptor *depend_tx,

__async_tx_find_channel(struct dma_async_tx_descriptor *depend_tx,

	enum dma_transaction_type tx_type);

#endif /* CONFIG_ARCH_HAS_ASYNC_TX_FIND_CHANNEL */

#else

static inline void async_tx_issue_pending_all(void)

{
@@ -86,7 +92,8 @@ async_tx_run_dependencies(struct dma_async_tx_descriptor *tx, 


static inline struct dma_chan *

async_tx_find_channel(struct dma_async_tx_descriptor *depend_tx,

	enum dma_transaction_type tx_type)

	enum dma_transaction_type tx_type, struct page **dst, int dst_count,

	struct page **src, int src_count, size_t len)

{

	return NULL;

}