summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorSimon Kågström <simon.kagstrom@netinsight.net>2014-03-17 14:42:35 +0100
committerArnd Bergmann <arnd@arndb.de>2014-03-18 16:03:43 +0100
commitbfdad565ae0a61ac943974b8ae61ec0ed55ceb04 (patch)
tree8a38af677ffa2f7e9225a543cfbbc8f0b52f28a3 /arch/arm
parent64cf9d07ef1f5ed6abc6ed8a2420eb2849f7f444 (diff)
downloadlinux-stable-bfdad565ae0a61ac943974b8ae61ec0ed55ceb04.tar.gz
linux-stable-bfdad565ae0a61ac943974b8ae61ec0ed55ceb04.tar.bz2
linux-stable-bfdad565ae0a61ac943974b8ae61ec0ed55ceb04.zip
ARM: ixp4xx: Make dma_set_coherent_mask common, correct implementation
Non-PCI devices can use the entire 32-bit range, PCI dittos are limited to the first 64MiB. Also actually setup coherent_dma_mask. The patch has been verified on a board with 128MiB memory, one ipx4xx_eth device and a e100 PCI device. Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-ixp4xx/common-pci.c9
-rw-r--r--arch/arm/mach-ixp4xx/common.c12
2 files changed, 12 insertions, 9 deletions
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c
index 200970d56f6d..055d81694a17 100644
--- a/arch/arm/mach-ixp4xx/common-pci.c
+++ b/arch/arm/mach-ixp4xx/common-pci.c
@@ -481,14 +481,5 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys)
return 1;
}
-int dma_set_coherent_mask(struct device *dev, u64 mask)
-{
- if (mask >= SZ_64M - 1)
- return 0;
-
- return -EIO;
-}
-
EXPORT_SYMBOL(ixp4xx_pci_read);
EXPORT_SYMBOL(ixp4xx_pci_write);
-EXPORT_SYMBOL(dma_set_coherent_mask);
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 6d68aed6548a..df82a2b4a546 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -31,6 +31,7 @@
#include <linux/gpio.h>
#include <linux/cpu.h>
#include <linux/sched_clock.h>
+#include <linux/pci.h>
#include <mach/udc.h>
#include <mach/hardware.h>
@@ -578,6 +579,17 @@ void ixp4xx_restart(enum reboot_mode mode, const char *cmd)
}
}
+int dma_set_coherent_mask(struct device *dev, u64 mask)
+{
+ if (dev_is_pci(dev) && mask >= SZ_64M)
+ return -EIO;
+
+ dev->coherent_dma_mask = mask;
+
+ return 0;
+}
+EXPORT_SYMBOL(dma_set_coherent_mask);
+
#ifdef CONFIG_IXP4XX_INDIRECT_PCI
/*
* In the case of using indirect PCI, we simply return the actual PCI