1 files changed, 149 insertions, 118 deletions

diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index 482f2ab92692..133387980b56 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -1,4 +1,4 @@
-/* sun4d_smp.c: Sparc SS1000/SC2000 SMP support.
+/* Sparc SS1000/SC2000 SMP support.
  *
  * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  *
@@ -6,59 +6,23 @@
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
  */
 
-#include <asm/head.h>
-
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/threads.h>
-#include <linux/smp.h>
 #include <linux/interrupt.h>
-#include <linux/kernel_stat.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/swap.h>
 #include <linux/profile.h>
 #include <linux/delay.h>
 #include <linux/cpu.h>
 
-#include <asm/ptrace.h>
-#include <asm/atomic.h>
-#include <asm/irq_regs.h>
-
-#include <asm/irq.h>
-#include <asm/page.h>
-#include <asm/pgalloc.h>
-#include <asm/pgtable.h>
-#include <asm/oplib.h>
 #include <asm/sbi.h>
+#include <asm/mmu.h>
 #include <asm/tlbflush.h>
 #include <asm/cacheflush.h>
-#include <asm/cpudata.h>
 
+#include "kernel.h"
 #include "irq.h"
-#define IRQ_CROSS_CALL          15
 
-extern ctxd_t *srmmu_ctx_table_phys;
+#define IRQ_CROSS_CALL          15
 
-static volatile int smp_processors_ready = 0;
+static volatile int smp_processors_ready;
 static int smp_highest_cpu;
