X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Ftime.c;h=1626ff4ed386be3057f709e173a6280827c342d4;hb=915899a827968d4d6534ddb09e3797a58771f922;hp=2bdb9da4b3941fc1240e336c444b32ee9c1cc401;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vppinfra/time.c b/src/vppinfra/time.c
index 2bdb9da4b39..1626ff4ed38 100644
--- a/src/vppinfra/time.c
+++ b/src/vppinfra/time.c
@@ -91,7 +91,7 @@ clock_frequency_from_proc_filesystem (void)
   if (fd < 0)
     return cpu_freq;
 
-  unformat_init_unix_file (&input, fd);
+  unformat_init_clib_file (&input, fd);
 
   ppc_timebase = 0;
   while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
@@ -130,7 +130,7 @@ clock_frequency_from_sys_filesystem (void)
   if (fd < 0)
     goto done;
 
-  unformat_init_unix_file (&input, fd);
+  unformat_init_clib_file (&input, fd);
   unformat (&input, "%f", &cpu_freq);
   cpu_freq *= 1e3;		/* measured in kHz */
   unformat_free (&input);
@@ -142,6 +142,15 @@ done:
 f64
 os_cpu_clock_frequency (void)
 {
+#if defined (__aarch64__)
+  /* The system counter increments at a fixed frequency. It is distributed
+   * to each core which has registers for reading the current counter value
+   * as well as the clock frequency. The system counter is not clocked at
+   * the same frequency as the core. */
+  u32 hz;
+  asm volatile ("mrs %0, cntfrq_el0":"=r" (hz));
+  return (f64) hz;
+#endif
   f64 cpu_freq;
 
   if (clib_cpu_supports_invariant_tsc ())