caskd/openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux/ixp4xx: sync 2.6.36 patches to 2.6.36-rc6

Browse Source 
SVN-Revision: 23150
This commit is contained in:
Alexandros C. Couloumbis 2010-09-29 13:50:16 +00:00
parent 92e5e35c77
commit 76e0ff33de
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
target/linux/ixp4xx/patches-2.6.36/050-disable_dmabounce.patch
View File

@ -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) {