-extern volatile unsigned long cpu_callin_map[NR_CPUS];
-extern cpuinfo_sparc cpu_data[NR_CPUS];
-extern unsigned char boot_cpu_id;
-extern volatile int smp_process_available;
-
-extern cpumask_t smp_commenced_mask;
-
-extern int __smp4d_processor_id(void);
-
-/* #define SMP_DEBUG */
-
-#ifdef SMP_DEBUG
-#define SMP_PRINTK(x)   printk x
-#else
-#define SMP_PRINTK(x)
-#endif
 
 static inline unsigned long sun4d_swap(volatile unsigned long *ptr, unsigned long val)
 {
@@ -68,9 +32,8 @@ static inline unsigned long sun4d_swap(volatile unsigned long *ptr, unsigned lon
         return val;
 }
 
+static void smp4d_ipi_init(void);
 static void smp_setup_percpu_timer(void);
-extern void cpu_probe(void);
-extern void sun4d_distribute_irqs(void);
 
 static unsigned char cpu_leds[32];
 
@@ -86,9 +49,8 @@ static inline void show_leds(int cpuid)
 void __cpuinit smp4d_callin(void)
 {
         int cpuid = hard_smp4d_processor_id();
-        extern spinlock_t sun4d_imsk_lock;
         unsigned long flags;
-        
+
         /* Show we are alive */
         cpu_leds[cpuid] = 0x6;
         show_leds(cpuid);
@@ -118,15 +80,13 @@ void __cpuinit smp4d_callin(void)
         sun4d_swap((unsigned long *)&cpu_callin_map[cpuid], 1);
         local_flush_cache_all();
         local_flush_tlb_all();
-        
-        cpu_probe();
 
-        while((unsigned long)current_set[cpuid] < PAGE_OFFSET)
+        while ((unsigned long)current_set[cpuid] < PAGE_OFFSET)
                 barrier();
-                
-        while(current_set[cpuid]->cpu != cpuid)
+
+        while (current_set[cpuid]->cpu != cpuid)
                 barrier();
-                
+
         /* Fix idle thread fields. */
         __asm__ __volatile__("ld [%0], %%g6\n\t"
                              : : "r" (&current_set[cpuid])
@@ -134,17 +94,17 @@ void __cpuinit smp4d_callin(void)
 
         cpu_leds[cpuid] = 0x9;
         show_leds(cpuid);
-        
+
         /* Attach to the address space of init_task. */
         atomic_inc(&init_mm.mm_count);
         current->active_mm = &init_mm;
 
         local_flush_cache_all();
         local_flush_tlb_all();
-        
+
         local_irq_enable();     /* We don't allow PIL 14 yet */
-        
-        while (!cpu_isset(cpuid, smp_commenced_mask))
+
+        while (!cpumask_test_cpu(cpuid, &smp_commenced_mask))
                 barrier();
 
         spin_lock_irqsave(&sun4d_imsk_lock, flags);
@@ -154,17 +114,12 @@ void __cpuinit smp4d_callin(void)
 
 }
 
-extern void init_IRQ(void);
-extern void cpu_panic(void);
-
 /*
  *      Cycle through the processors asking the PROM to start each one.
  */
- 
-extern struct linux_prom_registers smp_penguin_ctable;
-
 void __init smp4d_boot_cpus(void)
 {
+        smp4d_ipi_init();
         if (boot_cpu_id)
                 current_set[0] = NULL;
         smp_setup_percpu_timer();
@@ -173,43 +128,42 @@ void __init smp4d_boot_cpus(void)
 
 int __cpuinit smp4d_boot_one_cpu(int i)
 {
-                        extern unsigned long sun4d_cpu_startup;
-                        unsigned long *entry = &sun4d_cpu_startup;
-                        struct task_struct *p;
-                        int timeout;
-                        int cpu_node;
+        unsigned long *entry = &sun4d_cpu_startup;
+        struct task_struct *p;
+        int timeout;
+        int cpu_node;
 
-                        cpu_find_by_instance(i, &cpu_node,NULL);
-                        /* Cook up an idler for this guy. */
-                        p = fork_idle(i);
-                        current_set[i] = task_thread_info(p);
+        cpu_find_by_instance(i, &cpu_node, NULL);
+        /* Cook up an idler for this guy. */
+        p = fork_idle(i);
+        current_set[i] = task_thread_info(p);
+
+        /*
+         * Initialize the contexts table
+         * Since the call to prom_startcpu() trashes the structure,
+         * we need to re-initialize it for each cpu
+         */
+        smp_penguin_ctable.which_io = 0;
+        smp_penguin_ctable.phys_addr = (unsigned int) srmmu_ctx_table_phys;
+        smp_penguin_ctable.reg_size = 0;
+
+        /* whirrr, whirrr, whirrrrrrrrr... */
+        printk(KERN_INFO "Starting CPU %d at %p\n", i, entry);
+        local_flush_cache_all();
+        prom_startcpu(cpu_node,
+                      &smp_penguin_ctable, 0, (char *)entry);
+
+        printk(KERN_INFO "prom_startcpu returned :)\n");
+
+        /* wheee... it's going... */
+        for (timeout = 0; timeout < 10000; timeout++) {
+                if (cpu_callin_map[i])
+                        break;
+                udelay(200);
+        }
 
-                        /*
-                         * Initialize the contexts table
-                         * Since the call to prom_startcpu() trashes the structure,
-                         * we need to re-initialize it for each cpu
-                         */
-                        smp_penguin_ctable.which_io = 0;
-                        smp_penguin_ctable.phys_addr = (unsigned int) srmmu_ctx_table_phys;
-                        smp_penguin_ctable.reg_size = 0;
-
-                        /* whirrr, whirrr, whirrrrrrrrr... */
-                        SMP_PRINTK(("Starting CPU %d at %p\n", i, entry));
-                        local_flush_cache_all();
-                        prom_startcpu(cpu_node,
-                                      &smp_penguin_ctable, 0, (char *)entry);
-                                      
-                        SMP_PRINTK(("prom_startcpu returned :)\n"));
-
-                        /* wheee... it's going... */
-                        for(timeout = 0; timeout < 10000; timeout++) {
-                                if(cpu_callin_map[i])
-                                        break;
-                                udelay(200);
-                        }
-                        
         if (!(cpu_callin_map[i])) {
-                printk("Processor %d is stuck.\n", i);
+                printk(KERN_ERR "Processor %d is stuck.\n", i);
                 return -ENODEV;
 
         }
@@ -237,6 +191,80 @@ void __init smp4d_smp_done(void)
         sun4d_distribute_irqs();
 }
 
+/* Memory structure giving interrupt handler information about IPI generated */
+struct sun4d_ipi_work {
+        int single;
+        int msk;
+        int resched;
+};
+
+static DEFINE_PER_CPU_SHARED_ALIGNED(struct sun4d_ipi_work, sun4d_ipi_work);
+
+/* Initialize IPIs on the SUN4D SMP machine */
+static void __init smp4d_ipi_init(void)
+{
+        int cpu;
+        struct sun4d_ipi_work *work;
+
+        printk(KERN_INFO "smp4d: setup IPI at IRQ %d\n", SUN4D_IPI_IRQ);
+
+        for_each_possible_cpu(cpu) {
+                work = &per_cpu(sun4d_ipi_work, cpu);
+                work->single = work->msk = work->resched = 0;
+        }
+}
+
+void sun4d_ipi_interrupt(void)
+{
+        struct sun4d_ipi_work *work = &__get_cpu_var(sun4d_ipi_work);
+
+        if (work->single) {
+                work->single = 0;
+                smp_call_function_single_interrupt();
+        }
+        if (work->msk) {
+                work->msk = 0;
+                smp_call_function_interrupt();
+        }
+        if (work->resched) {
+                work->resched = 0;
+                smp_resched_interrupt();
+        }
+}
+
+static void smp4d_ipi_single(int cpu)
+{
+        struct sun4d_ipi_work *work = &per_cpu(sun4d_ipi_work, cpu);
+
+        /* Mark work */
+        work->single = 1;
+
+        /* Generate IRQ on the CPU */
+        sun4d_send_ipi(cpu, SUN4D_IPI_IRQ);
+}
+
+static void smp4d_ipi_mask_one(int cpu)
+{
+        struct sun4d_ipi_work *work = &per_cpu(sun4d_ipi_work, cpu);
+
+        /* Mark work */
+        work->msk = 1;
+
+        /* Generate IRQ on the CPU */
+        sun4d_send_ipi(cpu, SUN4D_IPI_IRQ);
+}
+
+static void smp4d_ipi_resched(int cpu)
+{
+        struct sun4d_ipi_work *work = &per_cpu(sun4d_ipi_work, cpu);
+
+        /* Mark work */
+        work->resched = 1;
+
+        /* Generate IRQ on the CPU (any IRQ will cause resched) */
+        sun4d_send_ipi(cpu, SUN4D_IPI_IRQ);
+}
+
 static struct smp_funcall {
         smpfunc_t func;
         unsigned long arg1;
@@ -255,14 +283,17 @@ static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
                              unsigned long arg2, unsigned long arg3,
                              unsigned long arg4)
 {
-        if(smp_processors_ready) {
+        if (smp_processors_ready) {
                 register int high = smp_highest_cpu;
                 unsigned long flags;
 
                 spin_lock_irqsave(&cross_call_lock, flags);
 
                 {
-                        /* If you make changes here, make sure gcc generates proper code... */
+                        /*
+                         * If you make changes here, make sure
+                         * gcc generates proper code...
+                         */
                         register smpfunc_t f asm("i0") = func;
                         register unsigned long a1 asm("i1") = arg1;
                         register unsigned long a2 asm("i2") = arg2;
@@ -282,10 +313,10 @@ static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
                 {
                         register int i;
 
-                        cpu_clear(smp_processor_id(), mask);
-                        cpus_and(mask, cpu_online_map, mask);
-                        for(i = 0; i <= high; i++) {
-                                if (cpu_isset(i, mask)) {
+                        cpumask_clear_cpu(smp_processor_id(), &mask);
+                        cpumask_and(&mask, cpu_online_mask, &mask);
+                        for (i = 0; i <= high; i++) {
+                                if (cpumask_test_cpu(i, &mask)) {
                                         ccall_info.processors_in[i] = 0;
                                         ccall_info.processors_out[i] = 0;
                                         sun4d_send_ipi(i, IRQ_CROSS_CALL);
@@ -298,19 +329,19 @@ static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
 
                         i = 0;
                         do {
-                                if (!cpu_isset(i, mask))
+                                if (!cpumask_test_cpu(i, &mask))
                                         continue;
-                                while(!ccall_info.processors_in[i])
+                                while (!ccall_info.processors_in[i])
                                         barrier();
-                        } while(++i <= high);
+                        } while (++i <= high);
 
                         i = 0;
                         do {
-                                if (!cpu_isset(i, mask))
+                                if (!cpumask_test_cpu(i, &mask))
                                         continue;
-                                while(!ccall_info.processors_out[i])
+                                while (!ccall_info.processors_out[i])
                                         barrier();
-                        } while(++i <= high);
+                        } while (++i <= high);
                 }
 
                 spin_unlock_irqrestore(&cross_call_lock, flags);
@@ -336,7 +367,7 @@ void smp4d_percpu_timer_interrupt(struct pt_regs *regs)
         static char led_mask[] = { 0xe, 0xd, 0xb, 0x7, 0xb, 0xd };
 
         old_regs = set_irq_regs(regs);
-        bw_get_prof_limit(cpu); 
+        bw_get_prof_limit(cpu);
         bw_clear_intr_mask(0, 1);       /* INTR_TABLE[0] & 1 is Profile IRQ */
 
         cpu_tick[cpu]++;
@@ -349,7 +380,7 @@ void smp4d_percpu_timer_interrupt(struct pt_regs *regs)
 
         profile_tick(CPU_PROFILING);
 
-        if(!--prof_counter(cpu)) {
+        if (!--prof_counter(cpu)) {
                 int user = user_mode(regs);
 
                 irq_enter();
@@ -361,8 +392,6 @@ void smp4d_percpu_timer_interrupt(struct pt_regs *regs)
         set_irq_regs(old_regs);
 }
 
-extern unsigned int lvl14_resolution;
-
 static void __cpuinit smp_setup_percpu_timer(void)
 {
         int cpu = hard_smp4d_processor_id();
@@ -374,16 +403,16 @@ static void __cpuinit smp_setup_percpu_timer(void)
 void __init smp4d_blackbox_id(unsigned *addr)
 {
         int rd = *addr & 0x3e000000;
-        
+
         addr[0] = 0xc0800800 | rd;              /* lda [%g0] ASI_M_VIKING_TMP1, reg */
-        addr[1] = 0x01000000;                   /* nop */
-        addr[2] = 0x01000000;                   /* nop */
+        addr[1] = 0x01000000;                   /* nop */
+        addr[2] = 0x01000000;                   /* nop */
 }
 
 void __init smp4d_blackbox_current(unsigned *addr)
 {
         int rd = *addr & 0x3e000000;
-        
+
         addr[0] = 0xc0800800 | rd;              /* lda [%g0] ASI_M_VIKING_TMP1, reg */
         addr[2] = 0x81282002 | rd | (rd >> 11); /* sll reg, 2, reg */
         addr[4] = 0x01000000;                   /* nop */
@@ -392,17 +421,19 @@ void __init smp4d_blackbox_current(unsigned *addr)
 void __init sun4d_init_smp(void)
 {
         int i;
-        extern unsigned int t_nmi[], linux_trap_ipi15_sun4d[], linux_trap_ipi15_sun4m[];
 
         /* Patch ipi15 trap table */
         t_nmi[1] = t_nmi[1] + (linux_trap_ipi15_sun4d - linux_trap_ipi15_sun4m);
-        
+
         /* And set btfixup... */
         BTFIXUPSET_BLACKBOX(hard_smp_processor_id, smp4d_blackbox_id);
         BTFIXUPSET_BLACKBOX(load_current, smp4d_blackbox_current);
         BTFIXUPSET_CALL(smp_cross_call, smp4d_cross_call, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(__hard_smp_processor_id, __smp4d_processor_id, BTFIXUPCALL_NORM);
-        
+        BTFIXUPSET_CALL(smp_ipi_resched, smp4d_ipi_resched, BTFIXUPCALL_NORM);
+        BTFIXUPSET_CALL(smp_ipi_single, smp4d_ipi_single, BTFIXUPCALL_NORM);
+        BTFIXUPSET_CALL(smp_ipi_mask_one, smp4d_ipi_mask_one, BTFIXUPCALL_NORM);
+
         for (i = 0; i < NR_CPUS; i++) {
                 ccall_info.processors_in[i] = 1;
                 ccall_info.processors_out[i] = 1;