diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2016-04-08 21:12:01 -0500 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-04-11 16:13:46 +0200 |
| commit | 711bfa97108989d8c273315ceae6b3d8351c4ac6 (patch) | |
| tree | 63f657e50c23f64f470562fd4bde0a4caea457ac /src/cpu/x86 | |
| parent | 6f3a55ae7ec2b2d8b55a09e4eec3377084339800 (diff) | |
cpu/x86/tsc: prepare for CAR_GLOBAL in delay_tsc.c
The current code in delay_tsc.c uses globals and is heavily
guarded by a lot of preprocessor macros. In order to remove
__PRE_RAM__ constraints one needs to use CAR_GLOBAL for the
global variables. Therefore, abstract away direct access to
the globals such that CAR_GLOBAL can be easily employed.
Change-Id: I3350d1a762120476926c8d9f5f5a7aba138daf5f
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/14300
Tested-by: build bot (Jenkins)
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Andrey Petrov <andrey.petrov@intel.com>
Diffstat (limited to 'src/cpu/x86')
| -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 |