diff options
| -rw-r--r-- | src/cpu/x86/mp_init.c | 27 | ||||
| -rw-r--r-- | src/include/cpu/x86/mp.h | 10 |
2 files changed, 2 insertions, 35 deletions
diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c index 585a54b86d..f290a48c99 100644 --- a/src/cpu/x86/mp_init.c +++ b/src/cpu/x86/mp_init.c @@ -143,37 +143,14 @@ static inline void add_cpu_map_entry(const struct cpu_info *info) cpus[info->index].default_apic_id = cpuid_ebx(1) >> 24; } -inline void barrier_wait(atomic_t *b) +static inline void barrier_wait(atomic_t *b) { while (atomic_read(b) == 0) asm ("pause"); mfence(); } -/* Returns 1 if timeout occurs before barier is released. - * returns 0 if barrier is released before timeout. */ -int barrier_wait_timeout(atomic_t *b, uint32_t timeout_ms) -{ - int timeout = 0; - struct mono_time current, end; - - timer_monotonic_get(¤t); - end = current; - mono_time_add_msecs(&end, timeout_ms); - - while ((atomic_read(b) == 0) && (!mono_time_after(¤t, &end))) { - timer_monotonic_get(¤t); - asm ("pause"); - } - mfence(); - - if (mono_time_after(¤t, &end)) - timeout = 1; - - return timeout; -} - -inline void release_barrier(atomic_t *b) +static inline void release_barrier(atomic_t *b) { mfence(); atomic_set(b, 1); diff --git a/src/include/cpu/x86/mp.h b/src/include/cpu/x86/mp.h index 8331956f8a..43698229d6 100644 --- a/src/include/cpu/x86/mp.h +++ b/src/include/cpu/x86/mp.h @@ -145,15 +145,5 @@ int mp_park_aps(void); void smm_initiate_relocation_parallel(void); /* Send SMI to self with single execution. */ void smm_initiate_relocation(void); -/* Make a CPU wait until the barrier is released */ -void barrier_wait(atomic_t *b); -/* - * Make a CPU wait until the barrier is released, or timeout occurs - * returns 1 if timeout occurs before barier is released. - * returns 0 if barrier is released before timeout. - */ -int barrier_wait_timeout(atomic_t *b, uint32_t timeout_ms); -/* Release a barrier so that other CPUs waiting for that barrier can continue */ -void release_barrier(atomic_t *b); #endif /* _X86_MP_H_ */ |