dmaengine: ack to flags: make use of the unused bits in the 'ack' field

'ack' is currently a simple integer that flags whether or not a client is done
touching fields in the given descriptor.  It is effectively just a single bit
of information.  Converting this to a flags parameter allows the other bits to
be put to use to control completion actions, like dma-unmap, and capture
results, like xor-zero-sum == 0.

Changes are one of:
1/ convert all open-coded ->ack manipulations to use async_tx_ack
   and async_tx_test_ack.
2/ set the ack bit at prep time where possible
3/ make drivers store the flags at prep time
4/ add flags to the device_prep_dma_interrupt prototype

Acked-by: Maciej Sosnowski <maciej.sosnowski@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

3 files changed, 7 insertions, 6 deletions

diff --git a/crypto/async_tx/async_memcpy.c b/crypto/async_tx/async_memcpy.c
index 84caa4efc0d..a5eda80e842 100644
--- a/crypto/async_tx/async_memcpy.c
+++ b/crypto/async_tx/async_memcpy.c
@@ -77,7 +77,7 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset,
                         /* if ack is already set then we cannot be sure
                          * we are referring to the correct operation
                          */
-                        BUG_ON(depend_tx->ack);
+                        BUG_ON(async_tx_test_ack(depend_tx));
                         if (dma_wait_for_async_tx(depend_tx) == DMA_ERROR)
                                 panic("%s: DMA_ERROR waiting for depend_tx\n",
                                         __func__);
diff --git a/crypto/async_tx/async_tx.c b/crypto/async_tx/async_tx.c
index 69756164b61..c6e772fc5cc 100644
--- a/crypto/async_tx/async_tx.c
+++ b/crypto/async_tx/async_tx.c
@@ -446,7 +446,7 @@ async_tx_channel_switch(struct dma_async_tx_descriptor *depend_tx,
          * otherwise poll for completion
          */
         if (dma_has_cap(DMA_INTERRUPT, device->cap_mask))
-                intr_tx = device->device_prep_dma_interrupt(chan);
+                intr_tx = device->device_prep_dma_interrupt(chan, 0);
         else
                 intr_tx = NULL;
 
@@ -515,7 +515,8 @@ async_tx_submit(struct dma_chan *chan, struct dma_async_tx_descriptor *tx,
                  * 2/ dependencies are 1:1 i.e. two transactions can
                  * not depend on the same parent
                  */
-                BUG_ON(depend_tx->ack || depend_tx->next || tx->parent);
+                BUG_ON(async_tx_test_ack(depend_tx) || depend_tx->next ||
+                       tx->parent);
 
                 /* the lock prevents async_tx_run_dependencies from missing
                  * the setting of ->next when ->parent != NULL
@@ -594,7 +595,7 @@ async_trigger_callback(enum async_tx_flags flags,
                 if (device && !dma_has_cap(DMA_INTERRUPT, device->cap_mask))
                         device = NULL;
 
-                tx = device ? device->device_prep_dma_interrupt(chan) : NULL;
+                tx = device ? device->device_prep_dma_interrupt(chan, 0) : NULL;
         } else
                 tx = NULL;
 
@@ -610,7 +611,7 @@ async_trigger_callback(enum async_tx_flags flags,
                         /* if ack is already set then we cannot be sure
                          * we are referring to the correct operation
                          */
-                        BUG_ON(depend_tx->ack);
+                        BUG_ON(async_tx_test_ack(depend_tx));
                         if (dma_wait_for_async_tx(depend_tx) == DMA_ERROR)
                                 panic("%s: DMA_ERROR waiting for depend_tx\n",
                                         __func__);
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c
index 1c445c7bdab..3a0dddca5a1 100644
--- a/crypto/async_tx/async_xor.c
+++ b/crypto/async_tx/async_xor.c
@@ -191,7 +191,7 @@ async_xor(struct page *dest, struct page **src_list, unsigned int offset,
                                 /* if ack is already set then we cannot be sure
                                  * we are referring to the correct operation
                                  */
-                                BUG_ON(depend_tx->ack);
+                                BUG_ON(async_tx_test_ack(depend_tx));
                                 if (dma_wait_for_async_tx(depend_tx) ==
                                         DMA_ERROR)
                                         panic("%s: DMA_ERROR waiting for "