lkml.org 
[lkml]   [2009]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 07/85] ioat: fix self test for multi-channel case
    2.6.27-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Dan Williams <dan.j.williams@intel.com>

    commit b9bdcbba010c2e49c8f837ea7a49fe006b636f41 upstream.

    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: Maciej Sosnowski <maciej.sosnowski@intel.com>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/dma/ioat_dma.c | 13 +++++++------
    1 file changed, 7 insertions(+), 6 deletions(-)

    --- a/drivers/dma/ioat_dma.c
    +++ b/drivers/dma/ioat_dma.c
    @@ -1337,12 +1337,11 @@ static void ioat_dma_start_null_desc(str
    */
    #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);
    }

    /**
    @@ -1359,6 +1358,7 @@ static int ioat_dma_self_test(struct ioa
    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)
    @@ -1398,8 +1398,9 @@ static int ioat_dma_self_test(struct ioa
    }

    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,
    @@ -1409,7 +1410,7 @@ static int ioat_dma_self_test(struct ioa
    }
    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) {


    \
     
     \ /
      Last update: 2009-01-15 23:09    [W:0.041 / U:32.160 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site