GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpu/x86/lapic/apic_timer.c: Drop CAR_GLOBAL_MIGRATION support 

Change-Id: Ideac1a04d6bb1a5e9cc601be7bbfcebe56b4a5da
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37050
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans 2019-11-20 22:11:28 +01:00 committed by Patrick Georgi
parent 4e223db66c
commit 5d70978920
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cpu/x86/lapic/apic_timer.c
View File

@ -16,7 +16,6 @@
#include <delay.h> #include <delay.h>
#include <thread.h> #include <thread.h>
#include <arch/cpu.h> #include <arch/cpu.h>
#include <arch/early_variables.h>
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
@ -63,18 +62,15 @@ static struct monotonic_counter {
int initialized; int initialized;
struct mono_time time; struct mono_time time;
uint32_t last_value; uint32_t last_value;
} mono_counter_g CAR_GLOBAL; } mono_counter_g;
void timer_monotonic_get(struct mono_time *mt) void timer_monotonic_get(struct mono_time *mt)
{ {
uint32_t current_tick; uint32_t current_tick;
uint32_t usecs_elapsed; uint32_t usecs_elapsed;
uint32_t timer_fsb; uint32_t timer_fsb;
struct monotonic_counter *mono_counter;
mono_counter = car_get_var_ptr(&mono_counter_g); if (!mono_counter_g.initialized) {
if (!mono_counter->initialized) {
init_timer(); init_timer();
timer_fsb = get_timer_fsb(); timer_fsb = get_timer_fsb();
/* An FSB frequency of 200Mhz provides a 20 second polling /* An FSB frequency of 200Mhz provides a 20 second polling
@ -84,22 +80,22 @@ void timer_monotonic_get(struct mono_time *mt)
printk(BIOS_WARNING, printk(BIOS_WARNING,
"apic timer freq (%d) may be too fast.\n", "apic timer freq (%d) may be too fast.\n",
timer_fsb); timer_fsb);
mono_counter->last_value = lapic_read(LAPIC_TMCCT); mono_counter_g.last_value = lapic_read(LAPIC_TMCCT);
mono_counter->initialized = 1; mono_counter_g.initialized = 1;
} }
timer_fsb = get_timer_fsb(); timer_fsb = get_timer_fsb();
current_tick = lapic_read(LAPIC_TMCCT); current_tick = lapic_read(LAPIC_TMCCT);
/* Note that the APIC timer counts down. */ /* Note that the APIC timer counts down. */
usecs_elapsed = (mono_counter->last_value - current_tick) / timer_fsb; usecs_elapsed = (mono_counter_g.last_value - current_tick) / timer_fsb;
/* Update current time and tick values only if a full tick occurred. */ /* Update current time and tick values only if a full tick occurred. */
if (usecs_elapsed) { if (usecs_elapsed) {
mono_time_add_usecs(&mono_counter->time, usecs_elapsed); mono_time_add_usecs(&mono_counter_g.time, 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