Skip to contentSkip to conversation

xtensa generic time

PATCH In review Johannes Weiner 3 participants 8 messages Mar 3, 2009 – Mar 4, 2009 Tensilica Xtensa port (xtensa)

lore
Share & tools
lore
#0 lore raw

cover xtensa generic time

Hi,

here are three patches that convert the xtensa arch code to make use of the generic time implementation.

The first one just removes xtensa's sched_clock() in order to use the default implementation as it is the same thing.

The second one removes the platform-specific rtc get/set callbacks, the interface is not really feasible for the generic time implementation. Currently, no platform implements this callback. Platforms that want to should implement a rtc driver and read_persistent_clock().

The third one converts xtensa to use generic time code by implementing ccount as a clocksource. This lets us get rid of xtensa-specific gtod/stod as now the generic time code is used for that.

Hannes

 arch/xtensa/Kconfig                |    3 +
 arch/xtensa/include/asm/platform.h |   11 ---
 arch/xtensa/kernel/platform.c      |    2 -
 arch/xtensa/kernel/time.c          |  120 +++++-------------------------------
 4 files changed, 19 insertions(+), 117 deletions(-)
#1 lore raw

PATCH 1/3 xtensa: use generic sched_clock()

From: Johannes Weiner <[email protected]>

Current xtensa implementation of sched_clock() is the same as the generic one. Just remove it, the weak symbol in kernel/sched_clock.c will be used instead.

---
 arch/xtensa/kernel/time.c |    9 ---------
 1 file changed, 9 deletions(-)
