[coreboot-gerrit] Change in coreboot[master]: [NOTFORMERGE] Workaround X2APIC_ONLY

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60213 )

Change subject: [NOTFORMERGE] Workaround X2APIC_ONLY
......................................................................

[NOTFORMERGE] Workaround X2APIC_ONLY

Discussion in CB:55262

Change-Id: I78070ae91e78c11c3e3aa225e5673d4667d6f7bb
Signed-off-by: Kyösti Mälkki 
---
M src/include/cpu/x86/lapic.h
1 file changed, 3 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/60213/1

diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h
index 537fa97..e6c75ce 100644
--- a/src/include/cpu/x86/lapic.h
+++ b/src/include/cpu/x86/lapic.h
@@ -64,11 +64,12 @@
    if (CONFIG(XAPIC_ONLY))
    	return false;

+	msr_t msr;
+	msr = rdmsr(LAPIC_BASE_MSR);
+
    if (CONFIG(X2APIC_ONLY))
    	return true;

-	msr_t msr;
-	msr = rdmsr(LAPIC_BASE_MSR);
    return ((msr.lo & LAPIC_BASE_X2APIC_ENABLED) == LAPIC_BASE_X2APIC_ENABLED);
 }