1 files changed, 52 insertions, 67 deletions

diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index 540b2fec09f0..f9a1a33cbb2c 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -6,16 +6,20 @@
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
  */
 
+#include <linux/clockchips.h>
 #include <linux/interrupt.h>
 #include <linux/profile.h>
 #include <linux/delay.h>
+#include <linux/sched.h>
 #include <linux/cpu.h>
 
+#include <asm/cacheflush.h>
+#include <asm/switch_to.h>
+#include <asm/tlbflush.h>
+#include <asm/timer.h>
+#include <asm/oplib.h>
 #include <asm/sbi.h>
 #include <asm/mmu.h>
-#include <asm/tlbflush.h>
-#include <asm/switch_to.h>
-#include <asm/cacheflush.h>
 
 #include "kernel.h"
 #include "irq.h"
@@ -34,7 +38,6 @@ static inline unsigned long sun4d_swap(volatile unsigned long *ptr, unsigned lon
 }
 
 static void smp4d_ipi_init(void);
-static void smp_setup_percpu_timer(void);
 
 static unsigned char cpu_leds[32];
 
@@ -49,7 +52,7 @@ static inline void show_leds(int cpuid)
 
 void __cpuinit smp4d_callin(void)
 {
-        int cpuid = hard_smp4d_processor_id();
+        int cpuid = hard_smp_processor_id();
         unsigned long flags;
 
         /* Show we are alive */
@@ -59,8 +62,8 @@ void __cpuinit smp4d_callin(void)
         /* Enable level15 interrupt, disable level14 interrupt for now */
         cc_set_imsk((cc_get_imsk() & ~0x8000) | 0x4000);
 
-        local_flush_cache_all();
-        local_flush_tlb_all();
+        local_ops->cache_all();
+        local_ops->tlb_all();
 
         notify_cpu_starting(cpuid);
         /*
@@ -70,17 +73,17 @@ void __cpuinit smp4d_callin(void)
          * to call the scheduler code.
          */
         /* Get our local ticker going. */
-        smp_setup_percpu_timer();
+        register_percpu_ce(cpuid);
 
         calibrate_delay();
         smp_store_cpu_info(cpuid);
-        local_flush_cache_all();
-        local_flush_tlb_all();
+        local_ops->cache_all();
+        local_ops->tlb_all();
 
         /* Allow master to continue. */
         sun4d_swap((unsigned long *)&cpu_callin_map[cpuid], 1);
-        local_flush_cache_all();
-        local_flush_tlb_all();
+        local_ops->cache_all();
+        local_ops->tlb_all();
 
         while ((unsigned long)current_set[cpuid] < PAGE_OFFSET)
                 barrier();
@@ -100,8 +103,8 @@ void __cpuinit smp4d_callin(void)
         atomic_inc(&init_mm.mm_count);
         current->active_mm = &init_mm;
 
-        local_flush_cache_all();
-        local_flush_tlb_all();
+        local_ops->cache_all();
+        local_ops->tlb_all();
 
         local_irq_enable();     /* We don't allow PIL 14 yet */
 
@@ -123,8 +126,7 @@ void __init smp4d_boot_cpus(void)
         smp4d_ipi_init();
         if (boot_cpu_id)
                 current_set[0] = NULL;
-        smp_setup_percpu_timer();
-        local_flush_cache_all();
+        local_ops->cache_all();
 }
 
 int __cpuinit smp4d_boot_one_cpu(int i)
@@ -150,7 +152,7 @@ int __cpuinit smp4d_boot_one_cpu(int i)
 
         /* whirrr, whirrr, whirrrrrrrrr... */
         printk(KERN_INFO "Starting CPU %d at %p\n", i, entry);
-        local_flush_cache_all();
+        local_ops->cache_all();
         prom_startcpu(cpu_node,
                       &smp_penguin_ctable, 0, (char *)entry);
 
@@ -168,7 +170,7 @@ int __cpuinit smp4d_boot_one_cpu(int i)
                 return -ENODEV;
 
         }
-        local_flush_cache_all();
+        local_ops->cache_all();
         return 0;
 }
 
@@ -185,7 +187,7 @@ void __init smp4d_smp_done(void)
                 prev = &cpu_data(i).next;
         }
         *prev = first;
-        local_flush_cache_all();
+        local_ops->cache_all();
 
         /* Ok, they are spinning and ready to go. */
         smp_processors_ready = 1;
@@ -233,7 +235,20 @@ void sun4d_ipi_interrupt(void)
         }
 }
 
