X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=blobdiff_plain;f=lib%2Ftime.c;h=aed1a091f27971a6aa0004b4c671f4c5c2069294;hp=73c3b6ad7ff4503c3b485dbdab091601575e3a12;hb=85447f785ce8c0ab8e40850dc457a1fc833d224f;hpb=e97f9d817e600cd6f43d1d0da76f5787e33a5c56

diff --git a/lib/time.c b/lib/time.c
index 73c3b6ad7f..aed1a091f2 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -6,21 +6,21 @@
  */
 
 #include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <timer.h>
 #include <watchdog.h>
 #include <div64.h>
 #include <asm/io.h>
 
-#if CONFIG_SYS_HZ != 1000
-#warning "CONFIG_SYS_HZ must be 1000 and should not be defined by platforms"
-#endif
-
 #ifndef CONFIG_WD_PERIOD
-# define CONFIG_WD_PERIOD	(10 * 1000 * 1000)	/* 10 seconds default*/
+# define CONFIG_WD_PERIOD	(10 * 1000 * 1000)	/* 10 seconds default */
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_SYS_TIMER_RATE
+/* Returns tick rate in ticks per second */
 ulong notrace get_tbclk(void)
 {
 	return CONFIG_SYS_TIMER_RATE;
@@ -36,11 +36,72 @@ unsigned long notrace timer_read_counter(void)
 	return readl(CONFIG_SYS_TIMER_COUNTER);
 #endif
 }
+
+ulong timer_get_boot_us(void)
+{
+	ulong count = timer_read_counter();
+
+#if CONFIG_SYS_TIMER_RATE == 1000000
+	return count;
+#elif CONFIG_SYS_TIMER_RATE > 1000000
+	return lldiv(count, CONFIG_SYS_TIMER_RATE / 1000000);
+#elif defined(CONFIG_SYS_TIMER_RATE)
+	return (unsigned long long)count * 1000000 / CONFIG_SYS_TIMER_RATE;
+#else
+	/* Assume the counter is in microseconds */
+	return count;
+#endif
+}
+
 #else
 extern unsigned long __weak timer_read_counter(void);
 #endif
 
-unsigned long long __weak notrace get_ticks(void)
+#ifdef CONFIG_TIMER
+ulong notrace get_tbclk(void)
+{
+	if (!gd->timer) {
+#ifdef CONFIG_TIMER_EARLY
+		return timer_early_get_rate();
+#else
+		int ret;
+
+		ret = dm_timer_init();
+		if (ret)
+			return ret;
+#endif
+	}
+
+	return timer_get_rate(gd->timer);
+}
+
+uint64_t notrace get_ticks(void)
+{
+	u64 count;
+	int ret;
+
+	if (!gd->timer) {
+#ifdef CONFIG_TIMER_EARLY
+		return timer_early_get_count();
+#else
+		int ret;
+
+		ret = dm_timer_init();
+		if (ret)
+			return ret;
+#endif
+	}
+
+	ret = timer_get_count(gd->timer, &count);
+	if (ret)
+		return ret;
+
+	return count;
+}
+
+#else /* !CONFIG_TIMER */
+
+uint64_t __weak notrace get_ticks(void)
 {
 	unsigned long now = timer_read_counter();
 
@@ -48,12 +109,15 @@ unsigned long long __weak notrace get_ticks(void)
 	if (now < gd->timebase_l)
 		gd->timebase_h++;
 	gd->timebase_l = now;
-	return ((unsigned long long)gd->timebase_h << 32) | gd->timebase_l;
+	return ((uint64_t)gd->timebase_h << 32) | gd->timebase_l;
 }
 
-static unsigned long long notrace tick_to_time(uint64_t tick)
+#endif /* CONFIG_TIMER */
+
+/* Returns time in milliseconds */
+static uint64_t notrace tick_to_time(uint64_t tick)
 {
-	unsigned int div = get_tbclk();
+	ulong div = get_tbclk();
 
 	tick *= CONFIG_SYS_HZ;
 	do_div(tick, div);
@@ -65,6 +129,7 @@ int __weak timer_init(void)
 	return 0;
 }
 
+/* Returns time in milliseconds */
 ulong __weak get_timer(ulong base)
 {
 	return tick_to_time(get_ticks()) - base;
@@ -74,7 +139,8 @@ unsigned long __weak notrace timer_get_us(void)
 {
 	return tick_to_time(get_ticks() * 1000);
 }
-static unsigned long long usec_to_tick(unsigned long usec)
+
+static uint64_t usec_to_tick(unsigned long usec)
 {
 	uint64_t tick = usec;
 	tick *= get_tbclk();
@@ -84,13 +150,11 @@ static unsigned long long usec_to_tick(unsigned long usec)
 
 void __weak __udelay(unsigned long usec)
 {
-	unsigned long long tmp;
-	ulong tmo;
+	uint64_t tmp;
 
-	tmo = usec_to_tick(usec);
-	tmp = get_ticks() + tmo;	/* get current timestamp */
+	tmp = get_ticks() + usec_to_tick(usec);	/* get current timestamp */
 
-	while (get_ticks() < tmp)	/* loop till event */
+	while (get_ticks() < tmp+1)	/* loop till event */
 		 /*NOP*/;
 }
 
@@ -107,9 +171,3 @@ void udelay(unsigned long usec)
 		usec -= kv;
 	} while(usec);
 }
-
-void mdelay(unsigned long msec)
-{
-	while (msec--)
-		udelay(1000);
-}