Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1205412

[PATCH 3/3] ARM:Gemini:setup timer3 as free running timer

Show all headers | View raw

In the original driver it is missed to setup a free running driver.
This timer is needed for the scheduler.
So setup it.

Signed-off-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
---
 arch/arm/mach-gemini/time.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-gemini/time.c b/arch/arm/mach-gemini/time.c
index 5e2b1ba..f5f18df 100644
--- a/arch/arm/mach-gemini/time.c
+++ b/arch/arm/mach-gemini/time.c
@@ -15,6 +15,7 @@
 #include <asm/mach/time.h>
 #include <linux/clockchips.h>
 #include <linux/clocksource.h>
+#include <linux/sched_clock.h>
 
 /*
  * Register definitions for the timers
@@ -62,6 +63,11 @@
 
 static unsigned int tick_rate;
 
+static u64 notrace gemini_read_sched_clock(void)
+{
+	return readl(TIMER_COUNT(TIMER3_BASE));
+}
+
 static int gemini_timer_set_next_event(unsigned long cycles,
 				       struct clock_event_device *evt)
 {
@@ -206,8 +212,21 @@ void __init gemini_timer_init(void)
 	writel(TIMER_DEFAULT_FLAGS, TIMER_CR);
 
 	/*
-	 * Setup clockevent timer (interrupt-driven.)
+	 * Setup free-running clocksource timer (interrupts
+	 * disabled.)
 	 */
+	writel(0, TIMER_COUNT(TIMER3_BASE));
+	writel(0, TIMER_LOAD(TIMER3_BASE));
+	writel(0, TIMER_MATCH1(TIMER3_BASE));
+	writel(0, TIMER_MATCH2(TIMER3_BASE));
+	clocksource_mmio_init(TIMER_COUNT(TIMER3_BASE),
+			      "gemini_clocksource", tick_rate,
+			      300, 32, clocksource_mmio_readl_up);
+	sched_clock_register(gemini_read_sched_clock, 32, tick_rate);
+
+	/*
+	 * Setup clockevent timer (interrupt-driven.)
+	*/
 	writel(0, TIMER_COUNT(TIMER1_BASE));
 	writel(0, TIMER_LOAD(TIMER1_BASE));
 	writel(0, TIMER_MATCH1(TIMER1_BASE));
-- 
2.4.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

ARM:Gemini:clocksource update for 4.3 Hans Ulli Kroll <ulli.kroll@googlemail.com> - 2015-08-07 16:00 +0200
  Re: ARM:Gemini:clocksource update for 4.3 Olof Johansson <olof@lixom.net> - 2015-08-11 16:10 +0200
  [PATCH 3/3] ARM:Gemini:setup timer3 as free running timer Hans Ulli Kroll <ulli.kroll@googlemail.com> - 2015-08-11 22:20 +0200
  [PATCH 1/3] ARM:Gemini:Add missing register definitions for gemini timer Hans Ulli Kroll <ulli.kroll@googlemail.com> - 2015-08-11 22:20 +0200
  [PATCH 2/3] ARM:Gemini:use timer1 for clockevent Hans Ulli Kroll <ulli.kroll@googlemail.com> - 2015-08-11 22:20 +0200
  ARM: gemini: clocksource update for 4.3 v2 Hans Ulli Kroll <ulli.kroll@googlemail.com> - 2015-08-11 22:20 +0200
    Re: ARM: gemini: clocksource update for 4.3 v2 Linus Walleij <linus.walleij@linaro.org> - 2015-08-12 14:50 +0200
      Re: ARM: gemini: clocksource update for 4.3 v2 Olof Johansson <olof@lixom.net> - 2015-08-13 11:50 +0200
    Re: ARM: gemini: clocksource update for 4.3 v2 Olof Johansson <olof@lixom.net> - 2015-08-13 11:50 +0200
  Re: ARM:Gemini:clocksource update for 4.3 Roman Yeryomin <roman@advem.lv> - 2015-08-12 22:40 +0200

csiph-web