[MIPS] Sibyte: Finish conversion to modern time APIs.
[linux-2.6.git] / arch / mips / sibyte / sb1250 / time.c
index 1588f6debd90698522d9c278bedbab47d6696808..9ef54628bc9c8eecac4203d31f004cc790b0d210 100644 (file)
  * code to do general bookkeeping (e.g. update jiffies, run
  * bottom halves, etc.)
  */
  * code to do general bookkeeping (e.g. update jiffies, run
  * bottom halves, etc.)
  */
-#include <linux/config.h>
+#include <linux/clockchips.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/kernel_stat.h>
 
 #include <asm/irq.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/kernel_stat.h>
 
 #include <asm/irq.h>
-#include <asm/ptrace.h>
 #include <asm/addrspace.h>
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/time.h>
 #include <asm/io.h>
 
 #define SB1250_HPT_NUM         3
 #define SB1250_HPT_VALUE       M_SCD_TIMER_CNT /* max value */
 
 #define SB1250_HPT_NUM         3
 #define SB1250_HPT_VALUE       M_SCD_TIMER_CNT /* max value */
-#define SB1250_HPT_SHIFT       ((sizeof(unsigned int)*8)-V_SCD_TIMER_WIDTH)
 
 
 extern int sb1250_steal_irq(int irq);
 
 
 
 extern int sb1250_steal_irq(int irq);
 
-static unsigned int sb1250_hpt_read(void);
-static void sb1250_hpt_init(unsigned int);
-
-static unsigned int hpt_offset;
+static cycle_t sb1250_hpt_read(void);
 
 void __init sb1250_hpt_setup(void)
 {
 
 void __init sb1250_hpt_setup(void)
 {
@@ -71,26 +66,93 @@ void __init sb1250_hpt_setup(void)
                __raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS,
                             IOADDR(A_SCD_TIMER_REGISTER(SB1250_HPT_NUM, R_SCD_TIMER_CFG)));
 
                __raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS,
                             IOADDR(A_SCD_TIMER_REGISTER(SB1250_HPT_NUM, R_SCD_TIMER_CFG)));
 
-               /*
-                * we need to fill 32 bits, so just use the upper 23 bits and pretend
-                * the timer is going 512Mhz instead of 1Mhz
-                */
-               mips_hpt_frequency = V_SCD_TIMER_FREQ << SB1250_HPT_SHIFT;
-               mips_hpt_init = sb1250_hpt_init;
-               mips_hpt_read = sb1250_hpt_read;
+               mips_hpt_frequency = V_SCD_TIMER_FREQ;
+               clocksource_mips.read = sb1250_hpt_read;
+               clocksource_mips.mask = M_SCD_TIMER_INIT;
        }
 }
 
        }
 }
 
+/*
+ * The general purpose timer ticks at 1 Mhz independent if
+ * the rest of the system
+ */
+static void sibyte_set_mode(enum clock_event_mode mode,
+                           struct clock_event_device *evt)
+{
+       unsigned int cpu = smp_processor_id();
+       void __iomem *timer_cfg, *timer_init;
+
+       timer_cfg = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG));
+       timer_init = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT));
 
 
-void sb1250_time_init(void)
+       switch(mode) {
+       case CLOCK_EVT_MODE_PERIODIC:
+               __raw_writeq(0, timer_cfg);
+               __raw_writeq((V_SCD_TIMER_FREQ / HZ) - 1, timer_init);
+               __raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS,
+                            timer_cfg);
+               break;
+
+       case CLOCK_EVT_MODE_ONESHOT:
+               /* Stop the timer until we actually program a shot */
+       case CLOCK_EVT_MODE_SHUTDOWN:
+               __raw_writeq(0, timer_cfg);
+               break;
+
+       case CLOCK_EVT_MODE_UNUSED:     /* shuddup gcc */
+       case CLOCK_EVT_MODE_RESUME:
+               ;
+       }
+}
+
+static int
+sibyte_next_event(unsigned long delta, struct clock_event_device *evt)
 {
 {
-       int cpu = smp_processor_id();
-       int irq = K_INT_TIMER_0+cpu;
+       unsigned int cpu = smp_processor_id();
+       void __iomem *timer_cfg, *timer_init;
+
+       timer_cfg = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG));
+       timer_init = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT));
+
+       __raw_writeq(0, timer_cfg);
+       __raw_writeq(delta, timer_init);
+       __raw_writeq(M_SCD_TIMER_ENABLE, timer_cfg);
+
+       return 0;
+}
+
+struct clock_event_device sibyte_hpt_clockevent = {
+       .name           = "sb1250-counter",
+       .features       = CLOCK_EVT_FEAT_PERIODIC,
+       .set_mode       = sibyte_set_mode,
+       .set_next_event = sibyte_next_event,
+       .shift          = 32,
+       .irq            = 0,
+};
+
+static irqreturn_t sibyte_counter_handler(int irq, void *dev_id)
+{
+       struct clock_event_device *cd = &sibyte_hpt_clockevent;
+
+       cd->event_handler(cd);
+
+       return IRQ_HANDLED;
+}
+
+static struct irqaction sibyte_irqaction = {
+       .handler        = sibyte_counter_handler,
+       .flags          = IRQF_DISABLED | IRQF_PERCPU,
+       .name           = "timer",
+};
+
+void __cpuinit sb1250_clockevent_init(void)
+{
+       struct clock_event_device *cd = &sibyte_hpt_clockevent;
+       unsigned int cpu = smp_processor_id();
+       int irq = K_INT_TIMER_0 + cpu;
 
        /* Only have 4 general purpose timers, and we use last one as hpt */
 
        /* Only have 4 general purpose timers, and we use last one as hpt */
-       if (cpu > 2) {
-               BUG();
-       }
+       BUG_ON(cpu > 2);
 
        sb1250_mask_irq(cpu, irq);
 
 
        sb1250_mask_irq(cpu, irq);
 
@@ -98,24 +160,11 @@ void sb1250_time_init(void)
        __raw_writeq(IMR_IP4_VAL,
                     IOADDR(A_IMR_REGISTER(cpu, R_IMR_INTERRUPT_MAP_BASE) +
                            (irq << 3)));
        __raw_writeq(IMR_IP4_VAL,
                     IOADDR(A_IMR_REGISTER(cpu, R_IMR_INTERRUPT_MAP_BASE) +
                            (irq << 3)));
-
-       /* the general purpose timer ticks at 1 Mhz independent if the rest of the system */
-       /* Disable the timer and set up the count */
-       __raw_writeq(0, IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
-#ifdef CONFIG_SIMULATION
-       __raw_writeq((50000 / HZ) - 1,
-                    IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT)));
-#else
-       __raw_writeq((V_SCD_TIMER_FREQ / HZ) - 1,
-                    IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT)));
-#endif
-
-       /* Set the timer running */
-       __raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS,
-                    IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
+       cd->cpumask = cpumask_of_cpu(0);
 
        sb1250_unmask_irq(cpu, irq);
        sb1250_steal_irq(irq);
 
        sb1250_unmask_irq(cpu, irq);
        sb1250_steal_irq(irq);
