Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[linux-2.6-omap-h63xx.git] / arch / mips / sibyte / bcm1480 / smp.c

diff --git a/arch/mips/sibyte/bcm1480/smp.c b/arch/mips/sibyte/bcm1480/smp.c
index 6eac36d1b8c893fcb1c56d16d1ba0808ce19e90d..bd9eeb43ed0e1bd86a365322374ae9b9cfdfe25c 100644 (file)
--- a/arch/mips/sibyte/bcm1480/smp.c
+++ b/arch/mips/sibyte/bcm1480/smp.c
@@ -23,6 +23,7 @@
 
 #include <asm/mmu_context.h>
 #include <asm/io.h>
+#include <asm/fw/cfe/cfe_api.h>
 #include <asm/sibyte/sb1250.h>
 #include <asm/sibyte/bcm1480_regs.h>
 #include <asm/sibyte/bcm1480_int.h>
@@ -58,7 +59,7 @@ static void *mailbox_0_regs[] = {
 /*
  * SMP init and finish on secondary CPUs
  */
-void bcm1480_smp_init(void)
+void __cpuinit bcm1480_smp_init(void)
 {
        unsigned int imask = STATUSF_IP4 | STATUSF_IP3 | STATUSF_IP2 |
                STATUSF_IP1 | STATUSF_IP0;
@@ -67,13 +68,6 @@ void bcm1480_smp_init(void)
        change_c0_status(ST0_IM, imask);
 }
 
-void bcm1480_smp_finish(void)
-{
-       extern void bcm1480_time_init(void);
-       bcm1480_time_init();
-       local_irq_enable();
-}
-
 /*
  * These are routines for dealing with the sb1250 smp capabilities
  * independent of board/firmware
@@ -83,11 +77,104 @@ void bcm1480_smp_finish(void)
  * Simple enough; everything is set up, so just poke the appropriate mailbox
  * register, and we should be set
  */
-void core_send_ipi(int cpu, unsigned int action)
+static void bcm1480_send_ipi_single(int cpu, unsigned int action)
 {
        __raw_writeq((((u64)action)<< 48), mailbox_0_set_regs[cpu]);
 }
 
+static void bcm1480_send_ipi_mask(cpumask_t mask, unsigned int action)
+{
+       unsigned int i;
+
+       for_each_cpu_mask(i, mask)
+               bcm1480_send_ipi_single(i, action);
+}
+
+/*
+ * Code to run on secondary just after probing the CPU
+ */
+static void __cpuinit bcm1480_init_secondary(void)
+{
+       extern void bcm1480_smp_init(void);
+
+       bcm1480_smp_init();
+}
+
+/*
+ * Do any tidying up before marking online and running the idle
+ * loop
+ */
+static void __cpuinit bcm1480_smp_finish(void)
+{
+       extern void sb1480_clockevent_init(void);
+
+       sb1480_clockevent_init();
+       local_irq_enable();
+}
+
+/*
+ * Final cleanup after all secondaries booted
+ */
+static void bcm1480_cpus_done(void)
+{
+}
+
+/*
+ * Setup the PC, SP, and GP of a secondary processor and start it
+ * running!
+ */
+static void __cpuinit bcm1480_boot_secondary(int cpu, struct task_struct *idle)
+{
+       int retval;
+
+       retval = cfe_cpu_start(cpu_logical_map(cpu), &smp_bootstrap,
+                              __KSTK_TOS(idle),
+                              (unsigned long)task_thread_info(idle), 0);
+       if (retval != 0)
+               printk("cfe_start_cpu(%i) returned %i\n" , cpu, retval);
+}
+
+/*
+ * Use CFE to find out how many CPUs are available, setting up
+ * phys_cpu_present_map and the logical/physical mappings.
+ * XXXKW will the boot CPU ever not be physical 0?
+ *
+ * Common setup before any secondaries are started
+ */
+static void __init bcm1480_smp_setup(void)
+{
+       int i, num;
+
+       cpus_clear(phys_cpu_present_map);
+       cpu_set(0, phys_cpu_present_map);
+       __cpu_number_map[0] = 0;
+       __cpu_logical_map[0] = 0;
+
+       for (i = 1, num = 0; i < NR_CPUS; i++) {
+               if (cfe_cpu_stop(i) == 0) {
+                       cpu_set(i, phys_cpu_present_map);
+                       __cpu_number_map[i] = ++num;
+                       __cpu_logical_map[num] = i;
+               }
+       }
+       printk(KERN_INFO "Detected %i available secondary CPU(s)\n", num);
+}
+
+static void __init bcm1480_prepare_cpus(unsigned int max_cpus)
+{
+}
+
+struct plat_smp_ops bcm1480_smp_ops = {
+       .send_ipi_single        = bcm1480_send_ipi_single,
+       .send_ipi_mask          = bcm1480_send_ipi_mask,
+       .init_secondary         = bcm1480_init_secondary,
+       .smp_finish             = bcm1480_smp_finish,
+       .cpus_done              = bcm1480_cpus_done,
+       .boot_secondary         = bcm1480_boot_secondary,
+       .smp_setup              = bcm1480_smp_setup,
+       .prepare_cpus           = bcm1480_prepare_cpus,
+};
+
 void bcm1480_mailbox_interrupt(void)
 {
        int cpu = smp_processor_id();