@@ -911,6 +911,9 @@ config ARCH_WANT_HUGE_PMD_SHARE
config ARCH_HAS_CACHE_LINE_SIZE
def_bool y
+config ARCH_HAS_TIMESTAMP_CLOCK
+ def_bool y
+
config ARCH_ENABLE_SPLIT_PMD_PTLOCK
def_bool y if PGTABLE_LEVELS > 2
@@ -15,6 +15,7 @@
#include <linux/initrd.h>
#include <linux/console.h>
#include <linux/cache.h>
+#include <linux/clocksource.h>
#include <linux/screen_info.h>
#include <linux/init.h>
#include <linux/kexec.h>
@@ -28,10 +29,12 @@
#include <linux/of_fdt.h>
#include <linux/efi.h>
#include <linux/psci.h>
+#include <linux/sched/clock.h>
#include <linux/sched/task.h>
#include <linux/mm.h>
#include <asm/acpi.h>
+#include <asm/arch_timer.h>
#include <asm/fixmap.h>
#include <asm/cpu.h>
#include <asm/cputype.h>
@@ -269,8 +272,49 @@ arch_initcall(reserve_memblock_reserved_regions);
u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID };
+static u64 notrace ts_counter_read_cc(const struct cyclecounter *cc)
+{
+ return __arch_counter_get_cntvct();
+}
+
+static struct cyclecounter ts_cc __ro_after_init = {
+ .read = ts_counter_read_cc,
+ .mask = CLOCKSOURCE_MASK(56),
+};
+
+static struct timecounter ts_tc;
+
+static bool ts_cc_valid __ro_after_init = false;
+
+static __init void timestamp_clock_init(void)
+{
+ u64 frq = arch_timer_get_cntfrq();
+
+ if (!frq)
+ return;
+
+ clocks_calc_mult_shift(&ts_cc.mult, &ts_cc.shift,
+ frq, NSEC_PER_SEC, 3600);
+ /* timestamp starts at 0 (local_clock is a good enough approximation) */
+ timecounter_init(&ts_tc, &ts_cc, local_clock());
+ ts_cc_valid = true;
+ pr_info("Using timestamp clock @%lluMHz\n", frq / 1000 / 1000);
+}
+
+u64 timestamp_clock(void)
+{
+ u64 ns = local_clock();
+
+ if (likely(ns || !ts_cc_valid))
+ return ns;
+
+ return timecounter_read(&ts_tc);
+}
+
void __init setup_arch(char **cmdline_p)
{
+ timestamp_clock_init();
+
init_mm.start_code = (unsigned long) _text;
init_mm.end_code = (unsigned long) _etext;
init_mm.end_data = (unsigned long) _edata;
In order to provide early timestamping on arm64 systems, we provide a timestamp_clock() function that is available as early as possible. This function simply returns the current counter value scales in nanoseconds, and 0-based. In order to deal with the idiosyncrasies of some broken platforms, we condition this on the frequency being set in the CNTFRQ_EL0 register, and revert back to using local_clock() as soon as it starts returning non-zero values. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm64/Kconfig | 3 +++ arch/arm64/kernel/setup.c | 44 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) -- 2.20.1