diff options
| -rw-r--r-- | src/cpu/x86/lapic/lapic_cpu_init.c | 10 | ||||
| -rw-r--r-- | src/cpu/x86/mp_init.c | 10 | ||||
| -rw-r--r-- | src/include/cpu/x86/lapic.h | 12 |
3 files changed, 20 insertions, 12 deletions
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c index 6369d2e302..e870921774 100644 --- a/src/cpu/x86/lapic/lapic_cpu_init.c +++ b/src/cpu/x86/lapic/lapic_cpu_init.c @@ -110,7 +110,7 @@ static int lapic_start_cpu(unsigned long apicid) do { printk(BIOS_SPEW, "+"); udelay(100); - send_status = lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY; + send_status = lapic_busy(); } while (send_status && (timeout++ < 1000)); if (timeout >= 1000) { printk(BIOS_ERR, "CPU %ld: First APIC write timed out. " @@ -136,7 +136,7 @@ static int lapic_start_cpu(unsigned long apicid) do { printk(BIOS_SPEW, "+"); udelay(100); - send_status = lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY; + send_status = lapic_busy(); } while (send_status && (timeout++ < 1000)); if (timeout >= 1000) { printk(BIOS_ERR, "CPU %ld: Second APIC write timed out. " @@ -177,7 +177,7 @@ static int lapic_start_cpu(unsigned long apicid) do { printk(BIOS_SPEW, "+"); udelay(100); - send_status = lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY; + send_status = lapic_busy(); } while (send_status && (timeout++ < 1000)); /* @@ -330,7 +330,7 @@ void stop_this_cpu(void) do { dprintk(BIOS_SPEW, "+"); udelay(100); - send_status = lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY; + send_status = lapic_busy(); } while (send_status && (timeout++ < 1000)); if (timeout >= 1000) @@ -349,7 +349,7 @@ void stop_this_cpu(void) do { dprintk(BIOS_SPEW, "+"); udelay(100); - send_status = lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY; + send_status = lapic_busy(); } while (send_status && (timeout++ < 1000)); if (timeout >= 1000) diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c index 87ddb0d4c0..ad45ee96f9 100644 --- a/src/cpu/x86/mp_init.c +++ b/src/cpu/x86/mp_init.c @@ -403,7 +403,7 @@ static int apic_wait_timeout(int total_delay, int delay_step) int total = 0; int timeout = 0; - while (lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY) { + while (lapic_busy()) { udelay(delay_step); total += delay_step; if (total >= total_delay) { @@ -457,7 +457,7 @@ static int start_aps(struct bus *cpu_bus, int ap_count, atomic_t *num_aps) return 0; } - if ((lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY)) { + if (lapic_busy()) { printk(BIOS_DEBUG, "Waiting for ICR not to be busy..."); if (apic_wait_timeout(1000 /* 1 ms */, 50)) { printk(BIOS_ERR, "timed out. Aborting.\n"); @@ -472,7 +472,7 @@ static int start_aps(struct bus *cpu_bus, int ap_count, atomic_t *num_aps) mdelay(10); /* Send 1st SIPI */ - if ((lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY)) { + if (lapic_busy()) { printk(BIOS_DEBUG, "Waiting for ICR not to be busy..."); if (apic_wait_timeout(1000 /* 1 ms */, 50)) { printk(BIOS_ERR, "timed out. Aborting.\n"); @@ -497,7 +497,7 @@ static int start_aps(struct bus *cpu_bus, int ap_count, atomic_t *num_aps) return 0; /* Send 2nd SIPI */ - if ((lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY)) { + if (lapic_busy()) { printk(BIOS_DEBUG, "Waiting for ICR not to be busy..."); if (apic_wait_timeout(1000 /* 1 ms */, 50)) { printk(BIOS_ERR, "timed out. Aborting.\n"); @@ -676,7 +676,7 @@ void smm_initiate_relocation_parallel(void) return; } - if ((lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY)) { + if (lapic_busy()) { printk(BIOS_DEBUG, "Waiting for ICR not to be busy..."); if (apic_wait_timeout(1000 /* 1 ms */, 50)) { printk(BIOS_DEBUG, "timed out. Aborting.\n"); diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h index 1db0ff46d1..4647877ae9 100644 --- a/src/include/cpu/x86/lapic.h +++ b/src/include/cpu/x86/lapic.h @@ -35,6 +35,11 @@ static __always_inline void xapic_send_ipi(uint32_t icrlow, uint32_t apicid) xapic_write_atomic(LAPIC_ICR, icrlow); } +static __always_inline int xapic_busy(void) +{ + return xapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY; +} + #define lapic_read_around(x) lapic_read(x) #define lapic_write_around(x, y) xapic_write_atomic((x), (y)) @@ -124,9 +129,12 @@ static __always_inline void lapic_send_ipi(uint32_t icrlow, uint32_t apicid) xapic_send_ipi(icrlow, apicid); } -static __always_inline void lapic_wait_icr_idle(void) +static __always_inline int lapic_busy(void) { - do { } while (lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY); + if (is_x2apic_mode()) + return 0; + else + return xapic_busy(); } static __always_inline unsigned int initial_lapicid(void) |