diff options
Diffstat (limited to 'arch/mips/sibyte/cfe')
-rw-r--r-- | arch/mips/sibyte/cfe/Makefile | 1 | ||||
-rw-r--r-- | arch/mips/sibyte/cfe/setup.c | 11 | ||||
-rw-r--r-- | arch/mips/sibyte/cfe/smp.c | 110 |
3 files changed, 11 insertions, 111 deletions
diff --git a/arch/mips/sibyte/cfe/Makefile b/arch/mips/sibyte/cfe/Makefile index a1214937b705..02b32e142adf 100644 --- a/arch/mips/sibyte/cfe/Makefile +++ b/arch/mips/sibyte/cfe/Makefile | |||
@@ -1,3 +1,2 @@ | |||
1 | lib-y = setup.o | 1 | lib-y = setup.o |
2 | lib-$(CONFIG_SMP) += smp.o | ||
3 | lib-$(CONFIG_SIBYTE_CFE_CONSOLE) += console.o | 2 | lib-$(CONFIG_SIBYTE_CFE_CONSOLE) += console.o |
diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c index dbd6e6fdd3f9..50d7c05e15b8 100644 --- a/arch/mips/sibyte/cfe/setup.c +++ b/arch/mips/sibyte/cfe/setup.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <asm/bootinfo.h> | 28 | #include <asm/bootinfo.h> |
29 | #include <asm/reboot.h> | 29 | #include <asm/reboot.h> |
30 | #include <asm/sibyte/board.h> | 30 | #include <asm/sibyte/board.h> |
31 | #include <asm/smp-ops.h> | ||
31 | 32 | ||
32 | #include <asm/fw/cfe/cfe_api.h> | 33 | #include <asm/fw/cfe/cfe_api.h> |
33 | #include <asm/fw/cfe/cfe_error.h> | 34 | #include <asm/fw/cfe/cfe_error.h> |
@@ -232,6 +233,9 @@ static int __init initrd_setup(char *str) | |||
232 | 233 | ||
233 | #endif | 234 | #endif |
234 | 235 | ||
236 | extern struct plat_smp_ops sb_smp_ops; | ||
237 | extern struct plat_smp_ops bcm1480_smp_ops; | ||
238 | |||
235 | /* | 239 | /* |
236 | * prom_init is called just after the cpu type is determined, from setup_arch() | 240 | * prom_init is called just after the cpu type is determined, from setup_arch() |
237 | */ | 241 | */ |
@@ -340,6 +344,13 @@ void __init prom_init(void) | |||
340 | arcs_cmdline[CL_SIZE-1] = 0; | 344 | arcs_cmdline[CL_SIZE-1] = 0; |
341 | 345 | ||
342 | prom_meminit(); | 346 | prom_meminit(); |
347 | |||
348 | #if defined(CONFIG_SIBYTE_BCM112X) || defined(CONFIG_SIBYTE_SB1250) | ||
349 | register_smp_ops(&sb_smp_ops); | ||
350 | #endif | ||
351 | #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80) | ||
352 | register_smp_ops(&bcm1480_smp_ops); | ||
353 | #endif | ||
343 | } | 354 | } |
344 | 355 | ||
345 | void __init prom_free_prom_memory(void) | 356 | void __init prom_free_prom_memory(void) |
diff --git a/arch/mips/sibyte/cfe/smp.c b/arch/mips/sibyte/cfe/smp.c deleted file mode 100644 index 534a62912f21..000000000000 --- a/arch/mips/sibyte/cfe/smp.c +++ /dev/null | |||
@@ -1,110 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2000, 2001, 2002, 2003 Broadcom Corporation | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or | ||
5 | * modify it under the terms of the GNU General Public License | ||
6 | * as published by the Free Software Foundation; either version 2 | ||
7 | * of the License, or (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program; if not, write to the Free Software | ||
16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
17 | */ | ||
18 | |||
19 | #include <linux/init.h> | ||
20 | #include <linux/sched.h> | ||
21 | #include <linux/smp.h> | ||
22 | #include <asm/processor.h> | ||
23 | |||
24 | #include <asm/fw/cfe/cfe_api.h> | ||
25 | #include <asm/fw/cfe/cfe_error.h> | ||
26 | |||
27 | /* | ||
28 | * Use CFE to find out how many CPUs are available, setting up | ||
29 | * phys_cpu_present_map and the logical/physical mappings. | ||
30 | * XXXKW will the boot CPU ever not be physical 0? | ||
31 | * | ||
32 | * Common setup before any secondaries are started | ||
33 | */ | ||
34 | void __init plat_smp_setup(void) | ||
35 | { | ||
36 | int i, num; | ||
37 | |||
38 | cpus_clear(phys_cpu_present_map); | ||
39 | cpu_set(0, phys_cpu_present_map); | ||
40 | __cpu_number_map[0] = 0; | ||
41 | __cpu_logical_map[0] = 0; | ||
42 | |||
43 | for (i = 1, num = 0; i < NR_CPUS; i++) { | ||
44 | if (cfe_cpu_stop(i) == 0) { | ||
45 | cpu_set(i, phys_cpu_present_map); | ||
46 | __cpu_number_map[i] = ++num; | ||
47 | __cpu_logical_map[num] = i; | ||
48 | } | ||
49 | } | ||
50 | printk(KERN_INFO "Detected %i available secondary CPU(s)\n", num); | ||
51 | } | ||
52 | |||
53 | void __init plat_prepare_cpus(unsigned int max_cpus) | ||
54 | { | ||
55 | } | ||
56 | |||
57 | /* | ||
58 | * Setup the PC, SP, and GP of a secondary processor and start it | ||
59 | * running! | ||
60 | */ | ||
61 | void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle) | ||
62 | { | ||
63 | int retval; | ||
64 | |||
65 | retval = cfe_cpu_start(cpu_logical_map(cpu), &smp_bootstrap, | ||
66 | __KSTK_TOS(idle), | ||
67 | (unsigned long)task_thread_info(idle), 0); | ||
68 | if (retval != 0) | ||
69 | printk("cfe_start_cpu(%i) returned %i\n" , cpu, retval); | ||
70 | } | ||
71 | |||
72 | /* | ||
73 | * Code to run on secondary just after probing the CPU | ||
74 | */ | ||
75 | void __cpuinit prom_init_secondary(void) | ||
76 | { | ||
77 | #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80) | ||
78 | extern void bcm1480_smp_init(void); | ||
79 | bcm1480_smp_init(); | ||
80 | #elif defined(CONFIG_SIBYTE_SB1250) | ||
81 | extern void sb1250_smp_init(void); | ||
82 | sb1250_smp_init(); | ||
83 | #else | ||
84 | #error invalid SMP configuration | ||
85 | #endif | ||
86 | } | ||
87 | |||
88 | /* | ||
89 | * Do any tidying up before marking online and running the idle | ||
90 | * loop | ||
91 | */ | ||
92 | void __cpuinit prom_smp_finish(void) | ||
93 | { | ||
94 | #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80) | ||
95 | extern void bcm1480_smp_finish(void); | ||
96 | bcm1480_smp_finish(); | ||
97 | #elif defined(CONFIG_SIBYTE_SB1250) | ||
98 | extern void sb1250_smp_finish(void); | ||
99 | sb1250_smp_finish(); | ||
100 | #else | ||
101 | #error invalid SMP configuration | ||
102 | #endif | ||
103 | } | ||
104 | |||
105 | /* | ||
106 | * Final cleanup after all secondaries booted | ||
107 | */ | ||
108 | void prom_cpus_done(void) | ||
109 | { | ||
110 | } | ||