From: Vinod Koul <vinod.koul@intel.com>
Date: Sat, 16 Nov 2013 06:24:17 +0000 (+0530)
Subject: Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: accepted/tizen/common/20141203.182822~1065^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df12a3178d340319b1955be6b973a4eb84aff754;p=platform%2Fkernel%2Flinux-arm64.git

Merge commit 'dmaengine-3.13-v2' of git://git./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>
---

df12a3178d340319b1955be6b973a4eb84aff754
diff --cc drivers/dma/dmatest.c
index 59e287f,329b7cf..20f9a3a
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@@ -735,17 -633,17 +633,17 @@@ static int dmatest_func(void *data
  			 * free it this time?" dancing.  For now, just
  			 * leave it dangling.
  			 */
- 			thread_result_add(info, result, DMATEST_ET_TIMEOUT,
- 					  total_tests, src_off, dst_off,
- 					  len, 0);
+ 			dmaengine_unmap_put(um);
+ 			result("test timed out", total_tests, src_off, dst_off,
+ 			       len, 0);
  			failed_tests++;
  			continue;
 -		} else if (status != DMA_SUCCESS) {
 +		} else if (status != DMA_COMPLETE) {
- 			enum dmatest_error_type type = (status == DMA_ERROR) ?
- 				DMATEST_ET_DMA_ERROR : DMATEST_ET_DMA_IN_PROGRESS;
- 			thread_result_add(info, result, type,
- 					  total_tests, src_off, dst_off,
- 					  len, status);
+ 			dmaengine_unmap_put(um);
+ 			result(status == DMA_ERROR ?
+ 			       "completion error status" :
+ 			       "completion busy status", total_tests, src_off,
+ 			       dst_off, len, ret);
  			failed_tests++;
  			continue;
  		}