]> err.no Git - linux-2.6/commitdiff
[ARM SMP] Add local timer support for Realview MPcore
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 9 Nov 2005 10:50:29 +0000 (10:50 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 9 Nov 2005 10:50:29 +0000 (10:50 +0000)
Add platform specific parts for local timer support for the
Realview board.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/Kconfig
arch/arm/mach-realview/Makefile
arch/arm/mach-realview/core.c
arch/arm/mach-realview/localtimer.c [new file with mode: 0644]
arch/arm/mach-realview/platsmp.c
include/asm-arm/arch-realview/entry-macro.S
include/asm-arm/arch-realview/irqs.h
include/asm-arm/arch-realview/platform.h

index 3bfef0934c9d39162e346e73764f379aad8946f4..ec77721507cb746c238afe4d4ed56a62b97f4b38 100644 (file)
@@ -358,7 +358,7 @@ config HOTPLUG_CPU
 
 config LOCAL_TIMERS
        bool "Use local timer interrupts"
-       depends on SMP && n
+       depends on SMP && REALVIEW_MPCORE
        default y
        help
          Enable support for local timers on SMP platforms, rather then the
index 011a85c1062746f050cabf4cf581beb7424df3be..a6a40dac26a9c459f73e4606a20c4c3d22e66393 100644 (file)
@@ -5,3 +5,4 @@
 obj-y                                  := core.o clock.o
 obj-$(CONFIG_MACH_REALVIEW_EB)         += realview_eb.o
 obj-$(CONFIG_SMP)                      += platsmp.o headsmp.o
+obj-$(CONFIG_LOCAL_TIMERS)             += localtimer.o
index 4ea60d8b6e36838bdd5deb72955732297edf6cf9..e2c6fa23d3cd5815b1480660099db8e48bba8a1e 100644 (file)
@@ -550,7 +550,7 @@ static irqreturn_t realview_timer_interrupt(int irq, void *dev_id, struct pt_reg
 
        timer_tick(regs);
 
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && !defined(CONFIG_LOCAL_TIMERS)
        smp_send_timer();
        update_process_times(user_mode(regs));
 #endif
diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c
new file mode 100644 (file)
index 0000000..5e917e3
--- /dev/null
@@ -0,0 +1,130 @@
+/*
+ *  linux/arch/arm/mach-realview/localtimer.c
+ *
+ *  Copyright (C) 2002 ARM Ltd.
+ *  All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/smp.h>
+
+#include <asm/mach/time.h>
+#include <asm/hardware/arm_twd.h>
+#include <asm/hardware/gic.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+
+#include "core.h"
+
+#define TWD_BASE(cpu)  (__io_address(REALVIEW_TWD_BASE) + \
+                        ((cpu) * REALVIEW_TWD_SIZE))
+
+static unsigned long mpcore_timer_rate;
+
+/*
+ * local_timer_ack: checks for a local timer interrupt.
+ *
+ * If a local timer interrupt has occured, acknowledge and return 1.
+ * Otherwise, return 0.
+ */
+int local_timer_ack(void)
+{
+       void __iomem *base = TWD_BASE(smp_processor_id());
+
+       if (__raw_readl(base + TWD_TIMER_INTSTAT)) {
+               __raw_writel(1, base + TWD_TIMER_INTSTAT);
+               return 1;
+       }
+
+       return 0;
+}
+
+void __cpuinit local_timer_setup(unsigned int cpu)
+{
+       void __iomem *base = TWD_BASE(cpu);
+       unsigned int load, offset;
+       u64 waitjiffies;
+       unsigned int count;
+
+       /*
+        * If this is the first time round, we need to work out how fast
+        * the timer ticks
+        */
+       if (mpcore_timer_rate == 0) {
+               printk("Calibrating local timer... ");
+
+               /* Wait for a tick to start */
+               waitjiffies = get_jiffies_64() + 1;
+
+               while (get_jiffies_64() < waitjiffies)
+                       udelay(10);
+
+               /* OK, now the tick has started, let's get the timer going */
+               waitjiffies += 5;
+
+                                /* enable, no interrupt or reload */
+               __raw_writel(0x1, base + TWD_TIMER_CONTROL);
+
+                                /* maximum value */
+               __raw_writel(0xFFFFFFFFU, base + TWD_TIMER_COUNTER);
+
+               while (get_jiffies_64() < waitjiffies)
+                       udelay(10);
+
+               count = __raw_readl(base + TWD_TIMER_COUNTER);
+
+               mpcore_timer_rate = (0xFFFFFFFFU - count) * (HZ / 5);
+
+               printk("%lu.%02luMHz.\n", mpcore_timer_rate / 1000000,
+                       (mpcore_timer_rate / 100000) % 100);
+       }
+
+       load = mpcore_timer_rate / HZ;
+
+       __raw_writel(load, base + TWD_TIMER_LOAD);
+       __raw_writel(0x7,  base + TWD_TIMER_CONTROL);
+
+       /*
+        * Now maneuver our local tick into the right part of the jiffy.
+        * Start by working out where within the tick our local timer
+        * interrupt should go.
+        */
+       offset = ((mpcore_timer_rate / HZ) / (NR_CPUS + 1)) * (cpu + 1);
+
+       /*
+        * gettimeoffset() will return a number of us since the last tick.
+        * Convert this number of us to a local timer tick count.
+        * Be careful of integer overflow whilst keeping maximum precision.
+        *
+        * with HZ=100 and 1MHz (fpga) ~ 1GHz processor:
+        * load = 1 ~ 10,000
+        * mpcore_timer_rate/10000 = 100 ~ 100,000
+        *
+        * so the multiply value will be less than 10^9 always.
+        */
+       load = (system_timer->offset() * (mpcore_timer_rate / 10000)) / 100;
+
+       /* Add on our offset to get the load value */
+       load = (load + offset) % (mpcore_timer_rate / HZ);
+
+       __raw_writel(load, base + TWD_TIMER_COUNTER);
+
+       /* Make sure our local interrupt controller has this enabled */
+       __raw_writel(1 << IRQ_LOCALTIMER,
+                    __io_address(REALVIEW_GIC_DIST_BASE) + GIC_DIST_ENABLE_SET);
+}
+
+/*
+ * take a local timer down
+ */
+void __cpuexit local_timer_stop(unsigned int cpu)
+{
+       __raw_writel(0, TWD_BASE(cpu) + TWD_TIMER_CONTROL);
+}
index 09b35f62247a8863c268ec0ae4c1b3d3259c1d1d..0c7d4ac9a7b371c7a4221d96a918812cbdb7c811 100644 (file)
@@ -174,6 +174,11 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
        if (max_cpus > ncores)
                max_cpus = ncores;
 
+       /*
+        * Enable the local timer for primary CPU
+        */
+       local_timer_setup(cpu);
+
        /*
         * Initialise the possible/present maps.
         * cpu_possible_map describes the set of CPUs which may be present
index 4df469bf42e2809b84bddce343728b08af3488af..6288fad0dc4182f9ebd4409b443cce684016c28d 100644 (file)
                strcc   \irqstat, [\base, #GIC_CPU_EOI]
                cmpcs   \irqnr, \irqnr
                .endm
+
+               /* As above, this assumes that irqstat and base are preserved.. */
+
+               .macro test_for_ltirq, irqnr, irqstat, base, tmp
+               bic     \irqnr, \irqstat, #0x1c00
+               mov     \tmp, #0
+               cmp     \irqnr, #29
+               moveq   \tmp, #1
+               streq   \irqstat, [\base, #GIC_CPU_EOI]
+               cmp     \tmp, #0
+               .endm
index ff376494e5b1d2f60de5481258c5e6211c34ae77..c16223c9588d88bf4f96d2ab5d7670d85df9e3d1 100644 (file)
@@ -21,6 +21,9 @@
 
 #include <asm/arch/platform.h>
 
+#define IRQ_LOCALTIMER                 29
+#define IRQ_LOCALWDOG                  30
+
 /* 
  *  IRQ interrupts definitions are the same the INT definitions
  *  held within platform.h
index aef9b36b3c3771d891e5d199a1daf817c8033b1a..18d7c18b738c7941501063283de1061c31a33959 100644 (file)
 #else
 #define REALVIEW_MPCORE_SCU_BASE       0x10100000      /*  SCU registers */
 #define REALVIEW_GIC_CPU_BASE          0x10100100      /* Generic interrupt controller CPU interface */
+#define REALVIEW_TWD_BASE              0x10100700
+#define REALVIEW_TWD_SIZE              0x00000100
 #define REALVIEW_GIC_DIST_BASE         0x10101000      /* Generic interrupt controller distributor */
 #endif
 #define REALVIEW_SMC_BASE             0x10080000       /* SMC */
 #define INT_TSPENINT                   30      /* Touchscreen pen */
 #define INT_TSKPADINT                  31      /* Touchscreen keypad */
 #else
-#define INT_LOCALTIMER                 29
-#define INT_LOCALWDOG                  30
-
 #define INT_AACI                       0
 #define INT_TIMERINT0_1                        1
 #define INT_TIMERINT2_3                        2