arch/xtensa/kernel/time.c +0 -9
@@ -37,15 +37,6 @@ unsigned long nsec_per_ccount;		/* nsec 
 
 static long last_rtc_update = 0;
 
-/*
- * Scheduler clock - returns current tim in nanosec units.
- */
-
-unsigned long long sched_clock(void)
-{
-	return (unsigned long long)jiffies * (1000000000 / HZ);
-}
-
 static irqreturn_t timer_interrupt(int irq, void *dev_id);
 static struct irqaction timer_irqaction = {
 	.handler =	timer_interrupt,
#2 lore raw

PATCH 2/3 xtensa: remove platform rtc hooks

In reply to Johannes Weiner

From: Johannes Weiner <[email protected]>

platform_get/set_rtc_time() is not implemented by any of the supported xtensa platforms. Remove the facility completely.

The initial seconds for xtime come from read_persistent_clock() which returns just 0 in the generic implementation. Platforms that sport a persistent clock can implement this function.

This is needed to implement the ccount register as a clock source.

---
 arch/xtensa/include/asm/platform.h |   11 -----------
 arch/xtensa/kernel/platform.c      |    2 --
 arch/xtensa/kernel/time.c          |   29 +----------------------------
 3 files changed, 1 insertion(+), 41 deletions(-)
arch/xtensa/kernel/time.c +1 -28
@@ -14,7 +14,6 @@
 
 #include <linux/errno.h>
 #include <linux/time.h>
-#include <linux/timex.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -25,18 +24,11 @@
 #include <asm/timex.h>
 #include <asm/platform.h>
 
-
-DEFINE_SPINLOCK(rtc_lock);
-EXPORT_SYMBOL(rtc_lock);
-
-
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 unsigned long ccount_per_jiffy;		/* per 1/HZ */
 unsigned long nsec_per_ccount;		/* nsec per ccount increment */
 #endif
 
-static long last_rtc_update = 0;
-
 static irqreturn_t timer_interrupt(int irq, void *dev_id);
 static struct irqaction timer_irqaction = {
 	.handler =	timer_interrupt,
@@ -46,8 +38,6 @@ static struct irqaction timer_irqaction 
 
 void __init time_init(void)
 {
-	time_t sec_o, sec_n = 0;
-
 	/* The platform must provide a function to calibrate the processor
 	 * speed for the CALIBRATE.
 	 */
@@ -59,15 +49,8 @@ void __init time_init(void)
 			(int)(ccount_per_jiffy/(10000/HZ))%100);
 #endif
 
-	/* Set time from RTC (if provided) */
-
-	if (platform_get_rtc_time(&sec_o) == 0)
-		while (platform_get_rtc_time(&sec_n))
-			if (sec_o != sec_n)
-				break;
-
 	xtime.tv_nsec = 0;
-	last_rtc_update = xtime.tv_sec = sec_n;
+	xtime.tv_sec = read_persistent_clock();
 
 	set_normalized_timespec(&wall_to_monotonic,
 		-xtime.tv_sec, -xtime.tv_nsec);
@@ -169,16 +152,6 @@ again:
 		next += CCOUNT_PER_JIFFY;
 		set_linux_timer(next);
 
-		if (ntp_synced() &&
-		    xtime.tv_sec - last_rtc_update >= 659 &&
-		    abs((xtime.tv_nsec/1000)-(1000000-1000000/HZ))<5000000/HZ) {
-
-			if (platform_set_rtc_time(xtime.tv_sec+1) == 0)
-				last_rtc_update = xtime.tv_sec+1;
-			else
-				/* Do it again in 60 s */
-				last_rtc_update += 60;
-		}
 		write_sequnlock(&xtime_lock);
 	}
 
arch/xtensa/include/asm/platform.h +0 -11
@@ -74,16 +74,5 @@ extern int platform_pcibios_fixup (void)
  */
 extern void platform_calibrate_ccount (void);
 
-/*
- * platform_get_rtc_time returns RTC seconds (returns 0 for no error)
- */
-extern int platform_get_rtc_time(time_t*);
-
-/*
- * platform_set_rtc_time set RTC seconds (returns 0 for no error)
- */
-extern int platform_set_rtc_time(time_t);
-
-
 #endif	/* _XTENSA_PLATFORM_H */
 
arch/xtensa/kernel/platform.c +0 -2
@@ -36,8 +36,6 @@ _F(void, power_off, (void), { while(1); 
 _F(void, idle, (void), { __asm__ __volatile__ ("waiti 0" ::: "memory"); });
 _F(void, heartbeat, (void), { });
 _F(int,  pcibios_fixup, (void), { return 0; });
-_F(int, get_rtc_time, (time_t* t), { return 0; });
-_F(int, set_rtc_time, (time_t t), { return 0; });
 
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 _F(void, calibrate_ccount, (void),
#3 lore raw

PATCH 3/3 xtensa: ccount clocksource

In reply to Johannes Weiner

From: Johannes Weiner <[email protected]>

Switch to GENERIC_TIME by using the ccount register as a clock source.

---
 arch/xtensa/Kconfig       |    3 +
 arch/xtensa/kernel/time.c |   92 ++++++++++------------------------------------
 2 files changed, 23 insertions(+), 72 deletions(-)
arch/xtensa/Kconfig +3 -0
@@ -45,6 +45,9 @@ config HZ
 	int
 	default 100
 
+config GENERIC_TIME
+	def_bool y
+
 source "init/Kconfig"
 source "kernel/Kconfig.freezer"
 
arch/xtensa/kernel/time.c +20 -72

122 lines not on this page · raw message

#4 lore raw

Re: [patch 3/3] xtensa: ccount clocksource

Quoted 7 lines · Johannes Weiner

@ -29,6 +30,19 @@ unsigned long ccount_per_jiffy; /* per
unsigned long nsec_per_ccount; /* nsec per ccount increment
*/
#endif

arch/xtensa/kernel/time.c +2 -0
+static cycle_t ccount_read(void)
+{

arch/xtensa/kernel/time.c unsigned long ccount_per_jiffy; /* per · line 44

Quoted 10 lines
arch/xtensa/kernel/time.c +10 -0
+       return (cycle_t)get_ccount();
+}
+
+static struct clocksource ccount_clocksource = {
+       .name = "ccount",
+       .rating = 200,
+       .read = ccount_read,
+       .mask = CLOCKSOURCE_MASK(32),
+       .mult = NSEC_PER_CCOUNT,
+};

You don't want to use the shift field?

Daniel

#5 lore raw

Re: [patch 3/3] xtensa: ccount clocksource

Quoted 6 lines · Daniel Walker
Quoted 5 lines · Johannes Weiner

@ -29,6 +30,19 @@ unsigned long ccount_per_jiffy; /* per
unsigned long nsec_per_ccount; /* nsec per ccount increment
*/
#endif

Quoted 14 lines

arch/xtensa/kernel/time.c unsigned long ccount_per_jiffy; /* per · line 44

Quoted 12 lines
arch/xtensa/kernel/time.c +12 -0
+static cycle_t ccount_read(void)
+{
+       return (cycle_t)get_ccount();
+}
+
+static struct clocksource ccount_clocksource = {
+       .name = "ccount",
+       .rating = 200,
+       .read = ccount_read,
+       .mask = CLOCKSOURCE_MASK(32),
+       .mult = NSEC_PER_CCOUNT,
+};

You don't want to use the shift field?

Thanks for pointing it out.

To make sure I understood this:

If shift is 0, then a walltime adjustment would be done in 1/2^0 steps, meaning an adjustment of counting one nanosecond more or less per ccount.

To give this a finer granularity and smooth out adjustments, the shift should be a trade-off between too much adjustment and no adjustment progress in a sane amount of time (and, of course, to stay within bounds of the used type).

Does that make sense?

I found a patch of yours that introduced clocksource_hz2shift() but it seems it hasn't been merged (yet). Is it yet to get integrated?

Thanks in advance,

Hannes

#6 lore raw

Re: [patch 3/3] xtensa: ccount clocksource

Quoted 22 lines · Johannes Weiner
Quoted 6 lines · Daniel Walker
Quoted 5 lines · Johannes Weiner

@ -29,6 +30,19 @@ unsigned long ccount_per_jiffy; /* per
unsigned long nsec_per_ccount; /* nsec per ccount increment
*/
#endif

Quoted 14 lines

arch/xtensa/kernel/time.c unsigned long ccount_per_jiffy; /* per · line 44

Quoted 12 lines
arch/xtensa/kernel/time.c +12 -0
+static cycle_t ccount_read(void)
+{
+       return (cycle_t)get_ccount();
+}
+
+static struct clocksource ccount_clocksource = {
+       .name = "ccount",
+       .rating = 200,
+       .read = ccount_read,
+       .mask = CLOCKSOURCE_MASK(32),
+       .mult = NSEC_PER_CCOUNT,
+};

You don't want to use the shift field?

Quoted 7 lines

Thanks for pointing it out.

To make sure I understood this:

If shift is 0, then a walltime adjustment would be done in 1/2^0 steps, meaning an adjustment of counting one nanosecond more or less per ccount.

The shift and mult are just used to convert your cycle counters current count into nanoseconds .. I'm not sure how much a zero shift would degrade the conversion to nanoseconds for your cycles counter tho. So it could be along the lines of what your suggesting above.

Quoted 6 lines

To give this a finer granularity and smooth out adjustments, the shift should be a trade-off between too much adjustment and no adjustment progress in a sane amount of time (and, of course, to stay within bounds of the used type).

Does that make sense?

I don't really look at it in terms of walltime adjustments. The actual frequency of kernel time adjustments isn't defined in the clocksource structure AFAIK. From my experience you just want the clocksource to produce the most accurate nanosecond value your hardware can provide , which would mean setting the shift as high as is safe for your hardware.

I added John Stultz to the CC so he could comment further if he cares too.

Quoted 2 lines

I found a patch of yours that introduced clocksource_hz2shift() but it seems it hasn't been merged (yet). Is it yet to get integrated?

I've been meaning to update it, but haven't gotten around to it. If you know the input values you can run that function once just to produce a shift which you define statically in the clocksource structure. Then use that shift value with the other helper clocksource_hz2mult() to produce a mult value.

Daniel

#7 lore raw

Re: [patch 3/3] xtensa: ccount clocksource

Quoted 52 lines · Daniel Walker
Quoted 22 lines · Johannes Weiner
Quoted 6 lines · Daniel Walker
Quoted 5 lines · Johannes Weiner

@ -29,6 +30,19 @@ unsigned long ccount_per_jiffy; /* per
unsigned long nsec_per_ccount; /* nsec per ccount increment
*/
#endif

Quoted 14 lines

Review

Quoted 12 lines
(quoted diff) +12 -0
+static cycle_t ccount_read(void)
+{
+       return (cycle_t)get_ccount();
+}
+
+static struct clocksource ccount_clocksource = {
+       .name = "ccount",
+       .rating = 200,
+       .read = ccount_read,
+       .mask = CLOCKSOURCE_MASK(32),
+       .mult = NSEC_PER_CCOUNT,
+};

You don't want to use the shift field?

Quoted 7 lines

Thanks for pointing it out.

To make sure I understood this:

If shift is 0, then a walltime adjustment would be done in 1/2^0 steps, meaning an adjustment of counting one nanosecond more or less per ccount.

The shift and mult are just used to convert your cycle counters current count into nanoseconds .. I'm not sure how much a zero shift would degrade the conversion to nanoseconds for your cycles counter tho. So it could be along the lines of what your suggesting above.

Quoted 6 lines

To give this a finer granularity and smooth out adjustments, the shift should be a trade-off between too much adjustment and no adjustment progress in a sane amount of time (and, of course, to stay within bounds of the used type).

Does that make sense?

I don't really look at it in terms of walltime adjustments. The actual frequency of kernel time adjustments isn't defined in the clocksource structure AFAIK. From my experience you just want the clocksource to produce the most accurate nanosecond value your hardware can provide , which would mean setting the shift as high as is safe for your hardware.

I added John Stultz to the CC so he could comment further if he cares too.

Quoted 8 lines
Quoted 2 lines

I found a patch of yours that introduced clocksource_hz2shift() but it seems it hasn't been merged (yet). Is it yet to get integrated?

I've been meaning to update it, but haven't gotten around to it. If you know the input values you can run that function once just to produce a shift which you define statically in the clocksource structure. Then use that shift value with the other helper clocksource_hz2mult() to produce a mult value.

Ok, here is version 2. The shift now limits the CPU clock to a minimum of 1 MHz, comment in the code. I think the trade-off should be okay. John? Chris?

---
Subject: xtensa: ccount clocksource

From: Johannes Weiner <[email protected]>

Switch to GENERIC_TIME by using the ccount register as a clock source.

---
 arch/xtensa/Kconfig       |    3 +
 arch/xtensa/kernel/time.c |  103 +++++++++++++---------------------------------
 2 files changed, 33 insertions(+), 73 deletions(-)
arch/xtensa/Kconfig +3 -0
@@ -48,6 +48,9 @@ config HZ
 	int
 	default 100
 
+config GENERIC_TIME
+	def_bool y
+
 source "init/Kconfig"
 source "kernel/Kconfig.freezer"
 
arch/xtensa/kernel/time.c +30 -73

136 lines not on this page · raw message