From 83cc112e82fea5f521a3bf6334dce6e6c56ef0e6 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 24 Feb 2016 09:14:46 -0700 Subject: lib: Don't instrument the div64 function This function can be called from the timer code on instrumented functions. Mark it as 'notrace' so that it doesn't cause infinite recursion. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- lib/div64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/div64.c b/lib/div64.c index 795ef0e1e4..319fca50fa 100644 --- a/lib/div64.c +++ b/lib/div64.c @@ -18,8 +18,9 @@ #include #include +#include -uint32_t __div64_32(uint64_t *n, uint32_t base) +uint32_t notrace __div64_32(uint64_t *n, uint32_t base) { uint64_t rem = *n; uint64_t b = base; -- cgit From c95fec31928d7e2596364ee1d226b52ffd7793f2 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 24 Feb 2016 09:14:49 -0700 Subject: timer: Provide an early timer In some cases the timer must be accessible before driver model is active. Examples include when using CONFIG_TRACE to trace U-Boot's execution before driver model is set up. Enable this option to use an early timer. These functions must be supported by your timer driver: timer_early_get_count() and timer_early_get_rate(). Signed-off-by: Simon Glass --- lib/time.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/time.c b/lib/time.c index e9f6861b98..f37150fddc 100644 --- a/lib/time.c +++ b/lib/time.c @@ -43,11 +43,17 @@ extern unsigned long __weak timer_read_counter(void); #ifdef CONFIG_TIMER ulong notrace get_tbclk(void) { - int ret; + if (!gd->timer) { +#ifdef CONFIG_TIMER_EARLY + return timer_early_get_rate(); +#else + int ret; - ret = dm_timer_init(); - if (ret) - return ret; + ret = dm_timer_init(); + if (ret) + return ret; +#endif + } return timer_get_rate(gd->timer); } @@ -57,9 +63,17 @@ uint64_t notrace get_ticks(void) u64 count; int ret; - ret = dm_timer_init(); - if (ret) - return ret; + if (!gd->timer) { +#ifdef CONFIG_TIMER_EARLY + return timer_early_get_count(); +#else + int ret; + + ret = dm_timer_init(); + if (ret) + return ret; +#endif + } ret = timer_get_count(gd->timer, &count); if (ret) -- cgit