1d3dbd49e1
In case of EFI, efi_init must be called before initializing early serial: if that one as X86_SOC_EARLY_SERIAL_PCIDEV defined, its pcie access will try to initialise pcie mmio access which one will try to find an ACPI table. At this point, calling ACPI API prior to initialize EFI will make RSDP looked up already... and since it cannot find it without EFI being initialized first, ACPI is then broken. Just moving early serial to initialize after multiboot/efi being setup. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
68 lines
1.3 KiB
C
68 lines
1.3 KiB
C
/*
|
|
* Copyright (c) 2019 Intel Corporation
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <kernel.h>
|
|
#include <kernel_internal.h>
|
|
#include <arch/x86/acpi.h>
|
|
#include <arch/x86/multiboot.h>
|
|
#include <arch/x86/efi.h>
|
|
#include <x86_mmu.h>
|
|
|
|
extern FUNC_NORETURN void z_cstart(void);
|
|
extern void x86_64_irq_init(void);
|
|
|
|
#if !defined(CONFIG_X86_64)
|
|
x86_boot_arg_t x86_cpu_boot_arg;
|
|
#endif
|
|
|
|
/* Early global initialization functions, C domain. This runs only on the first
|
|
* CPU for SMP systems.
|
|
*/
|
|
__boot_func
|
|
FUNC_NORETURN void z_x86_prep_c(void *arg)
|
|
{
|
|
x86_boot_arg_t *cpu_arg = arg;
|
|
|
|
_kernel.cpus[0].nested = 0;
|
|
|
|
#ifdef CONFIG_MMU
|
|
z_x86_mmu_init();
|
|
#endif
|
|
|
|
#if defined(CONFIG_LOAPIC)
|
|
z_loapic_enable(0);
|
|
#endif
|
|
|
|
#ifdef CONFIG_X86_64
|
|
x86_64_irq_init();
|
|
#endif
|
|
|
|
if (IS_ENABLED(CONFIG_MULTIBOOT_INFO) &&
|
|
cpu_arg->boot_type == MULTIBOOT_BOOT_TYPE) {
|
|
z_multiboot_init((struct multiboot_info *)cpu_arg->arg);
|
|
} else if (IS_ENABLED(CONFIG_X86_EFI) &&
|
|
cpu_arg->boot_type == EFI_BOOT_TYPE) {
|
|
efi_init((struct efi_boot_arg *)cpu_arg->arg);
|
|
} else {
|
|
ARG_UNUSED(cpu_arg);
|
|
}
|
|
|
|
#ifdef CONFIG_X86_VERY_EARLY_CONSOLE
|
|
z_x86_early_serial_init();
|
|
#endif
|
|
|
|
#if CONFIG_X86_STACK_PROTECTION
|
|
for (int i = 0; i < CONFIG_MP_NUM_CPUS; i++) {
|
|
z_x86_set_stack_guard(z_interrupt_stacks[i]);
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_SMP)
|
|
z_x86_ipi_setup();
|
|
#endif
|
|
|
|
z_cstart();
|
|
}
|