Patrick Georgi has uploaded this change for review. ( 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 pgeorgi@google.com --- M src/cpu/x86/tsc/delay_tsc.c 1 file changed, 7 insertions(+), 9 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/37359/1
diff --git a/src/cpu/x86/tsc/delay_tsc.c b/src/cpu/x86/tsc/delay_tsc.c index fe6ae5b..a2d5ba9 100644 --- a/src/cpu/x86/tsc/delay_tsc.c +++ b/src/cpu/x86/tsc/delay_tsc.c @@ -60,17 +60,15 @@ 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 +76,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
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37359 )
Change subject: cpu/x86/tsc: Remove indirection when accessing mono_timer_g ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37359/1/src/cpu/x86/tsc/delay_tsc.c File src/cpu/x86/tsc/delay_tsc.c:
https://review.coreboot.org/c/coreboot/+/37359/1/src/cpu/x86/tsc/delay_tsc.c... PS1, Line 53: static inline struct monotonic_counter *get_monotonic_context(void) unused?
Patrick Georgi has uploaded a new patch set (#2). ( 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 pgeorgi@google.com --- M src/cpu/x86/tsc/delay_tsc.c 1 file changed, 7 insertions(+), 14 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/37359/2
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37359 )
Change subject: cpu/x86/tsc: Remove indirection when accessing mono_timer_g ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37359/1/src/cpu/x86/tsc/delay_tsc.c File src/cpu/x86/tsc/delay_tsc.c:
https://review.coreboot.org/c/coreboot/+/37359/1/src/cpu/x86/tsc/delay_tsc.c... PS1, Line 53: static inline struct monotonic_counter *get_monotonic_context(void)
unused?
Done
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37359 )
Change subject: cpu/x86/tsc: Remove indirection when accessing mono_timer_g ......................................................................
Patch Set 2: Code-Review+2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37359 )
Change subject: cpu/x86/tsc: Remove indirection when accessing mono_timer_g ......................................................................
Patch Set 2: Code-Review+2
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 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 --- 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
-
Angel Pons (Code Review) -
Kyösti Mälkki (Code Review)
-
Patrick Georgi (Code Review)