diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2023-06-28 06:16:11 +0300 |
|---|---|---|
| committer | Shelley Chen <shchen@google.com> | 2023-07-05 15:59:31 +0000 |
| commit | d7542cb338b79e9395e12e79b798a825f1a38f66 (patch) | |
| tree | 2c042bcfada9069ab571fb44e74ebd656617f52f /src | |
| parent | 47d61a7c14570e790a4e9795bcf1422be9445a53 (diff) | |
arch/x86: Ensure LAPIC mode for exception handler
Attempting to use X2APIC MSRs before the call to enable_lapic()
is made raises exception and double-faults.
Change-Id: Ib97889466af0fbe639bec2be730784acc015b525
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76194
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/x86/exception.c | 5 | ||||
| -rw-r--r-- | src/include/cpu/x86/lapic.h | 12 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/arch/x86/exception.c b/src/arch/x86/exception.c index 5f6c0fc641..e9234ade4a 100644 --- a/src/arch/x86/exception.c +++ b/src/arch/x86/exception.c @@ -488,7 +488,6 @@ void x86_exception(struct eregs *info) #else /* !CONFIG_GDB_STUB */ int logical_processor = 0; - u32 apic_id = CONFIG(SMP) ? lapicid() : 0; if (info->vector == DEBUG_VECTOR) { if (breakpoint_dispatch_handler(info) == 0) @@ -513,7 +512,7 @@ void x86_exception(struct eregs *info) "r10: %016llx r11: %016llx\n" "r12: %016llx r13: %016llx\n" "r14: %016llx r15: %016llx\n", - logical_processor, apic_id, + logical_processor, early_lapicid(), info->vector, info->cs, info->rip, info->error_code, info->rflags, read_cr2(), info->rax, info->rbx, info->rcx, info->rdx, @@ -530,7 +529,7 @@ void x86_exception(struct eregs *info) "Code: %d eflags: %08x cr2: %08x\n" "eax: %08x ebx: %08x ecx: %08x edx: %08x\n" "edi: %08x esi: %08x ebp: %08x esp: %08x\n", - logical_processor, apic_id, + logical_processor, early_lapicid(), info->vector, info->cs, info->eip, info->error_code, info->eflags, read_cr2(), info->eax, info->ebx, info->ecx, info->edx, diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h index f7fecf1342..87cf3c77df 100644 --- a/src/include/cpu/x86/lapic.h +++ b/src/include/cpu/x86/lapic.h @@ -184,4 +184,16 @@ void enable_lapic_mode(bool try_set_x2apic); void disable_lapic(void); void setup_lapic_interrupts(void); +static inline unsigned int early_lapicid(void) +{ + if (!CONFIG(SMP)) + return 0; + + if (!ENV_RAMSTAGE) + return 0; + + enable_lapic(); + return lapicid(); +} + #endif /* CPU_X86_LAPIC_H */ |