Merge tag 'xilinx-fixes-for-v2017.11' of git://www.denx.de/git/u-boot-microblaze

[people/ms/u-boot.git] / lib / time.c

diff --git a/lib/time.c b/lib/time.c
index 68b8ff4190733a3e86edbcef4197bd9669565c2b..aed1a091f27971a6aa0004b4c671f4c5c2069294 100644 (file)
--- a/lib/time.c
+++ b/lib/time.c
@@ -6,12 +6,158 @@
  */
 
 #include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <timer.h>
 #include <watchdog.h>
+#include <div64.h>
+#include <asm/io.h>
 
 #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;
+}
+#endif
+
+#ifdef CONFIG_SYS_TIMER_COUNTER
+unsigned long notrace timer_read_counter(void)
+{
+#ifdef CONFIG_SYS_TIMER_COUNTS_DOWN
+       return ~readl(CONFIG_SYS_TIMER_COUNTER);
+#else
+       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
+
+#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();
+
+       /* increment tbu if tbl has rolled over */
+       if (now < gd->timebase_l)
+               gd->timebase_h++;
+       gd->timebase_l = now;
+       return ((uint64_t)gd->timebase_h << 32) | gd->timebase_l;
+}
+
+#endif /* CONFIG_TIMER */
+
+/* Returns time in milliseconds */
+static uint64_t notrace tick_to_time(uint64_t tick)
+{
+       ulong div = get_tbclk();
+
+       tick *= CONFIG_SYS_HZ;
+       do_div(tick, div);
+       return tick;
+}
+
+int __weak timer_init(void)
+{
+       return 0;
+}
+
+/* Returns time in milliseconds */
+ulong __weak get_timer(ulong base)
+{
+       return tick_to_time(get_ticks()) - base;
+}
+
+unsigned long __weak notrace timer_get_us(void)
+{
+       return tick_to_time(get_ticks() * 1000);
+}
+
+static uint64_t usec_to_tick(unsigned long usec)
+{
+       uint64_t tick = usec;
+       tick *= get_tbclk();
+       do_div(tick, 1000000);
+       return tick;
+}
+
+void __weak __udelay(unsigned long usec)
+{
+       uint64_t tmp;
+
+       tmp = get_ticks() + usec_to_tick(usec); /* get current timestamp */
+
+       while (get_ticks() < tmp+1)     /* loop till event */
+                /*NOP*/;
+}
+
 /* ------------------------------------------------------------------------- */
 
 void udelay(unsigned long usec)
@@ -25,9 +171,3 @@ void udelay(unsigned long usec)
                usec -= kv;
        } while(usec);
 }
-
-void mdelay(unsigned long msec)
-{
-       while (msec--)
-               udelay(1000);
-}