Skip to contentSkip to conversation

iop: clockevent support

PATCH Superseded Mikael Pettersson 3 participants 4 messages Aug 22, 2009 – Sep 1, 2009

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 2/3 iop: clockevent support

This updates the IOP platform to expose the interrupting timer 0 as a clockevent object. The timer interrupt handler is changed to call the clockevent ->event_handler() instead of timer_tick(), and ->set_next_event() and ->set_mode() operations are added to allow the mode of the timer to be updated (required for ONESHOT/NOHZ mode).

Timer 0 must now be properly initialised, which requires a new write_tcr0() function from the mach implementation code.

Initial setup of timer 0 is also rewritten to be more robust.

On concern I have is whether the clockevent .shift value of 20 is appropriate for timer frequencies in the 200/266/333 MHz range which seem to be typical for IOP.

Another concern I have is what the exact state changes needed for CLK_EVT_MODE_ONESHOT and ->set_next_event are. Right now I disable the timer both for CLK_EVT_MODE_ONESHOT and at the start of ->set_next_event. One of these may be redundant.

Tested on n2100, compile-tested for all plat-iop machines.

---
 arch/arm/Kconfig                          |    1 
 arch/arm/include/asm/hardware/iop3xx.h    |    5 +
 arch/arm/mach-iop13xx/include/mach/time.h |    5 +
 arch/arm/plat-iop/time.c                  |   82 ++++++++++++++++++++++++++----
 4 files changed, 84 insertions(+), 9 deletions(-)
arch/arm/Kconfig +1 -0
diff -rupN linux-2.6.31-rc7.arm-iop-1-clocksource/arch/arm/Kconfig linux-2.6.31-rc7.arm-iop-2-clockevents/arch/arm/Kconfig
@@ -736,6 +736,7 @@ config ARCH_ACORN
 
 config PLAT_IOP
 	bool
+	select GENERIC_CLOCKEVENTS
 
 config PLAT_ORION
 	bool
arch/arm/include/asm/hardware/iop3xx.h +5 -0
diff -rupN linux-2.6.31-rc7.arm-iop-1-clocksource/arch/arm/include/asm/hardware/iop3xx.h linux-2.6.31-rc7.arm-iop-2-clockevents/arch/arm/include/asm/hardware/iop3xx.h
@@ -252,6 +252,11 @@ static inline u32 read_tcr0(void)
 	return val;
 }
 
+static inline void write_tcr0(u32 val)
+{
+	asm volatile("mcr p6, 0, %0, c2, c1, 0" : : "r" (val));
+}
+
 static inline u32 read_tcr1(void)
 {
 	u32 val;
arch/arm/mach-iop13xx/include/mach/time.h +5 -0
diff -rupN linux-2.6.31-rc7.arm-iop-1-clocksource/arch/arm/mach-iop13xx/include/mach/time.h linux-2.6.31-rc7.arm-iop-2-clockevents/arch/arm/mach-iop13xx/include/mach/time.h
@@ -83,6 +83,11 @@ static inline u32 read_tcr0(void)
 	return val;
 }
 
