Linux kernel stable tree (mirror) https://git.radix-linux.su/kernel/linux.git/atom?h=v2.6.30 2009-05-12T21:41:47+00:00 2009-05-12T21:41:47+00:00 Maciej Sosnowski maciej.sosnowski@intel.com 2009-04-23T10:31:51+00:00 urn:sha1:4f005dbe5584fe54c9f6d6d4f0acd3fb29be84da as reported by Alexander Beregalov <a.beregalov@gmail.com> ioatdma 0000:00:08.0: DMA-API: device driver frees DMA memory with wrong function [device address=0x000000007f76f800] [size=2000 bytes] [map ped as single] [unmapped as page] The ioatdma driver was unmapping all regions (either allocated as page or single) using unmap_page. This patch lets dma driver recognize if unmap_single or unmap_page should be used. It introduces two new dma control flags: DMA_COMPL_SRC_UNMAP_SINGLE and DMA_COMPL_DEST_UNMAP_SINGLE. They should be set to indicate dma driver to do dma-unmapping as single (first one for the source, tha latter for the destination). If respective flag is not set, the driver assumes dma-unmapping as page. Signed-off-by: Maciej Sosnowski <maciej.sosnowski@intel.com> Reported-by: Alexander Beregalov <a.beregalov@gmail.com> Tested-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> 2009-03-26T16:48:09+00:00 Atsushi Nemoto anemo@mba.ocn.ne.jp 2009-03-06T11:07:14+00:00 urn:sha1:0f571515c332e00b3515dbe0859ceaa30ab66e00 Currently dma_request_channel() set DMA_PRIVATE capability but never clear it. So if a public channel was once grabbed by dma_request_channel(), the device stay PRIVATE forever. Add privatecnt member to dma_device to correctly revert it. [lg@denx.de: fix bad usage of 'chan' in dma_async_device_register] Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Acked-by: Maciej Sosnowski <maciej.sosnowski@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> 2009-03-25T16:13:25+00:00 Dan Williams dan.j.williams@intel.com 2009-03-25T16:13:25+00:00 urn:sha1:729b5d1b8ec72c28e99840b3f300ba67726e3ab9 Provide a config option for blocking the allocation of dma channels to the async_tx api. Signed-off-by: Dan Williams <dan.j.williams@intel.com> 2009-03-25T16:13:24+00:00 Dan Williams dan.j.williams@intel.com 2009-03-25T16:13:24+00:00 urn:sha1:54aee6a5f560d0e1bf3f39987c6ebe06daeb0ce1 The dmaengine redux left some unneeded headers in include/linux/dmaengine.h, clean them up. Signed-off-by: Dan Williams <dan.j.williams@intel.com> 2009-03-08T17:23:05+00:00 Linus Torvalds torvalds@linux-foundation.org 2009-03-08T17:23:05+00:00 urn:sha1:5dc18f51a2c06ddab708184e30b7967fb71c1784 * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: dmatest: fix use after free in dmatest_exit ipu_idmac: fix spinlock type iop-adma, mv_xor: fix mem leak on self-test setup failure fsldma: fix off by one in dma_halt I/OAT: fail self-test if callback test reaches timeout I/OAT: update driver version and copyright dates I/OAT: list usage cleanup I/OAT: set tcp_dma_copybreak to 256k for I/OAT ver.3 I/OAT: cancel watchdog before dma remove I/OAT: fail initialization on zero channels detection I/OAT: do not set DCACTRL_CMPL_WRITE_ENABLE for I/OAT ver.3 I/OAT: add verification for proper APICID_TAG_MAP setting by BIOS dmaengine: update kerneldoc 2009-02-18T23:37:55+00:00 Dan Williams dan.j.williams@intel.com 2009-02-18T22:48:26+00:00 urn:sha1:287d859222e0adbc67666a6154aaf42d7d5bbb54 The conversion of atmel-mci to dma_request_channel missed the initialization of the channel dma_slave information. The filter_fn passed to dma_request_channel is responsible for initializing the channel's private data. This implementation has the additional benefit of enabling a generic client-channel data passing mechanism. Reviewed-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Acked-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 2009-02-12T00:12:27+00:00 Johannes Weiner jw@emlix.com 2009-02-11T15:47:19+00:00 urn:sha1:1d93e52eb48df986a3c4d5ad8a520bf1f6837367 Some of the kerneldoc comments in the dmaengine header describe already removed structure members. Remove them. Also add a short description for dma_device->device_is_tx_complete. Signed-off-by: Johannes Weiner <jw@emlix.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> 2009-02-07T06:06:43+00:00 David S. Miller davem@davemloft.net 2009-02-07T06:06:43+00:00 urn:sha1:b4bd07c20ba0c1fa7ad09ba257e0a5cfc2bf6bb3 Based upon a patch from Atsushi Nemoto <anemo@mba.ocn.ne.jp> -------------------- The commit 649274d993212e7c23c0cb734572c2311c200872 ("net_dma: acquire/release dma channels on ifup/ifdown") added unconditional call of dmaengine_get() to net_dma. The API should be called only if NET_DMA was enabled. -------------------- Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Dan Williams <dan.j.williams@intel.com> 2009-01-26T18:13:08+00:00 Linus Torvalds torvalds@linux-foundation.org 2009-01-26T18:13:08+00:00 urn:sha1:7954d5cf39ee1ce9bb0a4b19fcf1924885a9cad1 * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: i.MX31: framebuffer driver i.MX31: Image Processing Unit DMA and IRQ drivers dmaengine: add async_tx_clear_ack() macro dmaengine: dma_issue_pending_all == nop when CONFIG_DMA_ENGINE=n dmaengine: kill some dubious WARN_ONCEs fsldma: print correct IRQ on mpc83xx fsldma: check for NO_IRQ in fsl_dma_chan_remove() dmatest: Use custom map/unmap for destination buffer fsldma: use a valid 'device' for dma_pool_create dmaengine: fix dependency chaining 2009-01-19T22:36:21+00:00 Guennadi Liakhovetski lg@denx.de 2009-01-19T22:36:21+00:00 urn:sha1:ef560682a97491f62ef538931a4861b57d66c52c To complete the DMA_CTRL_ACK handling API add a async_tx_clear_ack() macro. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> Signed-off-by: Dan Williams <dan.j.williams@intel.com>