Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/55244 )
Change subject: arch/x86: Do not call lapicid() without SMP ......................................................................
arch/x86: Do not call lapicid() without SMP
The LAPIC may not be enabled or implemented.
Change-Id: I2e0f42641ca15d177590d1696475054eda6ce125 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/arch/x86/exception.c 1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/55244/1
diff --git a/src/arch/x86/exception.c b/src/arch/x86/exception.c index f10c7bf..aa94d3f 100644 --- a/src/arch/x86/exception.c +++ b/src/arch/x86/exception.c @@ -486,6 +486,7 @@ #else /* !CONFIG_GDB_STUB */
int logical_processor = 0; + u32 apic_id = CONFIG(SMP) ? lapicid() : 0;
#if ENV_RAMSTAGE logical_processor = cpu_index(); @@ -505,7 +506,7 @@ "r10: %016llx r11: %016llx\n" "r12: %016llx r13: %016llx\n" "r14: %016llx r15: %016llx\n", - logical_processor, (unsigned int)lapicid(), + logical_processor, apic_id, info->vector, info->cs, info->rip, info->error_code, info->rflags, read_cr2(), info->rax, info->rbx, info->rcx, info->rdx, @@ -522,7 +523,7 @@ "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, (unsigned int)lapicid(), + logical_processor, apic_id, info->vector, info->cs, info->eip, info->error_code, info->eflags, read_cr2(), info->eax, info->ebx, info->ecx, info->edx,