diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-09-29 13:50:16 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-09-29 13:50:16 +0000 |
| commit | 76e0ff33deb5cef08ca80bb8d3a5005cbbebce55 (patch) | |
| tree | 7f0858f9f3924624aa3a647b3ced3932b4baceb3 /target/linux/ixp4xx/patches-2.6.36 | |
| parent | 92e5e35c77ea8beb9ede93446bf1186409365bd7 (diff) | |
| download | upstream-76e0ff33deb5cef08ca80bb8d3a5005cbbebce55.tar.gz upstream-76e0ff33deb5cef08ca80bb8d3a5005cbbebce55.tar.bz2 upstream-76e0ff33deb5cef08ca80bb8d3a5005cbbebce55.zip | |
linux/ixp4xx: sync 2.6.36 patches to 2.6.36-rc6
SVN-Revision: 23150
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.36')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.36/050-disable_dmabounce.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.36/050-disable_dmabounce.patch b/target/linux/ixp4xx/patches-2.6.36/050-disable_dmabounce.patch index 4652a4fc60..33509baa2b 100644 --- a/target/linux/ixp4xx/patches-2.6.36/050-disable_dmabounce.patch +++ b/target/linux/ixp4xx/patches-2.6.36/050-disable_dmabounce.patch @@ -119,3 +119,30 @@ #define ISA_DMA_THRESHOLD (SZ_64M - 1) #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) +--- a/arch/arm/common/dmabounce.c ++++ b/arch/arm/common/dmabounce.c +@@ -30,6 +30,7 @@ + #include <linux/dma-mapping.h> + #include <linux/dmapool.h> + #include <linux/list.h> ++#include <linux/pci.h> + #include <linux/scatterlist.h> + + #include <asm/cacheflush.h> +@@ -248,8 +249,15 @@ static inline dma_addr_t map_single(stru + needs_bounce = (dma_addr | (dma_addr + size - 1)) & ~mask; + } + +- if (device_info && (needs_bounce || dma_needs_bounce(dev, dma_addr, size))) { ++#ifdef CONFIG_DMABOUNCE ++int dma_needs_bounce_2(struct device *dev, dma_addr_t dma_addr, size_t size) ++{ ++ return (dev->bus == &pci_bus_type ) && ((dma_addr + size) > SZ_64M); ++} ++ ++ if (device_info && (needs_bounce || dma_needs_bounce_2(dev, dma_addr, size))) { + struct safe_buffer *buf; ++#endif + + buf = alloc_safe_buffer(device_info, ptr, size, dir); + if (buf == 0) { |