[coreboot-gerrit] Change in coreboot[master]: [RFC] cpu/x86/lapic: Always have LAPIC enabled

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

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

Change subject: [RFC] cpu/x86/lapic: Always have LAPIC enabled
......................................................................

[RFC] cpu/x86/lapic: Always have LAPIC enabled

LAPIC has been available since P54C released 1993.

Change-Id: Id564a3007ea7a3d9fb81005a05399a18c4cf7289
Signed-off-by: Kyösti Mälkki 
---
M src/cpu/x86/lapic/lapic.c
M src/cpu/x86/lapic/lapic_cpu_init.c
M src/include/cpu/x86/lapic.h
3 files changed, 2 insertions(+), 15 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/61794/1

diff --git a/src/cpu/x86/lapic/lapic.c b/src/cpu/x86/lapic/lapic.c
index 76f2d89..d6dee15 100644
--- a/src/cpu/x86/lapic/lapic.c
+++ b/src/cpu/x86/lapic/lapic.c
@@ -52,14 +52,6 @@

}

-void disable_lapic(void)
-{
-	msr_t msr;
-	msr = rdmsr(LAPIC_BASE_MSR);
-	msr.lo &= ~(LAPIC_BASE_MSR_ENABLE | LAPIC_BASE_MSR_X2APIC_MODE);
-	wrmsr(LAPIC_BASE_MSR, msr);
-}
-
 uintptr_t cpu_get_lapic_addr(void)
 {
    return LAPIC_DEFAULT_BASE;
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index 2cb8459..7437821 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -381,12 +381,8 @@
    info = cpu_info();

/* Ensure the local APIC is enabled */
-	if (is_smp_boot()) {
-		enable_lapic();
-		setup_lapic_interrupts();
-	} else {
-		disable_lapic();
-	}
+	enable_lapic();
+	setup_lapic_interrupts();

/* Get the device path of the boot CPU */
    cpu_path.type = DEVICE_PATH_APIC;
diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h
index 7006dbc..7ef19e5 100644
--- a/src/include/cpu/x86/lapic.h
+++ b/src/include/cpu/x86/lapic.h
@@ -176,7 +176,6 @@
 #endif

void enable_lapic(void);
-void disable_lapic(void);
 void setup_lapic_interrupts(void);

#endif /* CPU_X86_LAPIC_H */