diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 7afdbf6202..92d87b441d 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -353,7 +353,7 @@ noinst_HEADERS += arch/arm/odp_atomic.h \
 endif
 if ARCH_IS_AARCH64
 __LIB__libodp_linux_la_SOURCES += arch/aarch64/odp_atomic.c \
-				  arch/default/odp_cpu_cycles.c \
+				  arch/aarch64/odp_cpu_cycles.c \
 				  arch/aarch64/cpu_flags.c \
 				  arch/default/odp_hash_crc32.c \
 				  arch/default/odp_random.c \
diff --git a/platform/linux-generic/arch/aarch64/odp/api/abi/cpu_inlines.h b/platform/linux-generic/arch/aarch64/odp/api/abi/cpu_inlines.h
index bf44806a05..a26908e666 100644
--- a/platform/linux-generic/arch/aarch64/odp/api/abi/cpu_inlines.h
+++ b/platform/linux-generic/arch/aarch64/odp/api/abi/cpu_inlines.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 2016-2018, Linaro Limited
- * Copyright (c) 2021, Nokia
+ * Copyright (c) 2021-2023, Nokia
  * All rights reserved.
  *
  * SPDX-License-Identifier:     BSD-3-Clause
@@ -12,6 +12,22 @@
 extern "C" {
 #endif
 
+#include <odp/api/abi/time_cpu.h>
+
+#include <stdint.h>
+
+/* CPU frequency is shifted to decrease integer division error */
+#define _ODP_CPU_FREQ_SHIFT 16
+
+typedef struct _odp_cpu_cycles_global_t {
+	uint64_t res;
+	uint64_t res_shifted;
+	uint64_t max;
+
+} _odp_cpu_cycles_global_t;
+
+extern _odp_cpu_cycles_global_t _odp_cpu_cycles_glob;
+
 static inline void _odp_cpu_pause(void)
 {
 	/* YIELD hints the CPU to switch to another thread if possible
@@ -22,8 +38,20 @@ static inline void _odp_cpu_pause(void)
 	__asm volatile("isb" ::: "memory");
 }
 
-/* Use generic implementations for the rest of the functions */
-#include <odp/api/abi/cpu_generic.h>
+static inline uint64_t _odp_cpu_cycles(void)
+{
+	return (_odp_time_cpu_global() * _odp_cpu_cycles_glob.res_shifted) >> _ODP_CPU_FREQ_SHIFT;
+}
+
+static inline  uint64_t _odp_cpu_cycles_resolution(void)
+{
+	return _odp_cpu_cycles_glob.res;
+}
+
+static inline  uint64_t _odp_cpu_cycles_max(void)
+{
+	return _odp_cpu_cycles_glob.max;
+}
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/arch/aarch64/odp_cpu_cycles.c b/platform/linux-generic/arch/aarch64/odp_cpu_cycles.c
new file mode 100644
index 0000000000..fba263ee4c
--- /dev/null
+++ b/platform/linux-generic/arch/aarch64/odp_cpu_cycles.c
@@ -0,0 +1,48 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/cpu.h>
+
+#include <odp/api/abi/cpu_inlines.h>
+#include <odp/api/abi/time_cpu.h>
+
+#include <odp_debug_internal.h>
+#include <odp_init_internal.h>
+
+#include <string.h>
+
+#include <odp/visibility_begin.h>
+
+_odp_cpu_cycles_global_t _odp_cpu_cycles_glob;
+
+#include <odp/visibility_end.h>
+
+int _odp_cpu_cycles_init_global(void)
+{
+	uint64_t cpu_hz, cpu_time_hz;
+
+	memset(&_odp_cpu_cycles_glob, 0, sizeof(_odp_cpu_cycles_global_t));
+
+	cpu_time_hz = _odp_time_cpu_global_freq();
+	if (cpu_time_hz == 0) {
+		_ODP_ERR("CPU time counter frequency not available\n");
+		return -1;
+	}
+
+	cpu_hz = odp_cpu_hz_max_id(0);
+	if (cpu_hz == 0) {
+		_ODP_ERR("CPU frequency not available\n");
+		return -1;
+	}
+
+	_odp_cpu_cycles_glob.res_shifted = (cpu_hz << _ODP_CPU_FREQ_SHIFT) / cpu_time_hz;
+
+	_odp_cpu_cycles_glob.res = cpu_hz > cpu_time_hz ?
+		(_odp_cpu_cycles_glob.res_shifted >> _ODP_CPU_FREQ_SHIFT) : 1;
+
+	_odp_cpu_cycles_glob.max = (UINT64_MAX >> _ODP_CPU_FREQ_SHIFT) -
+				   (UINT64_MAX % _odp_cpu_cycles_glob.res);
+
+	return 0;
+}
diff --git a/platform/linux-generic/include/odp/api/plat/cpu_inlines.h b/platform/linux-generic/include/odp/api/plat/cpu_inlines.h
index 60c4bb9202..bb1b89154e 100644
--- a/platform/linux-generic/include/odp/api/plat/cpu_inlines.h
+++ b/platform/linux-generic/include/odp/api/plat/cpu_inlines.h
@@ -1,5 +1,5 @@
 /* Copyright (c) 2018, Linaro Limited
- * Copyright (c) 2021, Nokia
+ * Copyright (c) 2021-2023, Nokia
  * All rights reserved.
  *
  * SPDX-License-Identifier:     BSD-3-Clause
@@ -53,7 +53,7 @@ _ODP_INLINE uint64_t odp_cpu_cycles_diff(uint64_t c2, uint64_t c1)
 	if (odp_likely(c2 >= c1))
 		return c2 - c1;
 
-	return c2 + (odp_cpu_cycles_max() - c1) + 1;
+	return c2 + (odp_cpu_cycles_max() - c1) + _odp_cpu_cycles_resolution();
 }
 
 /** @endcond */
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index e6ea8bc0c4..05b693c94e 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -26,8 +26,8 @@ enum init_stage {
 	NO_INIT = 0,    /* No init stages completed */
 	LIBCONFIG_INIT,
 	CPUMASK_INIT,
-	CPU_CYCLES_INIT,
 	SYSINFO_INIT,
+	CPU_CYCLES_INIT,
 	TIME_INIT,
 	ISHM_INIT,
 	FDSERVER_INIT,
@@ -299,6 +299,7 @@ static int term_global(enum init_stage stage)
 		}
 		/* Fall through */
 
+	case CPU_CYCLES_INIT:
 	case SYSINFO_INIT:
 		if (_odp_system_info_term()) {
 			_ODP_ERR("ODP system info term failed.\n");
@@ -306,8 +307,6 @@ static int term_global(enum init_stage stage)
 		}
 		/* Fall through */
 
-	case CPU_CYCLES_INIT:
-		/* Fall through */
 	case CPUMASK_INIT:
 		if (_odp_cpumask_term_global()) {
 			_ODP_ERR("ODP cpumask term failed.\n");
@@ -366,18 +365,18 @@ int odp_init_global(odp_instance_t *instance,
 	}
 	stage = CPUMASK_INIT;
 
-	if (_odp_cpu_cycles_init_global()) {
-		_ODP_ERR("ODP cpu cycle init failed.\n");
-		goto init_failed;
-	}
-	stage = CPU_CYCLES_INIT;
-
 	if (_odp_system_info_init()) {
 		_ODP_ERR("ODP system_info init failed.\n");
 		goto init_failed;
 	}
 	stage = SYSINFO_INIT;
 
+	if (_odp_cpu_cycles_init_global()) {
+		_ODP_ERR("ODP cpu cycle init failed.\n");
+		goto init_failed;
+	}
+	stage = CPU_CYCLES_INIT;
+
 	if (_odp_time_init_global()) {
 		_ODP_ERR("ODP time init failed.\n");
 		goto init_failed;