aboutsummaryrefslogtreecommitdiff
path: root/src/include/cpu/x86
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/cpu/x86')
-rw-r--r--src/include/cpu/x86/lapic.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h
index c1603f21f0..e131d2ec46 100644
--- a/src/include/cpu/x86/lapic.h
+++ b/src/include/cpu/x86/lapic.h
@@ -145,8 +145,16 @@ static __always_inline unsigned int lapicid(void)
static __always_inline void lapic_send_ipi_self(uint32_t icrlow)
{
+ int i = 1000;
+
/* LAPIC_DEST_SELF does not support all delivery mode -fields. */
lapic_send_ipi(icrlow, lapicid());
+
+ /* In case of X2APIC force a short delay, to prevent deadlock in a case
+ * the immediately following code acquires some lock, like with printk().
+ */
+ while (CONFIG(X2APIC_ONLY) && i--)
+ cpu_relax();
}
static __always_inline void lapic_send_ipi_others(uint32_t icrlow)