mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-01-19 17:23:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

sh: Fix overflow problem in get_ticks

Browse Source 
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
This commit is contained in:
Nobuhiro Iwamatsu 2010-06-16 08:10:21 +09:00
parent 8d1f63554b
commit 61973afc59
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/sh/lib/time.c
View File

@ -2,7 +2,7 @@
* (C) Copyright 2009 * (C) Copyright 2009
* Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> * Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
* *
* (C) Copyright 2007-2008 * (C) Copyright 2007-2010
* Nobobuhiro Iwamatsu <iwamatsu@nigauri.org> * Nobobuhiro Iwamatsu <iwamatsu@nigauri.org>
* *
* (C) Copyright 2003 * (C) Copyright 2003
@ -36,6 +36,8 @@
#define TMU_MAX_COUNTER (~0UL) #define TMU_MAX_COUNTER (~0UL)
static ulong timer_freq; static ulong timer_freq;
static unsigned long last_tcnt;
static unsigned long long overflow_ticks;
static inline unsigned long long tick_to_time(unsigned long long tick) static inline unsigned long long tick_to_time(unsigned long long tick)
{ {
@ -97,12 +99,26 @@ int timer_init (void)
tmu_timer_stop(0); tmu_timer_stop(0);
tmu_timer_start(0); tmu_timer_start(0);
last_tcnt = 0;
overflow_ticks = 0;
return 0; return 0;
} }
unsigned long long get_ticks (void) unsigned long long get_ticks (void)
{ {
return 0 - readl(TCNT0); unsigned long tcnt = 0 - readl(TCNT0);
unsigned long ticks;
if (last_tcnt > tcnt) { /* overflow */
overflow_ticks++;
ticks = (0xffffffff - last_tcnt) + tcnt;
} else {
ticks = tcnt;
}
last_tcnt = tcnt;
return (overflow_ticks << 32) | tcnt;
} }
void __udelay (unsigned long usec) void __udelay (unsigned long usec)