[coreboot-gerrit] Change in coreboot[master]: cpu/x86/tsc: Remove indirection when accessing mono_timer_g

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37359 )

Change subject: cpu/x86/tsc: Remove indirection when accessing mono_timer_g
......................................................................

cpu/x86/tsc: Remove indirection when accessing mono_timer_g

Change-Id: Ice1426cec8f9c5d9644836b0cf025be50e932f48
Signed-off-by: Patrick Georgi 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37359
Tested-by: build bot (Jenkins) 
Reviewed-by: Kyösti Mälkki 
Reviewed-by: Angel Pons 
---
M src/cpu/x86/tsc/delay_tsc.c
1 file changed, 7 insertions(+), 14 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/cpu/x86/tsc/delay_tsc.c b/src/cpu/x86/tsc/delay_tsc.c
index fe6ae5b..fda8fe1 100644
--- a/src/cpu/x86/tsc/delay_tsc.c
+++ b/src/cpu/x86/tsc/delay_tsc.c
@@ -50,27 +50,20 @@
    uint64_t last_value;
 } 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;

-	mono_counter = get_monotonic_context();
-	if (!mono_counter->initialized) {
+	if (!mono_counter_g.initialized) {
    	init_timer();
-		mono_counter->last_value = rdtscll();
-		mono_counter->initialized = 1;
+		mono_counter_g.last_value = rdtscll();
+		mono_counter_g.initialized = 1;
    }

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();

/* Update current time and tick values only if a full tick occurred. */
@@ -78,11 +71,11 @@
    	uint64_t usecs_elapsed;

usecs_elapsed = ticks_elapsed / ticks_per_usec;
-		mono_time_add_usecs(&mono_counter->time, (long)usecs_elapsed);
-		mono_counter->last_value = current_tick;
+		mono_time_add_usecs(&mono_counter_g.time, (long)usecs_elapsed);
+		mono_counter_g.last_value = current_tick;
    }

/* Save result. */
-	*mt = mono_counter->time;
+	*mt = mono_counter_g.time;
 }
 #endif