3 @@ -375,6 +375,7 @@ config ARCH_CNS3XXX
4 select PCI_DOMAINS if PCI
9 Support for Cavium Networks CNS3XXX platform.
11 --- a/arch/arm/kernel/fiq.c
12 +++ b/arch/arm/kernel/fiq.c
15 static unsigned long no_fiq_insn;
17 +unsigned int fiq_number[2] = {0, 0};
19 /* Default reacquire function
20 * - we always relinquish FIQ control
21 * - we always reacquire FIQ control
22 @@ -70,9 +72,12 @@ static struct fiq_handler *current_fiq =
24 int show_fiq_list(struct seq_file *p, int prec)
26 - if (current_fiq != &default_owner)
27 - seq_printf(p, "%*s: %s\n", prec, "FIQ",
29 + if (current_fiq != &default_owner) {
30 + seq_printf(p, "%*s: ", prec, "FIQ");
31 + seq_printf(p, "%10u ", fiq_number[0]);
32 + seq_printf(p, "%10u ", fiq_number[1]);
33 + seq_printf(p, " %s\n", current_fiq->name);
38 --- a/arch/arm/kernel/smp.c
39 +++ b/arch/arm/kernel/smp.c
40 @@ -400,13 +400,13 @@ void show_ipi_list(struct seq_file *p, i
43 for (i = 0; i < NR_IPI; i++) {
44 - seq_printf(p, "%*s%u: ", prec - 1, "IPI", i);
45 + seq_printf(p, "%*s%u:", prec - 1, "IPI", i);
47 for_each_present_cpu(cpu)
48 seq_printf(p, "%10u ",
49 __get_irq_stat(cpu, ipi_irqs[i]));
51 - seq_printf(p, " %s\n", ipi_types[i]);
52 + seq_printf(p, " %s\n", ipi_types[i]);
56 --- a/arch/arm/mach-cns3xxx/Makefile
57 +++ b/arch/arm/mach-cns3xxx/Makefile
58 @@ -2,6 +2,6 @@ obj-$(CONFIG_ARCH_CNS3XXX) += core.o pm
59 obj-$(CONFIG_PCI) += pcie.o
60 obj-$(CONFIG_MACH_CNS3420VB) += cns3420vb.o
61 obj-$(CONFIG_MACH_GW2388) += laguna.o
62 -obj-$(CONFIG_SMP) += platsmp.o headsmp.o
63 +obj-$(CONFIG_SMP) += platsmp.o headsmp.o cns3xxx_fiq.o
64 obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
65 obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
67 +++ b/arch/arm/mach-cns3xxx/cns3xxx_fiq.S
70 + * linux/arch/arm/lib/floppydma.S
72 + * Copyright (C) 1995, 1996 Russell King
74 + * This program is free software; you can redistribute it and/or modify
75 + * it under the terms of the GNU General Public License version 2 as
76 + * published by the Free Software Foundation.
78 +#include <linux/linkage.h>
79 +#include <asm/assembler.h>
80 +#include <asm/asm-offsets.h>
82 +#define D_CACHE_LINE_SIZE 32
87 + * R8 - DMA Start Address
89 + * R10 - DMA Direction
91 + * R12 - fiq_buffer Address
92 + * R13 - DMA type Address
95 + .global cns3xxx_fiq_end
96 +ENTRY(cns3xxx_fiq_start)
105 + ldmib r12, {r8, r9, r10}
106 + and r11, r10, #0x3000000
107 + and r10, r10, #0xff
109 + teq r11, #0x1000000
110 + beq cns3xxx_dma_map_area
111 + teq r11, #0x2000000
112 + beq cns3xxx_dma_unmap_area
113 + b cns3xxx_dma_flush_range
118 + mcr p15, 0, r8, c7, c10, 4 @ drain write buffer
121 +cns3xxx_dma_map_area:
123 + teq r10, #DMA_FROM_DEVICE
124 + beq cns3xxx_dma_inv_range
125 + b cns3xxx_dma_clean_range
127 +cns3xxx_dma_unmap_area:
129 + teq r10, #DMA_TO_DEVICE
130 + bne cns3xxx_dma_inv_range
133 +cns3xxx_dma_flush_range:
134 + bic r8, r8, #D_CACHE_LINE_SIZE - 1
136 + mcr p15, 0, r8, c7, c14, 1 @ clean & invalidate D line
137 + add r8, r8, #D_CACHE_LINE_SIZE
142 +cns3xxx_dma_clean_range:
143 + bic r8, r8, #D_CACHE_LINE_SIZE - 1
145 + mcr p15, 0, r8, c7, c10, 1 @ clean D line
146 + add r8, r8, #D_CACHE_LINE_SIZE
151 +cns3xxx_dma_inv_range:
152 + tst r8, #D_CACHE_LINE_SIZE - 1
153 + bic r8, r8, #D_CACHE_LINE_SIZE - 1
154 + mcrne p15, 0, r8, c7, c10, 1 @ clean D line
155 + tst r9, #D_CACHE_LINE_SIZE - 1
156 + bic r9, r9, #D_CACHE_LINE_SIZE - 1
157 + mcrne p15, 0, r9, c7, c14, 1 @ clean & invalidate D line
159 + mcr p15, 0, r8, c7, c6, 1 @ invalidate D line
160 + add r8, r8, #D_CACHE_LINE_SIZE
166 --- a/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
167 +++ b/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
169 #define MISC_PCIE_INT_MASK(x) MISC_MEM_MAP(0x978 + (x) * 0x100)
170 #define MISC_PCIE_INT_STATUS(x) MISC_MEM_MAP(0x97C + (x) * 0x100)
172 +#define MISC_FIQ_CPU(x) MISC_MEM_MAP(0xA58 - (x) * 0x4)
174 * Power management and clock control
176 --- a/arch/arm/mach-cns3xxx/include/mach/irqs.h
177 +++ b/arch/arm/mach-cns3xxx/include/mach/irqs.h
179 #define IRQ_LOCALTIMER 29
180 #define IRQ_LOCALWDOG 30
181 #define IRQ_TC11MP_GIC_START 32
184 #include <mach/cns3xxx.h>
187 +++ b/arch/arm/mach-cns3xxx/include/mach/smp.h
189 +#ifndef __MACH_SMP_H
190 +#define __MACH_SMP_H
192 +extern void smp_dma_map_area(const void *, size_t, int);
193 +extern void smp_dma_unmap_area(const void *, size_t, int);
194 +extern void smp_dma_flush_range(const void *, const void *);
197 --- a/arch/arm/mach-cns3xxx/platsmp.c
198 +++ b/arch/arm/mach-cns3xxx/platsmp.c
200 #include <asm/hardware/gic.h>
201 #include <asm/smp_scu.h>
202 #include <asm/unified.h>
204 +#include <asm/fiq.h>
205 +#include <mach/smp.h>
206 #include <mach/cns3xxx.h>
208 +static struct fiq_handler fh = {
209 + .name = "cns3xxx-fiq"
212 +static unsigned int fiq_buffer[8];
214 +#define FIQ_ENABLED 0x80000000
215 +#define FIQ_GENERATE 0x00010000
216 +#define CNS3XXX_MAP_AREA 0x01000000
217 +#define CNS3XXX_UNMAP_AREA 0x02000000
218 +#define CNS3XXX_FLUSH_RANGE 0x03000000
220 extern void cns3xxx_secondary_startup(void);
221 +extern unsigned char cns3xxx_fiq_start, cns3xxx_fiq_end;
222 +extern unsigned int fiq_number[2];
223 +extern struct cpu_cache_fns cpu_cache;
224 +struct cpu_cache_fns cpu_cache_save;
226 #define SCU_CPU_STATUS 0x08
227 static void __iomem *scu_base;
228 @@ -38,12 +55,50 @@ static void __iomem *scu_base;
230 volatile int __cpuinitdata pen_release = -1;
232 +static void __init cns3xxx_set_fiq_regs(void)
234 + struct pt_regs FIQ_regs;
235 + unsigned int cpu = smp_processor_id();
238 + FIQ_regs.ARM_ip = (unsigned int)&fiq_buffer[4];
239 + FIQ_regs.ARM_sp = (unsigned int)MISC_FIQ_CPU(0);
241 + FIQ_regs.ARM_ip = (unsigned int)&fiq_buffer[0];
242 + FIQ_regs.ARM_sp = (unsigned int)MISC_FIQ_CPU(1);
244 + set_fiq_regs(&FIQ_regs);
247 +static void __init cns3xxx_init_fiq(void)
249 + void *fiqhandler_start;
250 + unsigned int fiqhandler_length;
253 + fiqhandler_start = &cns3xxx_fiq_start;
254 + fiqhandler_length = &cns3xxx_fiq_end - &cns3xxx_fiq_start;
256 + ret = claim_fiq(&fh);
262 + set_fiq_handler(fiqhandler_start, fiqhandler_length);
263 + fiq_buffer[0] = (unsigned int)&fiq_number[0];
265 + fiq_buffer[4] = (unsigned int)&fiq_number[1];
271 * Write pen_release in a way that is guaranteed to be visible to all
272 * observers, irrespective of whether they're taking part in coherency
273 * or not. This is necessary for the hotplug code to work reliably.
275 -static void write_pen_release(int val)
276 +static void __cpuinit write_pen_release(int val)
280 @@ -63,12 +118,25 @@ void __cpuinit platform_secondary_init(u
281 gic_secondary_init(0);
284 + * Setup Secondary Core FIQ regs
286 + cns3xxx_set_fiq_regs();
289 * let the primary processor know we're out of the
290 * pen, then head off into the C entry point
292 write_pen_release(-1);
295 + * Fixup DMA Operations
298 + cpu_cache.dma_map_area = (void *)smp_dma_map_area;
299 + cpu_cache.dma_unmap_area = (void *)smp_dma_unmap_area;
300 + cpu_cache.dma_flush_range = (void *)smp_dma_flush_range;
303 * Synchronise with the boot thread.
305 spin_lock(&boot_lock);
306 @@ -171,4 +239,112 @@ void __init platform_smp_prepare_cpus(un
308 __raw_writel(virt_to_phys(cns3xxx_secondary_startup),
309 (void __iomem *)(CNS3XXX_MISC_BASE_VIRT + 0x0600));
312 + * Setup FIQ's for main cpu
314 + cns3xxx_init_fiq();
315 + cns3xxx_set_fiq_regs();
316 + memcpy((void *)&cpu_cache_save, (void *)&cpu_cache, sizeof(struct cpu_cache_fns));
320 +static inline unsigned long cns3xxx_cpu_id(void)
325 + " mrc p15, 0, %0, c0, c0, 5 @ cns3xxx_cpu_id\n"
326 + : "=r" (cpu) : : "memory", "cc");
327 + return (cpu & 0xf);
330 +void smp_dma_map_area(const void *addr, size_t size, int dir)
333 + unsigned long flags;
334 + raw_local_irq_save(flags);
335 + cpu = cns3xxx_cpu_id();
337 + fiq_buffer[1] = (unsigned int)addr;
338 + fiq_buffer[2] = size;
339 + fiq_buffer[3] = dir | CNS3XXX_MAP_AREA | FIQ_ENABLED;
341 + __raw_writel(FIQ_GENERATE, MISC_FIQ_CPU(1));
343 + cpu_cache_save.dma_map_area(addr, size, dir);
344 + while ((fiq_buffer[3]) & FIQ_ENABLED) { barrier(); }
347 + fiq_buffer[5] = (unsigned int)addr;
348 + fiq_buffer[6] = size;
349 + fiq_buffer[7] = dir | CNS3XXX_MAP_AREA | FIQ_ENABLED;
351 + __raw_writel(FIQ_GENERATE, MISC_FIQ_CPU(0));
353 + cpu_cache_save.dma_map_area(addr, size, dir);
354 + while ((fiq_buffer[7]) & FIQ_ENABLED) { barrier(); }
356 + raw_local_irq_restore(flags);
359 +void smp_dma_unmap_area(const void *addr, size_t size, int dir)
362 + unsigned long flags;
364 + raw_local_irq_save(flags);
365 + cpu = cns3xxx_cpu_id();
368 + fiq_buffer[1] = (unsigned int)addr;
369 + fiq_buffer[2] = size;
370 + fiq_buffer[3] = dir | CNS3XXX_UNMAP_AREA | FIQ_ENABLED;
372 + __raw_writel(FIQ_GENERATE, MISC_FIQ_CPU(1));
374 + cpu_cache_save.dma_unmap_area(addr, size, dir);
375 + while ((fiq_buffer[3]) & FIQ_ENABLED) { barrier(); }
378 + fiq_buffer[5] = (unsigned int)addr;
379 + fiq_buffer[6] = size;
380 + fiq_buffer[7] = dir | CNS3XXX_UNMAP_AREA | FIQ_ENABLED;
382 + __raw_writel(FIQ_GENERATE, MISC_FIQ_CPU(0));
384 + cpu_cache_save.dma_unmap_area(addr, size, dir);
385 + while ((fiq_buffer[7]) & FIQ_ENABLED) { barrier(); }
387 + raw_local_irq_restore(flags);
390 +void smp_dma_flush_range(const void *start, const void *end)
393 + unsigned long flags;
394 + raw_local_irq_save(flags);
395 + cpu = cns3xxx_cpu_id();
398 + fiq_buffer[1] = (unsigned int)start;
399 + fiq_buffer[2] = (unsigned int)end;
400 + fiq_buffer[3] = CNS3XXX_FLUSH_RANGE | FIQ_ENABLED;
402 + __raw_writel(FIQ_GENERATE, MISC_FIQ_CPU(1));
404 + cpu_cache_save.dma_flush_range(start, end);
405 + while ((fiq_buffer[3]) & FIQ_ENABLED) { barrier(); }
408 + fiq_buffer[5] = (unsigned int)start;
409 + fiq_buffer[6] = (unsigned int)end;
410 + fiq_buffer[7] = CNS3XXX_FLUSH_RANGE | FIQ_ENABLED;
412 + __raw_writel(FIQ_GENERATE, MISC_FIQ_CPU(0));
414 + cpu_cache_save.dma_flush_range(start, end);
415 + while ((fiq_buffer[7]) & FIQ_ENABLED) { barrier(); }
417 + raw_local_irq_restore(flags);
419 --- a/arch/arm/mm/Kconfig
420 +++ b/arch/arm/mm/Kconfig
421 @@ -793,7 +793,7 @@ config NEEDS_SYSCALL_FOR_CMPXCHG
423 config DMA_CACHE_RWFO
424 bool "Enable read/write for ownership DMA cache maintenance"
425 - depends on CPU_V6K && SMP
426 + depends on CPU_V6K && SMP && !ARCH_CNS3XXX
429 The Snoop Control Unit on ARM11MPCore does not detect the