+static inline void write_tcr0(u32 val)
+{
+	asm volatile("mcr p6, 0, %0, c2, c9, 0" : : "r" (val));
+}
+
 static inline u32 read_tcr1(void)
 {
 	u32 val;
arch/arm/plat-iop/time.c +73 -9

115 lines not on this page · raw message

#1 lore raw

PATCH 2/3 iop: clockevent support

Tjenare,

2009/8/22 Mikael Pettersson <[email protected]>:

Quoted 130 lines

This updates the IOP platform to expose the interrupting timer 0 as a clockevent object. The timer interrupt handler is changed to call the clockevent ->event_handler() instead of timer_tick(), and ->set_next_event() and ->set_mode() operations are added to allow the mode of the timer to be updated (required for ONESHOT/NOHZ mode).

Timer 0 must now be properly initialised, which requires a new write_tcr0() function from the mach implementation code.

Initial setup of timer 0 is also rewritten to be more robust.

On concern I have is whether the clockevent .shift value of 20 is appropriate for timer frequencies in the 200/266/333 MHz range which seem to be typical for IOP.

Another concern I have is what the exact state changes needed for CLK_EVT_MODE_ONESHOT and ->set_next_event are. Right now I disable the timer both for CLK_EVT_MODE_ONESHOT and at the start of ->set_next_event. One of these may be redundant.

Tested on n2100, compile-tested for all plat-iop machines.

---

?arch/arm/Kconfig ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?1
?arch/arm/include/asm/hardware/iop3xx.h ? ?| ? ?5 +
?arch/arm/mach-iop13xx/include/mach/time.h | ? ?5 +
?arch/arm/plat-iop/time.c ? ? ? ? ? ? ? ? ?| ? 82 ++++++++++++++++++++++++++----

?4 files changed, 84 insertions(+), 9 deletions(-)

diff -rupN linux-2.6.31-rc7.arm-iop-1-clocksource/arch/arm/Kconfig linux-2.6.31-rc7.arm-iop-2-clockevents/arch/arm/Kconfig

arch/arm/Kconfig ? ? 2009-08-22 12:07:52.000000000 +0200 renamed from arch/arm/Kconfig ? ? 2009-08-22 11:13:37.000000000 +0200 +0 -0
@@ -736,6 +736,7 @@ config ARCH_ACORN
 

?config PLAT_IOP
? ? ? ?bool
+ ? ? ? select GENERIC_CLOCKEVENTS

?config PLAT_ORION
? ? ? ?bool
diff -rupN linux-2.6.31-rc7.arm-iop-1-clocksource/arch/arm/include/asm/hardware/iop3xx.h linux-2.6.31-rc7.arm-iop-2-clockevents/arch/arm/include/asm/hardware/iop3xx.h

arch/arm/include/asm/hardware/iop3xx.h ? ? ? 2009-08-22 12:07:52.000000000 +0200 renamed from arch/arm/include/asm/hardware/iop3xx.h ? ? ? 2009-08-22 12:06:28.000000000 +0200 +5 -0
@@ -252,6 +252,11 @@ static inline u32 read_tcr0(void)
 ? ? ? ?return val;
 ?}
 
+static inline void write_tcr0(u32 val)
+{
+ ? ? ? asm volatile("mcr p6, 0, %0, c2, c1, 0" : : "r" (val));
+}
+
 ?static inline u32 read_tcr1(void)
 ?{
 ? ? ? ?u32 val;

diff -rupN linux-2.6.31-rc7.arm-iop-1-clocksource/arch/arm/mach-iop13xx/include/mach/time.h linux-2.6.31-rc7.arm-iop-2-clockevents/arch/arm/mach-iop13xx/include/mach/time.h

arch/arm/mach-iop13xx/include/mach/time.h ? ?2009-08-22 12:07:52.000000000 +0200 renamed from arch/arm/mach-iop13xx/include/mach/time.h ? ?2009-08-22 12:06:28.000000000 +0200 +5 -0
@@ -83,6 +83,11 @@ static inline u32 read_tcr0(void)
 ? ? ? ?return val;
 ?}
 
+static inline void write_tcr0(u32 val)
+{
+ ? ? ? asm volatile("mcr p6, 0, %0, c2, c9, 0" : : "r" (val));
+}
+
 ?static inline u32 read_tcr1(void)
 ?{
 ? ? ? ?u32 val;

diff -rupN linux-2.6.31-rc7.arm-iop-1-clocksource/arch/arm/plat-iop/time.c linux-2.6.31-rc7.arm-iop-2-clockevents/arch/arm/plat-iop/time.c

arch/arm/plat-iop/time.c ? ? 2009-08-22 12:07:52.000000000 +0200 renamed from arch/arm/plat-iop/time.c ? ? 2009-08-22 12:06:28.000000000 +0200 +0 -0
@@ -20,6 +20,7 @@

?#include <linux/timex.h>
?#include <linux/io.h>
?#include <linux/clocksource.h>
+#include <linux/clockchips.h>
?#include <mach/hardware.h>
?#include <asm/irq.h>
?#include <asm/uaccess.h>

arch/arm/plat-iop/time.c ? ? 2009-08-22 12:07:52.000000000 +0200 renamed from arch/arm/plat-iop/time.c ? ? 2009-08-22 12:06:28.000000000 +0200 +42 -0
@@ -44,7 +45,63 @@ static struct clocksource iop_clocksourc
 ? ? ? ?.flags ? ? ? ? ?= CLOCK_SOURCE_IS_CONTINUOUS,
 ?};
 
