michaelh/zephyr
1
0
Fork 0
Code Releases Activity
zephyr/arch/x86/core/prep_c.c

69 lines
1.3 KiB
C
Raw Normal View History

x86: add prep_c function Assembly language start code will enter here, which sets up early kernel initialization and then calls z_cstart() when finished. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2019-08-05 16:17:48 -07:00
/*
* Copyright (c) 2019 Intel Corporation
*
* SPDX-License-Identifier: Apache-2.0
*/
headers: Refactor kernel and arch headers. This commit refactors kernel and arch headers to establish a boundary between private and public interface headers. The refactoring strategy used in this commit is detailed in the issue This commit introduces the following major changes: 1. Establish a clear boundary between private and public headers by removing "kernel/include" and "arch/*/include" from the global include paths. Ideally, only kernel/ and arch/*/ source files should reference the headers in these directories. If these headers must be used by a component, these include paths shall be manually added to the CMakeLists.txt file of the component. This is intended to discourage applications from including private kernel and arch headers either knowingly and unknowingly. - kernel/include/ (PRIVATE) This directory contains the private headers that provide private kernel definitions which should not be visible outside the kernel and arch source code. All public kernel definitions must be added to an appropriate header located under include/. - arch/*/include/ (PRIVATE) This directory contains the private headers that provide private architecture-specific definitions which should not be visible outside the arch and kernel source code. All public architecture- specific definitions must be added to an appropriate header located under include/arch/*/. - include/ AND include/sys/ (PUBLIC) This directory contains the public headers that provide public kernel definitions which can be referenced by both kernel and application code. - include/arch/*/ (PUBLIC) This directory contains the public headers that provide public architecture-specific definitions which can be referenced by both kernel and application code. 2. Split arch_interface.h into "kernel-to-arch interface" and "public arch interface" divisions. - kernel/include/kernel_arch_interface.h * provides private "kernel-to-arch interface" definition. * includes arch/*/include/kernel_arch_func.h to ensure that the interface function implementations are always available. * includes sys/arch_interface.h so that public arch interface definitions are automatically included when including this file. - arch/*/include/kernel_arch_func.h * provides architecture-specific "kernel-to-arch interface" implementation. * only the functions that will be used in kernel and arch source files are defined here. - include/sys/arch_interface.h * provides "public arch interface" definition. * includes include/arch/arch_inlines.h to ensure that the architecture-specific public inline interface function implementations are always available. - include/arch/arch_inlines.h * includes architecture-specific arch_inlines.h in include/arch/*/arch_inline.h. - include/arch/*/arch_inline.h * provides architecture-specific "public arch interface" inline function implementation. * supersedes include/sys/arch_inline.h. 3. Refactor kernel and the existing architecture implementations. - Remove circular dependency of kernel and arch headers. The following general rules should be observed: * Never include any private headers from public headers * Never include kernel_internal.h in kernel_arch_data.h * Always include kernel_arch_data.h from kernel_arch_func.h * Never include kernel.h from kernel_struct.h either directly or indirectly. Only add the kernel structures that must be referenced from public arch headers in this file. - Relocate syscall_handler.h to include/ so it can be used in the public code. This is necessary because many user-mode public codes reference the functions defined in this header. - Relocate kernel_arch_thread.h to include/arch/*/thread.h. This is necessary to provide architecture-specific thread definition for 'struct k_thread' in kernel.h. - Remove any private header dependencies from public headers using the following methods: * If dependency is not required, simply omit * If dependency is required, - Relocate a portion of the required dependencies from the private header to an appropriate public header OR - Relocate the required private header to make it public. This commit supersedes #20047, addresses #19666, and fixes #3056. Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
2019-10-25 00:08:21 +09:00
#include <kernel.h>
#include <kernel_internal.h>
arch/x86: rudimentary ACPI support Implement a simple ACPI parser with enough functionality to enumerate CPU cores and determine their local APIC IDs. Signed-off-by: Charles E. Youse <charles.youse@intel.com>
2019-09-06 15:03:38 -04:00
#include <arch/x86/acpi.h>
arch/x86: multiboot: migrate multiboot initialization to early C Originally, the multiboot info struct was copied in the early assembly language code. This code is moved to a C function in multiboot.c for two reasons: 1. It's about to get more complicated, as we want the ability to use a multiboot-provided memory map if available, and 2. this will faciliate its sharing between 32- and 64-bit subarches. Signed-off-by: Charles E. Youse <charles.youse@intel.com>
2019-09-09 14:05:41 -04:00
#include <arch/x86/multiboot.h>
arch/x86: Prepare EFI support As for Multiboot, let prep_c be aware of EFI boot. In the futur, EFI will pass an argument to it. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2020-09-15 12:58:51 +02:00
#include <arch/x86/efi.h>
x86: paging code rewrite The x86 paging code has been rewritten to support another paging mode and non-identity virtual mappings. - Paging code now uses an array of paging level characteristics and walks tables using for loops. This is opposed to having different functions for every paging level and lots of #ifdefs. The code is now more concise and adding new paging modes should be trivial. - We now support 32-bit, PAE, and IA-32e page tables. - The page tables created by gen_mmu.py are now installed at early boot. There are no longer separate "flat" page tables. These tables are mutable at any time. - The x86_mmu code now has a private header. Many definitions that did not need to be in public scope have been moved out of mmustructs.h and either placed in the C file or in the private header. - Improvements to dumping page table information, with the physical mapping and flags all shown - arch_mem_map() implemented - x86 userspace/memory domain code ported to use the new infrastructure. - add logic for physical -> virtual instruction pointer transition, including cleaning up identity mappings after this takes place. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2020-07-04 16:23:32 -07:00
#include <x86_mmu.h>
x86: add prep_c function Assembly language start code will enter here, which sets up early kernel initialization and then calls z_cstart() when finished. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2019-08-05 16:17:48 -07:00
arch/x86: elevate prep_c.c to common code Elevate the previously 32-bit-only z_x86_prep_c() function to common code, so both 32-bit and 64-bit arches now enter the kernel this way. Minor changes to prep_c.c to make it build with the SMP scheduler on. Signed-off-by: Charles E. Youse <charles.youse@intel.com>
2019-09-28 14:25:13 -04:00
extern FUNC_NORETURN void z_cstart(void);
arch/x86: Add a spurious interrupt handler to x86_64 Right now x86_64 doesn't install handlers for vectors that aren't populated by Zephyr code. Add a tiny spurious interrupt handler that logs the error and triggers a fatal error, like other platforms do. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2020-06-16 12:49:54 -07:00
extern void x86_64_irq_init(void);
arch/x86: elevate prep_c.c to common code Elevate the previously 32-bit-only z_x86_prep_c() function to common code, so both 32-bit and 64-bit arches now enter the kernel this way. Minor changes to prep_c.c to make it build with the SMP scheduler on. Signed-off-by: Charles E. Youse <charles.youse@intel.com>
2019-09-28 14:25:13 -04:00
arch/x86: Expand cpu boot argument In order to mitigate at runtime whether it booted on multiboot or EFI, let's introduce a dedicated x86 cpu argument structure which holds the type and the actual pointer delivered by the method (multiboot_info, or efi_system_table) Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2020-09-18 09:05:50 +02:00
#if !defined(CONFIG_X86_64)
x86_boot_arg_t x86_cpu_boot_arg;
#endif
kernel: cleanup and formally define CPU start fn The "key" parameter is legacy, remove it. Add a typedef for the expected function pointer type. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2020-01-10 12:51:38 -08:00
/* Early global initialization functions, C domain. This runs only on the first
* CPU for SMP systems.
*/
x86: ia32: mark symbols for boot and pinned regions This marks code and data within x86/ia32 so they are going to reside in boot and pinned regions. This is a step to enable demand paging for whole kernel. Signed-off-by: Daniel Leung <daniel.leung@intel.com>
2021-02-25 16:42:53 -08:00
__boot_func
kernel: cleanup and formally define CPU start fn The "key" parameter is legacy, remove it. Add a typedef for the expected function pointer type. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2020-01-10 12:51:38 -08:00
FUNC_NORETURN void z_x86_prep_c(void *arg)
x86: add prep_c function Assembly language start code will enter here, which sets up early kernel initialization and then calls z_cstart() when finished. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2019-08-05 16:17:48 -07:00
{
arch/x86: Expand cpu boot argument In order to mitigate at runtime whether it booted on multiboot or EFI, let's introduce a dedicated x86 cpu argument structure which holds the type and the actual pointer delivered by the method (multiboot_info, or efi_system_table) Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2020-09-18 09:05:50 +02:00
x86_boot_arg_t *cpu_arg = arg;
arch/x86: alter signature of z_x86_prep_c() function Take a dummy first argument, so that the BSP entry point (z_x86_prep_c) has the same signature as the AP entry point (smp_init_top). Signed-off-by: Charles E. Youse <charles.youse@intel.com>
2019-09-28 21:26:00 -04:00
arch/x86: elevate prep_c.c to common code Elevate the previously 32-bit-only z_x86_prep_c() function to common code, so both 32-bit and 64-bit arches now enter the kernel this way. Minor changes to prep_c.c to make it build with the SMP scheduler on. Signed-off-by: Charles E. Youse <charles.youse@intel.com>
2019-09-28 14:25:13 -04:00
_kernel.cpus[0].nested = 0;
x86: add prep_c function Assembly language start code will enter here, which sets up early kernel initialization and then calls z_cstart() when finished. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2019-08-05 16:17:48 -07:00
x86: mmu: relax KERNEL_VM_OFFSET == SRAM_OFFSET There was a restriction that KERNEL_VM_OFFSET must equal to SRAM_OFFSET so that page directory pointer (PDP) or page directory (PD) can be reused. This is not very practical in real world due to various hardware designs, especially those where SRAM is not aligned to PDP or PD. So rework those bits. Signed-off-by: Daniel Leung <daniel.leung@intel.com>
2021-05-03 13:07:31 -07:00
#ifdef CONFIG_MMU
z_x86_mmu_init();
#endif
x86: move calling z_loapic_enable into z_x86_prep_c This moves calling z_loapic_enable() from crt0.S into z_x86_prep_c(). This is done so we can move BSS clearing and data section copying inside z_x86_prep_c() as these are needed before calling z_loapic_enable(). Signed-off-by: Daniel Leung <daniel.leung@intel.com>
2021-02-10 14:18:45 -08:00
#if defined(CONFIG_LOAPIC)
z_loapic_enable(0);
#endif
arch/x86: Add a spurious interrupt handler to x86_64 Right now x86_64 doesn't install handlers for vectors that aren't populated by Zephyr code. Add a tiny spurious interrupt handler that logs the error and triggers a fatal error, like other platforms do. Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
2020-06-16 12:49:54 -07:00
#ifdef CONFIG_X86_64
x86_64_irq_init();
#endif
arch/x86: Expand cpu boot argument In order to mitigate at runtime whether it booted on multiboot or EFI, let's introduce a dedicated x86 cpu argument structure which holds the type and the actual pointer delivered by the method (multiboot_info, or efi_system_table) Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2020-09-18 09:05:50 +02:00
if (IS_ENABLED(CONFIG_MULTIBOOT_INFO) &&
cpu_arg->boot_type == MULTIBOOT_BOOT_TYPE) {
z_multiboot_init((struct multiboot_info *)cpu_arg->arg);
arch/x86: Prepare EFI support As for Multiboot, let prep_c be aware of EFI boot. In the futur, EFI will pass an argument to it. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2020-09-15 12:58:51 +02:00
} else if (IS_ENABLED(CONFIG_X86_EFI) &&
cpu_arg->boot_type == EFI_BOOT_TYPE) {
zefi: Add an EFI boot argument passing ACPI RSDP info If such table pointer is present with EFI system table, this will speed up ACPI initialization later on. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2021-02-25 13:16:53 +01:00
efi_init((struct efi_boot_arg *)cpu_arg->arg);
arch/x86: Expand cpu boot argument In order to mitigate at runtime whether it booted on multiboot or EFI, let's introduce a dedicated x86 cpu argument structure which holds the type and the actual pointer delivered by the method (multiboot_info, or efi_system_table) Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2020-09-18 09:05:50 +02:00
} else {
ARG_UNUSED(cpu_arg);
}
arch/x86: multiboot: migrate multiboot initialization to early C Originally, the multiboot info struct was copied in the early assembly language code. This code is moved to a C function in multiboot.c for two reasons: 1. It's about to get more complicated, as we want the ability to use a multiboot-provided memory map if available, and 2. this will faciliate its sharing between 32- and 64-bit subarches. Signed-off-by: Charles E. Youse <charles.youse@intel.com>
2019-09-09 14:05:41 -04:00
arch/x86: Initialize early serial a tiny bit later 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>
2022-03-16 10:14:44 +01:00
#ifdef CONFIG_X86_VERY_EARLY_CONSOLE
z_x86_early_serial_init();
#endif
x86: add prep_c function Assembly language start code will enter here, which sets up early kernel initialization and then calls z_cstart() when finished. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2019-08-05 16:17:48 -07:00
#if CONFIG_X86_STACK_PROTECTION
kernel: introduce supervisor-only stacks These stacks are appropriate for threads that run purely in supervisor mode, and also as stacks for interrupt and exception handling. Two new arch defines are introduced: - ARCH_KERNEL_STACK_GUARD_SIZE - ARCH_KERNEL_STACK_OBJ_ALIGN New public declaration macros: - K_KERNEL_STACK_RESERVED - K_KERNEL_STACK_EXTERN - K_KERNEL_STACK_DEFINE - K_KERNEL_STACK_ARRAY_DEFINE - K_KERNEL_STACK_MEMBER - K_KERNEL_STACK_SIZEOF If user mode is not enabled, K_KERNEL_STACK_* and K_THREAD_STACK_* are equivalent. Separately generated privilege elevation stacks are now declared like kernel stacks, removing the need for K_PRIVILEGE_STACK_ALIGN. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2020-04-24 16:24:46 -07:00
for (int i = 0; i < CONFIG_MP_NUM_CPUS; i++) {
z_x86_set_stack_guard(z_interrupt_stacks[i]);
}
x86: add prep_c function Assembly language start code will enter here, which sets up early kernel initialization and then calls z_cstart() when finished. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2019-08-05 16:17:48 -07:00
#endif
arch/x86: (Intel64) add scheduler IPI support Add z_arch_sched_ipi() and such to enable scheduler IPIs when SMP. Signed-off-by: Charles E. Youse <charles.youse@intel.com>
2019-09-30 13:28:36 -04:00
#if defined(CONFIG_SMP)
z_x86_ipi_setup();
#endif
x86: add prep_c function Assembly language start code will enter here, which sets up early kernel initialization and then calls z_cstart() when finished. Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2019-08-05 16:17:48 -07:00
z_cstart();
}
Copy permalink