[coreboot-gerrit] [S] Change in coreboot[master]: cpu/x86/lapic.h: Fix CONFIG_X2APIC_RUNTIME

[Martin L Roth (Code Review)]

Martin L Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/67239 )

Change subject: cpu/x86/lapic.h: Fix CONFIG_X2APIC_RUNTIME
......................................................................

cpu/x86/lapic.h: Fix CONFIG_X2APIC_RUNTIME

The deadlock prevention is also needed with CONFIG_X2APIC_RUNTIME when
the cpu is in x2apic mode.

TESTED: Fixes SMI generation on xeon_sp hardware with
CONFIG_X2APIC_RUNTIME.

Change-Id: I6a71204fcff35e11613fc8363ce061b348e73496
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67239
Tested-by: build bot (Jenkins) 
Reviewed-by: Jonathan Zhang 
Reviewed-by: Angel Pons 
---
M src/include/cpu/x86/lapic.h
1 file changed, 23 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved
  Jonathan Zhang: Looks good to me, approved

diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h
index 5fa5608..cfb9c90 100644
--- a/src/include/cpu/x86/lapic.h
+++ b/src/include/cpu/x86/lapic.h
@@ -155,7 +155,9 @@
    /* 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--)
+	const bool x2apic = is_x2apic_mode();
+
+	while (x2apic && i--)
    	cpu_relax();
 }