-static void smp4d_ipi_single(int cpu)
+/* +-------+-------------+-----------+------------------------------------+
+ * | bcast |  devid      |   sid     |              levels mask           |
+ * +-------+-------------+-----------+------------------------------------+
+ *  31      30         23 22       15 14                                 0
+ */
+#define IGEN_MESSAGE(bcast, devid, sid, levels) \
+        (((bcast) << 31) | ((devid) << 23) | ((sid) << 15) | (levels))
+
+static void sun4d_send_ipi(int cpu, int level)
+{
+        cc_set_igen(IGEN_MESSAGE(0, cpu << 3, 6 + ((level >> 1) & 7), 1 << (level - 1)));
+}
+
+static void sun4d_ipi_single(int cpu)
 {
         struct sun4d_ipi_work *work = &per_cpu(sun4d_ipi_work, cpu);
 
@@ -244,7 +259,7 @@ static void smp4d_ipi_single(int cpu)
         sun4d_send_ipi(cpu, SUN4D_IPI_IRQ);
 }
 
-static void smp4d_ipi_mask_one(int cpu)
+static void sun4d_ipi_mask_one(int cpu)
 {
         struct sun4d_ipi_work *work = &per_cpu(sun4d_ipi_work, cpu);
 
@@ -255,7 +270,7 @@ static void smp4d_ipi_mask_one(int cpu)
         sun4d_send_ipi(cpu, SUN4D_IPI_IRQ);
 }
 
-static void smp4d_ipi_resched(int cpu)
+static void sun4d_ipi_resched(int cpu)
 {
         struct sun4d_ipi_work *work = &per_cpu(sun4d_ipi_work, cpu);
 
@@ -280,7 +295,7 @@ static struct smp_funcall {
 static DEFINE_SPINLOCK(cross_call_lock);
 
 /* Cross calls must be serialized, at least currently. */
-static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
+static void sun4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
                              unsigned long arg2, unsigned long arg3,
                              unsigned long arg4)
 {
@@ -352,7 +367,7 @@ static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
 /* Running cross calls. */
 void smp4d_cross_call_irq(void)
 {
-        int i = hard_smp4d_processor_id();
+        int i = hard_smp_processor_id();
 
         ccall_info.processors_in[i] = 1;
         ccall_info.func(ccall_info.arg1, ccall_info.arg2, ccall_info.arg3,
@@ -363,7 +378,8 @@ void smp4d_cross_call_irq(void)
 void smp4d_percpu_timer_interrupt(struct pt_regs *regs)
 {
         struct pt_regs *old_regs;
-        int cpu = hard_smp4d_processor_id();
+        int cpu = hard_smp_processor_id();
+        struct clock_event_device *ce;
         static int cpu_tick[NR_CPUS];
         static char led_mask[] = { 0xe, 0xd, 0xb, 0x7, 0xb, 0xd };
 
@@ -379,45 +395,21 @@ void smp4d_percpu_timer_interrupt(struct pt_regs *regs)
                 show_leds(cpu);
         }
 
-        profile_tick(CPU_PROFILING);
-
-        if (!--prof_counter(cpu)) {
-                int user = user_mode(regs);
+        ce = &per_cpu(sparc32_clockevent, cpu);
 
-                irq_enter();
-                update_process_times(user);
-                irq_exit();
+        irq_enter();
+        ce->event_handler(ce);
+        irq_exit();
 
-                prof_counter(cpu) = prof_multiplier(cpu);
-        }
         set_irq_regs(old_regs);
 }
 
-static void __cpuinit smp_setup_percpu_timer(void)
-{
-        int cpu = hard_smp4d_processor_id();
-
-        prof_counter(cpu) = prof_multiplier(cpu) = 1;
-        load_profile_irq(cpu, lvl14_resolution);
-}
-
-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 */
-}
-
-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 */
-}
+static const struct sparc32_ipi_ops sun4d_ipi_ops = {
+        .cross_call = sun4d_cross_call,
+        .resched    = sun4d_ipi_resched,
+        .single     = sun4d_ipi_single,
+        .mask_one   = sun4d_ipi_mask_one,
+};
 
 void __init sun4d_init_smp(void)
 {
@@ -426,14 +418,7 @@ void __init sun4d_init_smp(void)
         /* 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);
+        sparc32_ipi_ops = &sun4d_ipi_ops;
 
         for (i = 0; i < NR_CPUS; i++) {
                 ccall_info.processors_in[i] = 1;