+
        /*
         * This interrupt is "special" in that it doesn't use the request_irq
         * way to hook the irq line.  The timer interrupt is initialized early
        /*
         * This interrupt is "special" in that it doesn't use the request_irq
         * way to hook the irq line.  The timer interrupt is initialized early
@@ -124,52 +173,43 @@ void sb1250_time_init(void)
         * called directly from irq_handler.S when IP[4] is set during an
         * interrupt
         */
         * called directly from irq_handler.S when IP[4] is set during an
         * interrupt
         */
-}
-
-void sb1250_timer_interrupt(struct pt_regs *regs)
-{
-       int cpu = smp_processor_id();
-       int irq = K_INT_TIMER_0 + cpu;
-
-       /* ACK interrupt */
-       ____raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS,
-                      IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
+       setup_irq(irq, &sibyte_irqaction);
 
 
-       if (cpu == 0) {
-               /*
-                * CPU 0 handles the global timer interrupt job
-                */
-               ll_timer_interrupt(irq, regs);
-       }
-       else {
-               /*
-                * other CPUs should just do profiling and process accounting
-                */
-               ll_local_timer_interrupt(irq, regs);
-       }
+       clockevents_register_device(cd);
 }
 
 /*
  * The HPT is free running from SB1250_HPT_VALUE down to 0 then starts over
 }
 
 /*
  * The HPT is free running from SB1250_HPT_VALUE down to 0 then starts over
- * again. There's no easy way to set to a specific value so store init value
- * in hpt_offset and subtract each time.
- *
- * Note: Timer isn't full 32bits so shift it into the upper part making
- *       it appear to run at a higher frequency.
+ * again.
  */
  */
-static unsigned int sb1250_hpt_read(void)
+static cycle_t sb1250_hpt_read(void)
 {
        unsigned int count;
 
        count = G_SCD_TIMER_CNT(__raw_readq(IOADDR(A_SCD_TIMER_REGISTER(SB1250_HPT_NUM, R_SCD_TIMER_CNT))));
 
 {
        unsigned int count;
 
        count = G_SCD_TIMER_CNT(__raw_readq(IOADDR(A_SCD_TIMER_REGISTER(SB1250_HPT_NUM, R_SCD_TIMER_CNT))));
 
-       count = (SB1250_HPT_VALUE - count) << SB1250_HPT_SHIFT;
+       return SB1250_HPT_VALUE - count;
+}
+
+struct clocksource bcm1250_clocksource = {
+       .name   = "MIPS",
+       .rating = 200,
+       .read   = sb1250_hpt_read,
+       .mask   = CLOCKSOURCE_MASK(32),
+       .shift  = 32,
+       .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
+};
+
+void __init sb1250_clocksource_init(void)
+{
+       struct clocksource *cs = &bcm1250_clocksource;
 
 
-       return count - hpt_offset;
+       clocksource_set_clock(cs, V_SCD_TIMER_FREQ);
+       clocksource_register(cs);
 }
 
 }
 
-static void sb1250_hpt_init(unsigned int count)
+void __init plat_time_init(void)
 {
 {
-       hpt_offset = count;
-       return;
+       sb1250_clocksource_init();
+       sb1250_clockevent_init();
 }
 }