diff options
Diffstat (limited to 'src/cpu/x86/tsc/delay_tsc.c')
| -rw-r--r-- | src/cpu/x86/tsc/delay_tsc.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/src/cpu/x86/tsc/delay_tsc.c b/src/cpu/x86/tsc/delay_tsc.c index 9441622ce3..1aec472523 100644 --- a/src/cpu/x86/tsc/delay_tsc.c +++ b/src/cpu/x86/tsc/delay_tsc.c @@ -137,32 +137,41 @@ static struct monotonic_counter { int initialized; struct mono_time time; uint64_t last_value; -} mono_counter; +} mono_counter_g; + +static inline struct monotonic_counter *get_monotonic_context(void) +{ + return &mono_counter_g; +} void timer_monotonic_get(struct mono_time *mt) { uint64_t current_tick; uint64_t ticks_elapsed; + unsigned long ticks_per_usec; + struct monotonic_counter *mono_counter; - if (!mono_counter.initialized) { + mono_counter = get_monotonic_context(); + if (!mono_counter->initialized) { init_timer(); - mono_counter.last_value = rdtscll(); - mono_counter.initialized = 1; + mono_counter->last_value = rdtscll(); + mono_counter->initialized = 1; } current_tick = rdtscll(); - ticks_elapsed = current_tick - mono_counter.last_value; + ticks_elapsed = current_tick - mono_counter->last_value; + ticks_per_usec = get_clocks_per_usec(); /* Update current time and tick values only if a full tick occurred. */ - if (ticks_elapsed >= clocks_per_usec) { + if (ticks_elapsed >= ticks_per_usec) { uint64_t usecs_elapsed; - usecs_elapsed = ticks_elapsed / clocks_per_usec; - mono_time_add_usecs(&mono_counter.time, (long)usecs_elapsed); - mono_counter.last_value = current_tick; + usecs_elapsed = ticks_elapsed / ticks_per_usec; + mono_time_add_usecs(&mono_counter->time, (long)usecs_elapsed); + mono_counter->last_value = current_tick; } /* Save result. */ - *mt = mono_counter.time; + *mt = mono_counter->time; } #endif |