+/*
+ * IOP clockevents (interrupting timer 0).
+ */
+static int iop_set_next_event(unsigned long delta,
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? struct clock_event_device *unused)
+{
+ ? ? ? u32 tmr = IOP_TMR_EN | IOP_TMR_PRIVILEGED
+ ? ? ? ? ? ? ? | IOP_TMR_RELOAD | IOP_TMR_RATIO_1_1;
+
+ ? ? ? BUG_ON(delta == 0);
+ ? ? ? write_tmr0(tmr & ~(IOP_TMR_EN | IOP_TMR_RELOAD));
+ ? ? ? write_tcr0(delta);
+ ? ? ? write_tmr0((tmr & ~IOP_TMR_RELOAD) | IOP_TMR_EN);
+
+ ? ? ? return 0;
+}
+
 ?static unsigned long ticks_per_jiffy;
+
+static void iop_set_mode(enum clock_event_mode mode,
+ ? ? ? ? ? ? ? ? ? ? ? ?struct clock_event_device *unused)
+{
+ ? ? ? u32 tmr = IOP_TMR_EN | IOP_TMR_PRIVILEGED
+ ? ? ? ? ? ? ? | IOP_TMR_RELOAD | IOP_TMR_RATIO_1_1;
+
+ ? ? ? switch (mode) {
+ ? ? ? case CLOCK_EVT_MODE_PERIODIC:
+ ? ? ? ? ? ? ? write_tmr0(tmr & ~IOP_TMR_EN);
+ ? ? ? ? ? ? ? write_tcr0(ticks_per_jiffy - 1);
+ ? ? ? ? ? ? ? tmr |= (IOP_TMR_RELOAD | IOP_TMR_EN);
+ ? ? ? ? ? ? ? break;
+ ? ? ? case CLOCK_EVT_MODE_ONESHOT:
+ ? ? ? ? ? ? ? /* ->set_next_event sets period and enables timer */
+ ? ? ? ? ? ? ? tmr &= ~(IOP_TMR_RELOAD | IOP_TMR_EN);
+ ? ? ? ? ? ? ? break;
+ ? ? ? case CLOCK_EVT_MODE_RESUME:
+ ? ? ? ? ? ? ? tmr |= IOP_TMR_EN;
+ ? ? ? ? ? ? ? break;
+ ? ? ? case CLOCK_EVT_MODE_SHUTDOWN:
+ ? ? ? case CLOCK_EVT_MODE_UNUSED:
+ ? ? ? default:
+ ? ? ? ? ? ? ? tmr &= ~IOP_TMR_EN;
+ ? ? ? ? ? ? ? break;

arch/arm/plat-iop/time.c ? ? 2009-08-22 12:07:52.000000000 +0200 static struct clocksource iop_clocksourc · line 100

Quoted 10 lines
arch/arm/plat-iop/time.c ? ? 2009-08-22 12:07:52.000000000 +0200 renamed from arch/arm/plat-iop/time.c ? ? 2009-08-22 12:06:28.000000000 +0200 +10 -0
+ ? ? ? }
+
+ ? ? ? write_tmr0(tmr);
+}
+
+static struct clock_event_device iop_clockevent = {
+ ? ? ? .name ? ? ? ? ? = "iop_timer0",
+ ? ? ? .features ? ? ? = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
+ ? ? ? .rating ? ? ? ? = 300,
+ ? ? ? .shift ? ? ? ? ?= 20, ? /* ??? crude guesstimate */

Same thing as for clocksource, see
arch/mips/kernel/time.c

Quoted 50 lines
arch/arm/plat-iop/time.c ? ? 2009-08-22 12:07:52.000000000 +0200 renamed from arch/arm/plat-iop/time.c ? ? 2009-08-22 12:06:28.000000000 +0200 +4 -0
+ ? ? ? .set_next_event = iop_set_next_event,
+ ? ? ? .set_mode ? ? ? = iop_set_mode,
+};
+
 ?static unsigned long ticks_per_usec;
 ?static unsigned long next_jiffy_time;
 
