diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-11-16 11:54:17 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-11-16 12:02:36 +0530 |
| commit | 60e7d1ead1707fd843a08e9c34488a4078b19779 (patch) | |
| tree | fffff95bbd7b4e187ad6c46a8cd04fb75eea545a /crypto/async_tx/raid6test.c | |
| parent | 5aa3f9427be22feb7dd998c6fc26e8318c3e0a8a (diff) | |
| parent | 5fd30e4d299223b41c9202ff2d71c84299f79212 (diff) | |
| download | linux-crypto-60e7d1ead1707fd843a08e9c34488a4078b19779.tar.gz linux-crypto-60e7d1ead1707fd843a08e9c34488a4078b19779.zip | |
Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine
Pull dmaengine changes from Dan
1/ Bartlomiej and Dan finalized a rework of the dma address unmap
implementation.
2/ In the course of testing 1/ a collection of enhancements to dmatest
fell out. Notably basic performance statistics, and fixed / enhanced
test control through new module parameters 'run', 'wait', 'noverify',
and 'verbose'. Thanks to Andriy and Linus for their review.
3/ Testing the raid related corner cases of 1/ triggered bugs in the
recently added 16-source operation support in the ioatdma driver.
4/ Some minor fixes / cleanups to mv_xor and ioatdma.
Conflicts:
drivers/dma/dmatest.c
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'crypto/async_tx/raid6test.c')
| -rw-r--r-- | crypto/async_tx/raid6test.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/crypto/async_tx/raid6test.c b/crypto/async_tx/raid6test.c index 4a92bac7..dad95f45 100644 --- a/crypto/async_tx/raid6test.c +++ b/crypto/async_tx/raid6test.c @@ -28,7 +28,7 @@ #undef pr #define pr(fmt, args...) pr_info("raid6test: " fmt, ##args) -#define NDISKS 16 /* Including P and Q */ +#define NDISKS 64 /* Including P and Q */ static struct page *dataptrs[NDISKS]; static addr_conv_t addr_conv[NDISKS]; @@ -219,6 +219,14 @@ static int raid6_test(void) err += test(11, &tests); err += test(12, &tests); } + + /* the 24 disk case is special for ioatdma as it is the boudary point + * at which it needs to switch from 8-source ops to 16-source + * ops for continuation (assumes DMA_HAS_PQ_CONTINUE is not set) + */ + if (NDISKS > 24) + err += test(24, &tests); + err += test(NDISKS, &tests); pr("\n"); |