--- /dev/null
+--- a/arch/arm/mm/dma-mapping.c
++++ b/arch/arm/mm/dma-mapping.c
+@@ -384,7 +384,8 @@ EXPORT_SYMBOL(dma_mmap_writecombine);
+ */
+ void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t handle)
+ {
+- WARN_ON(irqs_disabled());
++ if (irqs_disabled()) /* don't want stack dumps for these! */
++ printk("WARNING: at %s:%d %s()\n", __FILE__, __LINE__, __FUNCTION__);
+
+ if (dma_release_from_coherent(dev, get_order(size), cpu_addr))
+ return;
--- /dev/null
+--- a/arch/arm/kernel/setup.c
++++ b/arch/arm/kernel/setup.c
+@@ -322,12 +322,13 @@ static void __init setup_processor(void)
+ void cpu_init(void)
+ {
+ unsigned int cpu = smp_processor_id();
+- struct stack *stk = &stacks[cpu];
++ struct stack *stk;
+
+ if (cpu >= NR_CPUS) {
+ printk(KERN_CRIT "CPU%u: bad primary CPU number\n", cpu);
+ BUG();
+ }
++ stk = &stacks[cpu];
+
+ /*
+ * Define the placement constraint for the inline asm directive below.
+@@ -386,13 +387,14 @@ static struct machine_desc * __init setu
+
+ static int __init arm_add_memory(unsigned long start, unsigned long size)
+ {
+- struct membank *bank = &meminfo.bank[meminfo.nr_banks];
++ struct membank *bank;
+
+ if (meminfo.nr_banks >= NR_BANKS) {
+ printk(KERN_CRIT "NR_BANKS too low, "
+ "ignoring memory at %#lx\n", start);
+ return -EINVAL;
+ }
++ bank = &meminfo.bank[meminfo.nr_banks];
+
+ /*
+ * Ensure that start/size are aligned to a page boundary.
--- /dev/null
+--- a/arch/arm/mach-ixp4xx/common.c
++++ b/arch/arm/mach-ixp4xx/common.c
+@@ -427,6 +427,17 @@ static void __init ixp4xx_clocksource_in
+ }
+
+ /*
++ * sched_clock()
++ */
++unsigned long long sched_clock(void)
++{
++ cycle_t cyc = ixp4xx_get_cycles(NULL);
++ struct clocksource *cs = &clocksource_ixp4xx;
++
++ return clocksource_cyc2ns(cyc, cs->mult, cs->shift);
++}
++
++/*
+ * clockevents
+ */
+ static int ixp4xx_set_next_event(unsigned long evt,
--- /dev/null
+--- a/arch/arm/mm/fault-armv.c
++++ b/arch/arm/mm/fault-armv.c
+@@ -127,8 +127,6 @@ make_coherent(struct address_space *mapp
+ flush_dcache_mmap_unlock(mapping);
+ if (aliases)
+ adjust_pte(vma, addr);
+- else
+- flush_cache_page(vma, addr, pfn);
+ }
+
+ /*
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -417,7 +417,6 @@ config ARCH_IXP4XX
+@@ -435,7 +435,6 @@ config ARCH_IXP4XX
+ select CPU_XSCALE
select GENERIC_GPIO
- select GENERIC_TIME
select GENERIC_CLOCKEVENTS
- select DMABOUNCE if PCI
help
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -199,6 +199,45 @@ config IXP4XX_INDIRECT_PCI
+@@ -199,6 +199,43 @@ config IXP4XX_INDIRECT_PCI
need to use the indirect method instead. If you don't know
what you need, leave this option unselected.
+config IXP4XX_LEGACY_DMABOUNCE
-+ bool "legacy PCI DMA bounce support"
++ bool "Legacy PCI DMA bounce support"
+ depends on PCI
+ default n
+ select DMABOUNCE
+ help
+ The IXP4xx is limited to a 64MB window for PCI DMA, which
-+ requires that PCI accesses above 64MB are bounced via buffers
-+ below 64MB. Furthermore the IXP4xx has an erratum where PCI
-+ read prefetches just below the 64MB limit can trigger lockups.
++ requires that PCI accesses >= 64MB are bounced via buffers
++ below 64MB.
+
-+ The kernel has traditionally handled these two issue by using
-+ ARM specific DMA bounce support code for all accesses >= 64MB.
++ The kernel has traditionally handled this issue by using ARM
++ specific DMA bounce support code for all accesses >= 64MB.
+ That code causes problems of its own, so it is desirable to
-+ disable it. As the kernel now has a workaround for the PCI read
-+ prefetch erratum, it no longer requires the ARM bounce code.
++ disable it.
+
+ Enabling this option makes IXP4xx continue to use the problematic
+ ARM DMA bounce code. Disabling this option makes IXP4xx use the
help
--- a/arch/arm/mach-ixp4xx/common-pci.c
+++ b/arch/arm/mach-ixp4xx/common-pci.c
-@@ -321,27 +321,38 @@ static int abort_handler(unsigned long a
+@@ -321,27 +321,33 @@ static int abort_handler(unsigned long a
*/
static int ixp4xx_pci_platform_notify(struct device *dev)
{
+#ifdef CONFIG_DMABOUNCE
int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)
{
-+ /* Note that this returns true for the last page below 64M due to
-+ * IXP4xx erratum 15 (SCR 1289), which states that PCI prefetches
-+ * can cross the boundary between valid memory and a reserved region
-+ * causing AHB bus errors and a lock-up.
-+ */
- return (dev->bus == &pci_bus_type ) && ((dma_addr + size) >= SZ_64M);
+- return (dev->bus == &pci_bus_type ) && ((dma_addr + size) >= SZ_64M);
++ return (dev->bus == &pci_bus_type ) && ((dma_addr + size) > SZ_64M);
}
+#endif
/*
* Only first 64MB of memory can be accessed via PCI.
* We use GFP_DMA to allocate safe buffers to do map/unmap.
-@@ -364,6 +375,7 @@ void __init ixp4xx_adjust_zones(int node
+@@ -364,6 +370,7 @@ void __init ixp4xx_adjust_zones(int node
zhole_size[1] = zhole_size[0];
zhole_size[0] = 0;
}
--- /dev/null
+--- a/arch/arm/mm/dma-mapping.c
++++ b/arch/arm/mm/dma-mapping.c
+@@ -381,7 +381,8 @@ EXPORT_SYMBOL(dma_mmap_writecombine);
+ */
+ void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t handle)
+ {
+- WARN_ON(irqs_disabled());
++ if (irqs_disabled()) /* don't want stack dumps for these! */
++ printk("WARNING: at %s:%d %s()\n", __FILE__, __LINE__, __FUNCTION__);
+
+ if (dma_release_from_coherent(dev, get_order(size), cpu_addr))
+ return;
--- /dev/null
+--- a/arch/arm/kernel/setup.c
++++ b/arch/arm/kernel/setup.c
+@@ -323,12 +323,13 @@ static void __init setup_processor(void)
+ void cpu_init(void)
+ {
+ unsigned int cpu = smp_processor_id();
+- struct stack *stk = &stacks[cpu];
++ struct stack *stk;
+
+ if (cpu >= NR_CPUS) {
+ printk(KERN_CRIT "CPU%u: bad primary CPU number\n", cpu);
+ BUG();
+ }
++ stk = &stacks[cpu];
+
+ /*
+ * Define the placement constraint for the inline asm directive below.
+@@ -387,13 +388,14 @@ static struct machine_desc * __init setu
+
+ static int __init arm_add_memory(unsigned long start, unsigned long size)
+ {
+- struct membank *bank = &meminfo.bank[meminfo.nr_banks];
++ struct membank *bank;
+
+ if (meminfo.nr_banks >= NR_BANKS) {
+ printk(KERN_CRIT "NR_BANKS too low, "
+ "ignoring memory at %#lx\n", start);
+ return -EINVAL;
+ }
++ bank = &meminfo.bank[meminfo.nr_banks];
+
+ /*
+ * Ensure that start/size are aligned to a page boundary.
projects / openwrt / openwrt.git / commitdiff