ioat: fix self test for multi-channel case

In the multiple device case we need to re-arm the completion and protect
against concurrent self-tests.  The printk from the test callback is
removed as it can arbitrarily delay completion of the test.

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

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c
index e42e1aea0f18..b3759c4b6536 100644
--- a/drivers/dma/ioat_dma.c
+++ b/drivers/dma/ioat_dma.c
@@ -1340,12 +1340,11 @@ static void ioat_dma_start_null_desc(struct ioat_dma_chan *ioat_chan)
  */
 #define IOAT_TEST_SIZE 2000
 
-DECLARE_COMPLETION(test_completion);
 static void ioat_dma_test_callback(void *dma_async_param)
 {
-        printk(KERN_ERR "ioatdma: ioat_dma_test_callback(%p)\n",
-                dma_async_param);
-        complete(&test_completion);
+        struct completion *cmp = dma_async_param;
+
+        complete(cmp);
 }
 
 /**
@@ -1362,6 +1361,7 @@ static int ioat_dma_self_test(struct ioatdma_device *device)
         dma_addr_t dma_dest, dma_src;
         dma_cookie_t cookie;
         int err = 0;
+        struct completion cmp;
 
         src = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, GFP_KERNEL);
         if (!src)
@@ -1401,8 +1401,9 @@ static int ioat_dma_self_test(struct ioatdma_device *device)
         }
 
         async_tx_ack(tx);
+        init_completion(&cmp);
         tx->callback = ioat_dma_test_callback;
-        tx->callback_param = (void *)0x8086;
+        tx->callback_param = &cmp;
         cookie = tx->tx_submit(tx);
         if (cookie < 0) {
                 dev_err(&device->pdev->dev,
@@ -1412,7 +1413,7 @@ static int ioat_dma_self_test(struct ioatdma_device *device)
         }
         device->common.device_issue_pending(dma_chan);
 
-        wait_for_completion_timeout(&test_completion, msecs_to_jiffies(3000));
+        wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));
 
         if (device->common.device_is_tx_complete(dma_chan, cookie, NULL, NULL)
                                         != DMA_SUCCESS) {