Merge tag 'u-boot-imx-20200623' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / lib / time.c

diff --git a/lib/time.c b/lib/time.c
index c7b026498be67e28f02cf070acf73a43e3c18ad4..65db0f6cda29367c6f4b2eee1666a18a3d578100 100644 (file)
--- a/lib/time.c
+++ b/lib/time.c
@@ -1,18 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2009
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <bootstage.h>
+#include <dm.h>
+#include <errno.h>
+#include <init.h>
+#include <time.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
+#include <linux/delay.h>
 
 #ifndef CONFIG_WD_PERIOD
 # define CONFIG_WD_PERIOD      (10 * 1000 * 1000)      /* 10 seconds default */
@@ -37,11 +39,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)
+#if CONFIG_IS_ENABLED(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();
 
@@ -49,11 +112,13 @@ 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;
 }
 
+#endif /* CONFIG_TIMER */
+
 /* Returns time in milliseconds */
-static unsigned long long notrace tick_to_time(unsigned long long tick)
+static uint64_t notrace tick_to_time(uint64_t tick)
 {
        ulong div = get_tbclk();
 
@@ -73,14 +138,28 @@ ulong __weak get_timer(ulong base)
        return tick_to_time(get_ticks()) - base;
 }
 
+static uint64_t notrace tick_to_time_us(uint64_t tick)
+{
+       ulong div = get_tbclk() / 1000;
+
+       tick *= CONFIG_SYS_HZ;
+       do_div(tick, div);
+       return tick;
+}
+
+uint64_t __weak get_timer_us(uint64_t base)
+{
+       return tick_to_time_us(get_ticks()) - base;
+}
+
 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)
+uint64_t usec_to_tick(unsigned long usec)
 {
-       unsigned long long tick = usec;
+       uint64_t tick = usec;
        tick *= get_tbclk();
        do_div(tick, 1000000);
        return tick;
@@ -88,7 +167,7 @@ static unsigned long long usec_to_tick(unsigned long usec)
 
 void __weak __udelay(unsigned long usec)
 {
-       unsigned long long tmp;
+       uint64_t tmp;
 
        tmp = get_ticks() + usec_to_tick(usec); /* get current timestamp */
 
@@ -105,13 +184,7 @@ void udelay(unsigned long usec)
        do {
                WATCHDOG_RESET();
                kv = usec > CONFIG_WD_PERIOD ? CONFIG_WD_PERIOD : usec;
-               __udelay (kv);
+               __udelay(kv);
                usec -= kv;
        } while(usec);
 }
-
-void mdelay(unsigned long msec)
-{
-       while (msec--)
-               udelay(1000);
-}