Fix coverity warning / legitimate minor bug

[vpp.git] / src / vppinfra / time.h

diff --git a/src/vppinfra/time.h b/src/vppinfra/time.h
index 288922d..39bc188 100644 (file)
--- a/src/vppinfra/time.h
+++ b/src/vppinfra/time.h
@@ -114,6 +114,16 @@ clib_cpu_time_now (void)
   return (u64) lo + ((u64) hi2 << (u64) 32);
 }
 
+#elif defined (__aarch64__)
+always_inline u64
+clib_cpu_time_now (void)
+{
+  u64 vct;
+  /* User access to cntvct_el0 is enabled in Linux kernel since 3.12. */
+  asm volatile ("mrs %0, cntvct_el0":"=r" (vct));
+  return vct;
+}
+
 #elif defined (__arm__)
 #if defined(__ARM_ARCH_8A__)
 always_inline u64
@@ -164,18 +174,6 @@ clib_cpu_time_now (void)
   return ((u64) h << 32) | l;
 }
 
-#elif defined (__aarch64__)
-always_inline u64
-clib_cpu_time_now (void)
-{
-  u64 tsc;
-
-  /* Works on Cavium ThunderX. Other platforms: YMMV */
-  asm volatile ("mrs %0, cntvct_el0":"=r" (tsc));
-
-  return tsc;
-}
-
 #else
 #error "don't know how to read CPU time stamp"
 
@@ -198,6 +196,9 @@ clib_time_now_internal (clib_time_t * c, u64 n)
   return t * c->seconds_per_clock;
 }
 
+/* Maximum f64 value as max clib_time */
+#define CLIB_TIME_MAX (1.7976931348623157e+308)
+
 always_inline f64
 clib_time_now (clib_time_t * c)
 {