diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-18 12:05:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-18 12:05:53 -0800 |
| commit | 59da1f87b276c593b852766c2fdcad62835970f7 (patch) | |
| tree | 3c3ace81c2132aaf13223df10c4491c38a46c976 /crypto | |
| parent | 69098bac169d630a777b362470f20451b9446e39 (diff) | |
| parent | a06d568f7c5e40e34ea64881842deb8f4382babf (diff) | |
| download | kernel_samsung_smdk4412-59da1f87b276c593b852766c2fdcad62835970f7.tar.gz kernel_samsung_smdk4412-59da1f87b276c593b852766c2fdcad62835970f7.tar.bz2 kernel_samsung_smdk4412-59da1f87b276c593b852766c2fdcad62835970f7.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
async_xor: dma_map destination DMA_BIDIRECTIONAL
dmaengine: protect 'id' from concurrent registrations
ioat: wait for self-test completion
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/async_tx/async_xor.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index c029d3eb9ef..595b78672b3 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c @@ -53,10 +53,17 @@ do_async_xor(struct dma_chan *chan, struct page *dest, struct page **src_list, int xor_src_cnt; dma_addr_t dma_dest; - dma_dest = dma_map_page(dma->dev, dest, offset, len, DMA_FROM_DEVICE); - for (i = 0; i < src_cnt; i++) + /* map the dest bidrectional in case it is re-used as a source */ + dma_dest = dma_map_page(dma->dev, dest, offset, len, DMA_BIDIRECTIONAL); + for (i = 0; i < src_cnt; i++) { + /* only map the dest once */ + if (unlikely(src_list[i] == dest)) { + dma_src[i] = dma_dest; + continue; + } dma_src[i] = dma_map_page(dma->dev, src_list[i], offset, len, DMA_TO_DEVICE); + } while (src_cnt) { async_flags = flags; |