tpm: add kconfig control in tcg2_create_digest()

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

diff --git a/lib/time.c b/lib/time.c
index 65db0f6cda29367c6f4b2eee1666a18a3d578100..d88edafb1962d70653dff76e18b4c52f8aba07f1 100644 (file)
--- a/lib/time.c
+++ b/lib/time.c
@@ -4,39 +4,41 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
+#include <clock_legacy.h>
 #include <bootstage.h>
 #include <dm.h>
 #include <errno.h>
 #include <init.h>
+#include <spl.h>
 #include <time.h>
 #include <timer.h>
 #include <watchdog.h>
 #include <div64.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 
-#ifndef CONFIG_WD_PERIOD
-# define CONFIG_WD_PERIOD      (10 * 1000 * 1000)      /* 10 seconds default */
+#ifndef CFG_WD_PERIOD
+# define CFG_WD_PERIOD (10 * 1000 * 1000)      /* 10 seconds default */
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_SYS_TIMER_RATE
+#ifdef CFG_SYS_TIMER_RATE
 /* Returns tick rate in ticks per second */
 ulong notrace get_tbclk(void)
 {
-       return CONFIG_SYS_TIMER_RATE;
+       return CFG_SYS_TIMER_RATE;
 }
 #endif
 
-#ifdef CONFIG_SYS_TIMER_COUNTER
+#ifdef CFG_SYS_TIMER_COUNTER
 unsigned long notrace timer_read_counter(void)
 {
 #ifdef CONFIG_SYS_TIMER_COUNTS_DOWN
-       return ~readl(CONFIG_SYS_TIMER_COUNTER);
+       return ~readl(CFG_SYS_TIMER_COUNTER);
 #else
-       return readl(CONFIG_SYS_TIMER_COUNTER);
+       return readl(CFG_SYS_TIMER_COUNTER);
 #endif
 }
 
@@ -44,12 +46,15 @@ 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;
+#ifdef CFG_SYS_TIMER_RATE
+       const ulong timer_rate = CFG_SYS_TIMER_RATE;
+
+       if (timer_rate == 1000000)
+               return count;
+       else if (timer_rate > 1000000)
+               return lldiv(count, timer_rate / 1000000);
+       else
+               return (unsigned long long)count * 1000000 / timer_rate;
 #else
        /* Assume the counter is in microseconds */
        return count;
@@ -57,22 +62,21 @@ ulong timer_get_boot_us(void)
 }
 
 #else
-extern unsigned long __weak timer_read_counter(void);
+extern unsigned long timer_read_counter(void);
 #endif
 
 #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;
 
+               if (IS_ENABLED(CONFIG_TIMER_EARLY))
+                       return timer_early_get_rate();
+
                ret = dm_timer_init();
                if (ret)
                        return ret;
-#endif
        }
 
        return timer_get_rate(gd->timer);
@@ -84,20 +88,24 @@ uint64_t notrace get_ticks(void)
        int ret;
 
        if (!gd->timer) {
-#ifdef CONFIG_TIMER_EARLY
-               return timer_early_get_count();
-#else
                int ret;
 
+               if (IS_ENABLED(CONFIG_TIMER_EARLY))
+                       return timer_early_get_count();
+
                ret = dm_timer_init();
                if (ret)
-                       return ret;
-#endif
+                       panic("Could not initialize timer (err %d)\n", ret);
        }
 
        ret = timer_get_count(gd->timer, &count);
-       if (ret)
-               return ret;
+       if (ret) {
+               if (xpl_phase() > PHASE_TPL)
+                       panic("Could not read count from timer (err %d)\n",
+                             ret);
+               else
+                       panic("no timer (err %d)\n", ret);
+       }
 
        return count;
 }
@@ -152,6 +160,11 @@ uint64_t __weak get_timer_us(uint64_t base)
        return tick_to_time_us(get_ticks()) - base;
 }
 
+unsigned long __weak get_timer_us_long(unsigned long base)
+{
+       return timer_get_us() - base;
+}
+
 unsigned long __weak notrace timer_get_us(void)
 {
        return tick_to_time(get_ticks() * 1000);
@@ -182,8 +195,8 @@ void udelay(unsigned long usec)
        ulong kv;
 
        do {
-               WATCHDOG_RESET();
-               kv = usec > CONFIG_WD_PERIOD ? CONFIG_WD_PERIOD : usec;
+               schedule();
+               kv = usec > CFG_WD_PERIOD ? CFG_WD_PERIOD : usec;
                __udelay(kv);
                usec -= kv;
        } while(usec);