@@ -75,13 +132,12 @@ unsigned long iop_gettimeoffset(void)

?static irqreturn_t
?iop_timer_interrupt(int irq, void *dev_id)
?{
+ ? ? ? struct clock_event_device *evt;
+
? ? ? ?write_tisr(1);

- ? ? ? while ((signed long)(next_jiffy_time - read_tcr1())
- ? ? ? ? ? ? ? >= ticks_per_jiffy) {
- ? ? ? ? ? ? ? timer_tick();
- ? ? ? ? ? ? ? next_jiffy_time -= ticks_per_jiffy;
- ? ? ? }
+ ? ? ? evt = &iop_clockevent;
+ ? ? ? evt->event_handler(evt);

? ? ? ?return IRQ_HANDLED;
?}

arch/arm/plat-iop/time.c ? ? 2009-08-22 12:07:52.000000000 +0200 renamed from arch/arm/plat-iop/time.c ? ? 2009-08-22 12:06:28.000000000 +0200 +0 -0
@@ -112,10 +168,20 @@ void __init iop_init_time(unsigned long
 ? ? ? ? ? ? ? ? ? ? ? ?IOP_TMR_RELOAD | IOP_TMR_RATIO_1_1;
 

? ? ? ?/*
- ? ? ? ?* We use timer 0 for our timer interrupt, and timer 1 as
- ? ? ? ?* monotonic counter for tracking missed jiffies.
+ ? ? ? ?* Set up interrupting clockevent timer 0.
? ? ? ? */
+ ? ? ? write_tmr0(timer_ctl & ~IOP_TMR_EN);
+ ? ? ? setup_irq(IRQ_IOP_TIMER0, &iop_timer_irq);
+ ? ? ? iop_clockevent.mult =
+ ? ? ? ? ? ? ? div_sc(tick_rate, NSEC_PER_SEC, iop_clockevent.shift);
+ ? ? ? iop_clockevent.max_delta_ns =
+ ? ? ? ? ? ? ? clockevent_delta2ns(0xfffffffe, &iop_clockevent);
+ ? ? ? iop_clockevent.min_delta_ns =
+ ? ? ? ? ? ? ? clockevent_delta2ns(0xf, &iop_clockevent);
+ ? ? ? iop_clockevent.cpumask = cpumask_of(0);
+ ? ? ? clockevents_register_device(&iop_clockevent);
? ? ? ?write_trr0(ticks_per_jiffy - 1);
+ ? ? ? write_tcr0(ticks_per_jiffy - 1);
? ? ? ?write_tmr0(timer_ctl);

? ? ? ?/*

arch/arm/plat-iop/time.c ? ? 2009-08-22 12:07:52.000000000 +0200 void __init iop_init_time(unsigned long · line 197

Quoted 6 lines
arch/arm/plat-iop/time.c ? ? 2009-08-22 12:07:52.000000000 +0200 renamed from arch/arm/plat-iop/time.c ? ? 2009-08-22 12:06:28.000000000 +0200 +0 -2
@@ -128,6 +194,4 @@ void __init iop_init_time(unsigned long
 ? ? ? ? ? ? ? ?clocksource_hz2mult(tick_rate,
 ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?iop_clocksource.shift);
 ? ? ? ?clocksource_register(&iop_clocksource);
-
- ? ? ? setup_irq(IRQ_IOP_TIMER0, &iop_timer_irq);
 ?}

If this works, why not throw in an implementation of sched_clock() too while you're at it? Look in arch/arm/plat-omap/common.c to see how a simple clocksource can be used for sched_clock(). That will improve the precision of the kernel scheduling.

Eder,
Linus Walleij

#2 lore raw

PATCH 2/3 iop: clockevent support

In reply to Mikael Pettersson

arch/arm/plat-iop/time.c static struct clocksource iop_clocksourc · line 60

Quoted 13 lines · Mikael Pettersson
arch/arm/plat-iop/time.c +13 -0
+/*
+ * IOP clockevents (interrupting timer 0).
+ */
+static int iop_set_next_event(unsigned long delta,
+			      struct clock_event_device *unused)
+{
+	u32 tmr = IOP_TMR_EN | IOP_TMR_PRIVILEGED
+		| IOP_TMR_RELOAD | IOP_TMR_RATIO_1_1;
+
+	BUG_ON(delta == 0);
+	write_tmr0(tmr & ~(IOP_TMR_EN | IOP_TMR_RELOAD));
+	write_tcr0(delta);
+	write_tmr0((tmr & ~IOP_TMR_RELOAD) | IOP_TMR_EN);

Hmm, not sure you should be clearing TMR_RELOAD here. I thought periodic clock events were initialized by a call to set_mode followed by a call to set_next_event.

Quoted 13 lines
arch/arm/plat-iop/time.c +13 -0
+static void iop_set_mode(enum clock_event_mode mode,
+			 struct clock_event_device *unused)
+{
+	u32 tmr = IOP_TMR_EN | IOP_TMR_PRIVILEGED
+		| IOP_TMR_RELOAD | IOP_TMR_RATIO_1_1;
+
+	switch (mode) {
+	case CLOCK_EVT_MODE_PERIODIC:
+		write_tmr0(tmr & ~IOP_TMR_EN);
+		write_tcr0(ticks_per_jiffy - 1);
+		tmr |= (IOP_TMR_RELOAD | IOP_TMR_EN);
+		break;
+	case CLOCK_EVT_MODE_ONESHOT:

arch/arm/plat-iop/time.c static struct clocksource iop_clocksourc · line 89

Quoted 10 lines
arch/arm/plat-iop/time.c +10 -0
+		/* ->set_next_event sets period and enables timer */
+		tmr &= ~(IOP_TMR_RELOAD | IOP_TMR_EN);
+		break;
+	case CLOCK_EVT_MODE_RESUME:
+		tmr |= IOP_TMR_EN;
+		break;
+	case CLOCK_EVT_MODE_SHUTDOWN:
+	case CLOCK_EVT_MODE_UNUSED:
+	default:
+		tmr &= ~IOP_TMR_EN;

Doesn't this result in the clock mode being overwritten upon resume/shutdown? tmr, being a local variable, will always be initialized with IOP_TMR_RELOAD etc.

Quoted 22 lines
arch/arm/plat-iop/time.c +15 -0
+		break;
+	}
+
+	write_tmr0(tmr);
+}
+
+static struct clock_event_device iop_clockevent = {
+	.name		= "iop_timer0",
+	.features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
+	.rating         = 300,
+	.shift		= 20,	/* ??? crude guesstimate */
+	.set_next_event	= iop_set_next_event,
+	.set_mode	= iop_set_mode,
+};
+
 static unsigned long ticks_per_usec;
 static unsigned long next_jiffy_time;
@@ -75,13 +132,12 @@ unsigned long iop_gettimeoffset(void)
 static irqreturn_t
 iop_timer_interrupt(int irq, void *dev_id)
 {

arch/arm/plat-iop/time.c unsigned long iop_gettimeoffset(void) · line 139

Quoted 10 lines
arch/arm/plat-iop/time.c +3 -5
+	struct clock_event_device *evt;
+
 	write_tisr(1);
 
-	while ((signed long)(next_jiffy_time - read_tcr1())
-		>= ticks_per_jiffy) {
-		timer_tick();
-		next_jiffy_time -= ticks_per_jiffy;
-	}
+	evt = &iop_clockevent;

You can use 'dev_id' here, and when registering the interrupt, pass iop_clockevent via the dev_id field in iop_timer_irq.

#3 lore raw

PATCH 2/3 iop: clockevent support

Quoted 10 lines · Russell King - ARM Linux
Quoted 9 lines · Mikael Pettersson
arch/arm/plat-iop/time.c +9 -0
+/*
+ * IOP clockevents (interrupting timer 0).
+ */
+static int iop_set_next_event(unsigned long delta,
+			      struct clock_event_device *unused)
+{
+	u32 tmr = IOP_TMR_EN | IOP_TMR_PRIVILEGED
+		| IOP_TMR_RELOAD | IOP_TMR_RATIO_1_1;
+
Quoted 8 lines

arch/arm/plat-iop/time.c static struct clocksource iop_clocksourc · line 60

Quoted 4 lines
arch/arm/plat-iop/time.c +4 -0
+	BUG_ON(delta == 0);
+	write_tmr0(tmr & ~(IOP_TMR_EN | IOP_TMR_RELOAD));
+	write_tcr0(delta);
+	write_tmr0((tmr & ~IOP_TMR_RELOAD) | IOP_TMR_EN);

Hmm, not sure you should be clearing TMR_RELOAD here. I thought periodic clock events were initialized by a call to set_mode followed by a call to set_next_event.

It's my understanding that ->set_next_event() is only used for ONESHOT events. At least that's what I concluded after studying other implementations like the plat-orion and mach-ixp4xx ones.

But I could be wrong. The clockevents API is very poorly documented, IMO.

Quoted 19 lines
Quoted 19 lines
arch/arm/plat-iop/time.c +19 -0
+static void iop_set_mode(enum clock_event_mode mode,
+			 struct clock_event_device *unused)
+{
+	u32 tmr = IOP_TMR_EN | IOP_TMR_PRIVILEGED
+		| IOP_TMR_RELOAD | IOP_TMR_RATIO_1_1;
+
+	switch (mode) {
+	case CLOCK_EVT_MODE_PERIODIC:
+		write_tmr0(tmr & ~IOP_TMR_EN);
+		write_tcr0(ticks_per_jiffy - 1);
+		tmr |= (IOP_TMR_RELOAD | IOP_TMR_EN);
+		break;
+	case CLOCK_EVT_MODE_ONESHOT:
+		/* ->set_next_event sets period and enables timer */
+		tmr &= ~(IOP_TMR_RELOAD | IOP_TMR_EN);
+		break;
+	case CLOCK_EVT_MODE_RESUME:
+		tmr |= IOP_TMR_EN;
+		break;
Quoted 8 lines

arch/arm/plat-iop/time.c static struct clocksource iop_clocksourc · line 89

Quoted 4 lines
arch/arm/plat-iop/time.c +4 -0
+	case CLOCK_EVT_MODE_SHUTDOWN:
+	case CLOCK_EVT_MODE_UNUSED:
+	default:
+		tmr &= ~IOP_TMR_EN;

Doesn't this result in the clock mode being overwritten upon resume/shutdown? tmr, being a local variable, will always be initialized with IOP_TMR_RELOAD etc.

Correct. For shutdown that shouldn't be a problem. I interpreted 'resume' as resume from suspend-to-ram, which I don't think is supported by plat-iop, so I basically ignored it.

An earlier version of the code used a read_tmr0() function, but I replaced it with a hardcoded value to avoid having to add yet another function to the mach implementation. Also, apart possibly from the resume case, the value written to TMR should only depend on the 'mode' parameter.

I'll reintroduce read_tmr0() and rewrite this function to be more read-modify-write like.

Quoted 8 lines
Quoted 8 lines
arch/arm/plat-iop/time.c +2 -0
@@ -75,13 +132,12 @@ unsigned long iop_gettimeoffset(void)
 static irqreturn_t
 iop_timer_interrupt(int irq, void *dev_id)
 {
+	struct clock_event_device *evt;
+
 	write_tisr(1);
 
Quoted 9 lines

arch/arm/plat-iop/time.c unsigned long iop_gettimeoffset(void) · line 139

Quoted 6 lines
arch/arm/plat-iop/time.c +1 -5
-	while ((signed long)(next_jiffy_time - read_tcr1())
-		>= ticks_per_jiffy) {
-		timer_tick();
-		next_jiffy_time -= ticks_per_jiffy;
-	}
+	evt = &iop_clockevent;

You can use 'dev_id' here, and when registering the interrupt, pass iop_clockevent via the dev_id field in iop_timer_irq.

The implementations I studied don't use that feature, but using the dev_id parameter will be cleaner and faster. Thanks, I'll make that change.

/Mikael