sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpu/x86/tsc: Remove indirection when accessing mono_timer_g

Browse Source 
Change-Id: Ice1426cec8f9c5d9644836b0cf025be50e932f48
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37359
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Patrick Georgi
2019-11-29 12:07:41 +01:00
parent 2c2df5b6dd
commit 3802563bdc
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/cpu/x86/tsc/delay_tsc.c
View File

@@ -50,27 +50,20 @@ static struct monotonic_counter {
uint64_t last_value; uint64_t last_value;
} mono_counter_g; } mono_counter_g;
static inline struct monotonic_counter *get_monotonic_context(void)
{
return &mono_counter_g;
}
void timer_monotonic_get(struct mono_time *mt) void timer_monotonic_get(struct mono_time *mt)
{ {
uint64_t current_tick; uint64_t current_tick;
uint64_t ticks_elapsed; uint64_t ticks_elapsed;
unsigned long ticks_per_usec; unsigned long ticks_per_usec;
struct monotonic_counter *mono_counter;
mono_counter = get_monotonic_context(); if (!mono_counter_g.initialized) {
if (!mono_counter->initialized) {
init_timer(); init_timer();
mono_counter->last_value = rdtscll(); mono_counter_g.last_value = rdtscll();
mono_counter->initialized = 1; mono_counter_g.initialized = 1;
} }
current_tick = rdtscll(); current_tick = rdtscll();
ticks_elapsed = current_tick - mono_counter->last_value; ticks_elapsed = current_tick - mono_counter_g.last_value;
ticks_per_usec = tsc_freq_mhz(); ticks_per_usec = tsc_freq_mhz();
/* Update current time and tick values only if a full tick occurred. */ /* Update current time and tick values only if a full tick occurred. */
@@ -78,11 +71,11 @@ void timer_monotonic_get(struct mono_time *mt)
uint64_t usecs_elapsed; uint64_t usecs_elapsed;
usecs_elapsed = ticks_elapsed / ticks_per_usec; usecs_elapsed = ticks_elapsed / ticks_per_usec;
mono_time_add_usecs(&mono_counter->time, (long)usecs_elapsed); mono_time_add_usecs(&mono_counter_g.time, (long)usecs_elapsed);
mono_counter->last_value = current_tick; mono_counter_g.last_value = current_tick;
} }
/* Save result. */ /* Save result. */
*mt = mono_counter->time; *mt = mono_counter_g.time;
} }
#endif #endif