Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00
Code Issues Releases Wiki Activity

fix bug in the initialization routine of the timer

Browse source
This commit is contained in:
Stefan Lankes 2016-08-31 14:01:43 +02:00
parent 8b15d6c72e
commit 0641e63407
2 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
hermit/arch/x86/kernel/timer.c
View file

@ -46,6 +46,7 @@ extern int32_t boot_processor;
#ifdef DYNAMIC_TICKS
DEFINE_PER_CORE(uint64_t, last_rdtsc, 0);
uint64_t boot_tsc = 0;
void check_ticks(void)
{
@ -53,28 +54,15 @@ void check_ticks(void)
if (!cpu_freq)
return;
if (has_rdtscp()){
uint64_t curr_rdtsc = rdtscp(NULL);
uint64_t diff;
uint64_t curr_rdtsc = has_rdtscp() ? rdtscp(NULL) : rdtsc();
uint64_t diff;
rmb();
diff = ((curr_rdtsc - per_core(last_rdtsc)) * (uint64_t)TIMER_FREQ) / (1000000ULL*(uint64_t)get_cpu_frequency());
if (diff > 0) {
set_per_core(timer_ticks, per_core(timer_ticks) + diff);
set_per_core(last_rdtsc, curr_rdtsc);
rmb();
diff = ((curr_rdtsc - per_core(last_rdtsc)) * (uint64_t)TIMER_FREQ) / (1000000ULL*(uint64_t)get_cpu_frequency());
if (diff > 0) {
set_per_core(timer_ticks, per_core(timer_ticks) + diff);
set_per_core(last_rdtsc, curr_rdtsc);
rmb();
}
} else {
uint64_t curr_rdtsc = rdtsc();
uint64_t diff;
rmb();
diff = ((curr_rdtsc - per_core(last_rdtsc)) * (uint64_t)TIMER_FREQ) / (1000000ULL*(uint64_t)get_cpu_frequency());
if (diff > 0) {
set_per_core(timer_ticks, per_core(timer_ticks) + diff);
set_per_core(last_rdtsc, curr_rdtsc);
rmb();
}
}
}
#endif
@ -182,6 +170,14 @@ static int pit_init(void)
*/
int timer_init(void)
{
#ifdef DYNAMIC_TICKS
if (boot_tsc)
{
set_per_core(last_rdtsc, boot_tsc);
return 0;
}
#endif
/*
* Installs 'timer_handler' for the PIC and APIC timer,
* only one handler will be later used.
@ -191,10 +187,8 @@ int timer_init(void)
irq_install_handler(121, wakeup_handler);
#ifdef DYNAMIC_TICKS
if (has_rdtscp())
last_rdtsc = rdtscp(NULL);
else
last_rdtsc = rdtsc();
boot_tsc = has_rdtscp() ? rdtscp(NULL) : rdtsc();
set_per_core(last_rdtsc, boot_tsc);
#endif
if (cpu_freq) // do we need to configure the timer?

1
hermit/kernel/main.c
View file

@ -285,6 +285,7 @@ int network_shutdown(void)
#if MAX_CORES > 1
int smp_main(void)
{
timer_init();
#ifdef DYNAMIC_TICKS
enable_dynticks();
#endif