diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-12-04 13:44:48 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2009-12-11 01:27:51 -0500 |
commit | cfe4f2751ef1a5390b56c5d263f90b6ff138ba31 (patch) | |
tree | 05eb71e6046cde60a728b792b9b44918e9b1c210 /drivers/dma/dmatest.c | |
parent | ddb4f0f0e05871c7ac540cc778993c06ff53b765 (diff) |
dmaengine: fix dmatest to verify minimum transfer length and test buffer size
Transfers and the test buffer have to be at least align bytes long.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/dmatest.c')
-rw-r--r-- | drivers/dma/dmatest.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index a32a4cf7b1e0..8b905161fbf4 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c | |||
@@ -298,10 +298,6 @@ static int dmatest_func(void *data) | |||
298 | 298 | ||
299 | total_tests++; | 299 | total_tests++; |
300 | 300 | ||
301 | len = dmatest_random() % test_buf_size + 1; | ||
302 | src_off = dmatest_random() % (test_buf_size - len + 1); | ||
303 | dst_off = dmatest_random() % (test_buf_size - len + 1); | ||
304 | |||
305 | /* honor alignment restrictions */ | 301 | /* honor alignment restrictions */ |
306 | if (thread->type == DMA_MEMCPY) | 302 | if (thread->type == DMA_MEMCPY) |
307 | align = dev->copy_align; | 303 | align = dev->copy_align; |
@@ -310,7 +306,19 @@ static int dmatest_func(void *data) | |||
310 | else if (thread->type == DMA_PQ) | 306 | else if (thread->type == DMA_PQ) |
311 | align = dev->pq_align; | 307 | align = dev->pq_align; |
312 | 308 | ||
309 | if (1 << align > test_buf_size) { | ||
310 | pr_err("%u-byte buffer too small for %d-byte alignment\n", | ||
311 | test_buf_size, 1 << align); | ||
312 | break; | ||
313 | } | ||
314 | |||
315 | len = dmatest_random() % test_buf_size + 1; | ||
313 | len = (len >> align) << align; | 316 | len = (len >> align) << align; |
317 | if (!len) | ||
318 | len = 1 << align; | ||
319 | src_off = dmatest_random() % (test_buf_size - len + 1); | ||
320 | dst_off = dmatest_random() % (test_buf_size - len + 1); | ||
321 | |||
314 | src_off = (src_off >> align) << align; | 322 | src_off = (src_off >> align) << align; |
315 | dst_off = (dst_off >> align) << align; | 323 | dst_off = (dst_off >> align) << align; |
316 | 324 | ||