aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/ioat_dma.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2009-03-02 15:31:35 -0500
committerDan Williams <dan.j.williams@intel.com>2009-03-04 18:04:40 -0500
commit0c33e1ca3d80647f2e72e44524fd21e79214da20 (patch)
tree672be83761daef7e927ab6479c7bfa4986b12fbf /drivers/dma/ioat_dma.c
parent211a22ce08dbb27eb1a66df8a4bdae5e96092bc8 (diff)
I/OAT: fail self-test if callback test reaches timeout
If we miss interrupts in the self test then fail registration of this channel as it is unsuitable for use as a public channel. Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/ioat_dma.c')
-rw-r--r--drivers/dma/ioat_dma.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dma/ioat_dma.c b/drivers/dma/ioat_dma.c
index 068b63514525..5905cd36bcd2 100644
--- a/drivers/dma/ioat_dma.c
+++ b/drivers/dma/ioat_dma.c
@@ -1363,6 +1363,7 @@ static int ioat_dma_self_test(struct ioatdma_device *device)
1363 dma_cookie_t cookie; 1363 dma_cookie_t cookie;
1364 int err = 0; 1364 int err = 0;
1365 struct completion cmp; 1365 struct completion cmp;
1366 unsigned long tmo;
1366 1367
1367 src = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, GFP_KERNEL); 1368 src = kzalloc(sizeof(u8) * IOAT_TEST_SIZE, GFP_KERNEL);
1368 if (!src) 1369 if (!src)
@@ -1414,9 +1415,10 @@ static int ioat_dma_self_test(struct ioatdma_device *device)
1414 } 1415 }
1415 device->common.device_issue_pending(dma_chan); 1416 device->common.device_issue_pending(dma_chan);
1416 1417
1417 wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000)); 1418 tmo = wait_for_completion_timeout(&cmp, msecs_to_jiffies(3000));
1418 1419
1419 if (device->common.device_is_tx_complete(dma_chan, cookie, NULL, NULL) 1420 if (tmo == 0 ||
1421 device->common.device_is_tx_complete(dma_chan, cookie, NULL, NULL)
1420 != DMA_SUCCESS) { 1422 != DMA_SUCCESS) {
1421 dev_err(&device->pdev->dev, 1423 dev_err(&device->pdev->dev,
1422 "Self-test copy timed out, disabling\n"); 1424 "Self-test copy timed out, disabling\n");