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

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

async_tx: replace 'int_en' with operation preparation flags 



Pass a full set of flags to drivers' per-operation 'prep' routines.
Currently the only flag passed is DMA_PREP_INTERRUPT.  The expectation is
that arch-specific async_tx_find_channel() implementations can exploit this
capability to find the best channel for an operation.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Acked-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Reviewed-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
parent 0036731c

crypto/async_tx/async_memcpy.c

+2 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset, 


	if (device) {

		dma_addr_t dma_dest, dma_src;

		unsigned long dma_prep_flags = cb_fn ? DMA_PREP_INTERRUPT : 0;



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

					DMA_FROM_DEVICE);
@@ -60,7 +61,7 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset, 
				       DMA_TO_DEVICE);



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

						    len, cb_fn != NULL);

						    len, dma_prep_flags);

	}



	if (tx) {

crypto/async_tx/async_memset.c

+2 −1
Original line number Diff line number Diff line
@@ -52,12 +52,13 @@ async_memset(struct page *dest, int val, unsigned int offset, 


	if (device) {

		dma_addr_t dma_dest;

		unsigned long dma_prep_flags = cb_fn ? DMA_PREP_INTERRUPT : 0;



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

					DMA_FROM_DEVICE);



		tx = device->device_prep_dma_memset(chan, dma_dest, val, len,

						    cb_fn != NULL);

						    dma_prep_flags);

	}



	if (tx) {

crypto/async_tx/async_xor.c

+6 −4
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ do_async_xor(struct dma_device *device, 
	dma_addr_t *dma_src = (dma_addr_t *) src_list;

	struct dma_async_tx_descriptor *tx;

	int i;

	unsigned long dma_prep_flags = cb_fn ? DMA_PREP_INTERRUPT : 0;



	pr_debug("%s: len: %zu\n", __FUNCTION__, len);
@@ -60,7 +61,7 @@ do_async_xor(struct dma_device *device, 
	 * in case they can not provide a descriptor

	 */

	tx = device->device_prep_dma_xor(chan, dma_dest, dma_src, src_cnt, len,

					 cb_fn != NULL);

					 dma_prep_flags);

	if (!tx) {

		if (depend_tx)

			dma_wait_for_async_tx(depend_tx);
@@ -68,7 +69,7 @@ do_async_xor(struct dma_device *device, 
		while (!tx)

			tx = device->device_prep_dma_xor(chan, dma_dest,

							 dma_src, src_cnt, len,

							 cb_fn != NULL);

							 dma_prep_flags);

	}



	async_tx_submit(chan, tx, flags, depend_tx, cb_fn, cb_param);
@@ -268,6 +269,7 @@ async_xor_zero_sum(struct page *dest, struct page **src_list, 


	if (device) {

		dma_addr_t *dma_src = (dma_addr_t *) src_list;

		unsigned long dma_prep_flags = cb_fn ? DMA_PREP_INTERRUPT : 0;

		int i;



		pr_debug("%s: (async) len: %zu\n", __FUNCTION__, len);
@@ -278,7 +280,7 @@ async_xor_zero_sum(struct page *dest, struct page **src_list, 


		tx = device->device_prep_dma_zero_sum(chan, dma_src, src_cnt,

						      len, result,

						      cb_fn != NULL);

						      dma_prep_flags);

		if (!tx) {

			if (depend_tx)

				dma_wait_for_async_tx(depend_tx);
@@ -286,7 +288,7 @@ async_xor_zero_sum(struct page *dest, struct page **src_list, 
			while (!tx)

				tx = device->device_prep_dma_zero_sum(chan,

					dma_src, src_cnt, len, result,

					cb_fn != NULL);

					dma_prep_flags);

		}



		async_tx_submit(chan, tx, flags, depend_tx, cb_fn, cb_param);

drivers/dma/ioat_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ static struct dma_async_tx_descriptor *ioat1_dma_prep_memcpy( 
						dma_addr_t dma_dest,

						dma_addr_t dma_src,

						size_t len,

						int int_en)

						unsigned long flags)

{

	struct ioat_dma_chan *ioat_chan = to_ioat_chan(chan);

	struct ioat_desc_sw *new;
@@ -724,7 +724,7 @@ static struct dma_async_tx_descriptor *ioat2_dma_prep_memcpy( 
						dma_addr_t dma_dest,

						dma_addr_t dma_src,

						size_t len,

						int int_en)

						unsigned long flags)

{

	struct ioat_dma_chan *ioat_chan = to_ioat_chan(chan);

	struct ioat_desc_sw *new;

drivers/dma/iop-adma.c

+10 −10
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ iop_adma_prep_dma_interrupt(struct dma_chan *chan) 


static struct dma_async_tx_descriptor *

iop_adma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dma_dest,

			 dma_addr_t dma_src, size_t len, int int_en)

			 dma_addr_t dma_src, size_t len, unsigned long flags)

{

	struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan);

	struct iop_adma_desc_slot *sw_desc, *grp_start;
@@ -555,7 +555,7 @@ iop_adma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dma_dest, 
	sw_desc = iop_adma_alloc_slots(iop_chan, slot_cnt, slots_per_op);

	if (sw_desc) {

		grp_start = sw_desc->group_head;

		iop_desc_init_memcpy(grp_start, int_en);

		iop_desc_init_memcpy(grp_start, flags);

		iop_desc_set_byte_count(grp_start, iop_chan, len);

		iop_desc_set_dest_addr(grp_start, iop_chan, dma_dest);

		iop_desc_set_memcpy_src_addr(grp_start, dma_src);
@@ -569,7 +569,7 @@ iop_adma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dma_dest, 


static struct dma_async_tx_descriptor *

iop_adma_prep_dma_memset(struct dma_chan *chan, dma_addr_t dma_dest,

			 int value, size_t len, int int_en)

			 int value, size_t len, unsigned long flags)

{

	struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan);

	struct iop_adma_desc_slot *sw_desc, *grp_start;
@@ -587,7 +587,7 @@ iop_adma_prep_dma_memset(struct dma_chan *chan, dma_addr_t dma_dest, 
	sw_desc = iop_adma_alloc_slots(iop_chan, slot_cnt, slots_per_op);

	if (sw_desc) {

		grp_start = sw_desc->group_head;

		iop_desc_init_memset(grp_start, int_en);

		iop_desc_init_memset(grp_start, flags);

		iop_desc_set_byte_count(grp_start, iop_chan, len);

		iop_desc_set_block_fill_val(grp_start, value);

		iop_desc_set_dest_addr(grp_start, iop_chan, dma_dest);
@@ -602,7 +602,7 @@ iop_adma_prep_dma_memset(struct dma_chan *chan, dma_addr_t dma_dest, 
static struct dma_async_tx_descriptor *

iop_adma_prep_dma_xor(struct dma_chan *chan, dma_addr_t dma_dest,

		      dma_addr_t *dma_src, unsigned int src_cnt, size_t len,

		      int int_en)

		      unsigned long flags)

{

	struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan);

	struct iop_adma_desc_slot *sw_desc, *grp_start;
@@ -613,15 +613,15 @@ iop_adma_prep_dma_xor(struct dma_chan *chan, dma_addr_t dma_dest, 
	BUG_ON(unlikely(len > IOP_ADMA_XOR_MAX_BYTE_COUNT));



	dev_dbg(iop_chan->device->common.dev,

		"%s src_cnt: %d len: %u int_en: %d\n",

		__FUNCTION__, src_cnt, len, int_en);

		"%s src_cnt: %d len: %u flags: %lx\n",

		__FUNCTION__, src_cnt, len, flags);



	spin_lock_bh(&iop_chan->lock);

	slot_cnt = iop_chan_xor_slot_count(len, src_cnt, &slots_per_op);

	sw_desc = iop_adma_alloc_slots(iop_chan, slot_cnt, slots_per_op);

	if (sw_desc) {

		grp_start = sw_desc->group_head;

		iop_desc_init_xor(grp_start, src_cnt, int_en);

		iop_desc_init_xor(grp_start, src_cnt, flags);

		iop_desc_set_byte_count(grp_start, iop_chan, len);

		iop_desc_set_dest_addr(grp_start, iop_chan, dma_dest);

		sw_desc->unmap_src_cnt = src_cnt;
@@ -638,7 +638,7 @@ iop_adma_prep_dma_xor(struct dma_chan *chan, dma_addr_t dma_dest, 
static struct dma_async_tx_descriptor *

iop_adma_prep_dma_zero_sum(struct dma_chan *chan, dma_addr_t *dma_src,

			   unsigned int src_cnt, size_t len, u32 *result,

			   int int_en)

			   unsigned long flags)

{

	struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan);

	struct iop_adma_desc_slot *sw_desc, *grp_start;
@@ -655,7 +655,7 @@ iop_adma_prep_dma_zero_sum(struct dma_chan *chan, dma_addr_t *dma_src, 
	sw_desc = iop_adma_alloc_slots(iop_chan, slot_cnt, slots_per_op);

	if (sw_desc) {

		grp_start = sw_desc->group_head;

		iop_desc_init_zero_sum(grp_start, src_cnt, int_en);

		iop_desc_init_zero_sum(grp_start, src_cnt, flags);

		iop_desc_set_zero_sum_byte_count(grp_start, len);

		grp_start->xor_check_result = result;

		pr_debug("\t%s: grp_start->xor_check_result: %p\n",