summaryrefslogtreecommitdiffstats
path: root/src/vppinfra/time.h
diff options
context:
space:
mode:
authorBrian Brooks <brian.brooks@arm.com>2018-01-09 16:39:07 -0600
committerDamjan Marion <dmarion.lists@gmail.com>2018-01-30 13:23:31 +0000
commitc0379aec241c78fe07074fa7e63a5009a4e7944a (patch)
tree2a217cbdc9b65a89b9b6c68d20b6548d36649c3e /src/vppinfra/time.h
parentbc39e3470c04af56bc45756585b848cd448b990b (diff)
Arm system counter cleanup
Add some description and cleanup code that uses Arm system counter. Change-Id: Ie1fe00e3e4b5d98867617b7b0184ac526e333c53 Signed-off-by: Brian Brooks <brian.brooks@arm.com>
Diffstat (limited to 'src/vppinfra/time.h')
-rw-r--r--src/vppinfra/time.h22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/vppinfra/time.h b/src/vppinfra/time.h
index 288922d8a83..ead4b7d8ea4 100644
--- 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"