michaelh/zephyr
1
0
Fork 0
Code Releases Activity

x86: rename CONFIG_EXCEPTION_STACKS_SIZE

Browse source 
This is an x86-specific definition.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2020-09-22 13:59:11 -07:00 • committed by Andrew Boie
commit a696f8ba27
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/core/Kconfig.intel64
View file

@ -20,7 +20,7 @@ config TEST_EXTRA_STACKSIZE
config SYSTEM_WORKQUEUE_STACK_SIZE
default 8192
config EXCEPTION_STACK_SIZE
config X86_EXCEPTION_STACK_SIZE
int "Size of the exception stack(s)"
default 2048
help

8
arch/x86/core/intel64/cpu.c
View file

@ -39,7 +39,7 @@ struct x86_tss64 tss0 = {
#ifdef CONFIG_X86_KPTI
.ist2 = (uint64_t) z_x86_trampoline_stack + Z_X86_TRAMPOLINE_STACK_SIZE,
#endif
.ist7 = (uint64_t) _exception_stack + CONFIG_EXCEPTION_STACK_SIZE,
.ist7 = (uint64_t) _exception_stack + CONFIG_X86_EXCEPTION_STACK_SIZE,
.iomapb = 0xFFFF,
.cpu = &(_kernel.cpus[0])
};
@ -50,7 +50,7 @@ struct x86_tss64 tss1 = {
#ifdef CONFIG_X86_KPTI
.ist2 = (uint64_t) z_x86_trampoline_stack1 + Z_X86_TRAMPOLINE_STACK_SIZE,
#endif
.ist7 = (uint64_t) _exception_stack1 + CONFIG_EXCEPTION_STACK_SIZE,
.ist7 = (uint64_t) _exception_stack1 + CONFIG_X86_EXCEPTION_STACK_SIZE,
.iomapb = 0xFFFF,
.cpu = &(_kernel.cpus[1])
};
@ -62,7 +62,7 @@ struct x86_tss64 tss2 = {
#ifdef CONFIG_X86_KPTI
.ist2 = (uint64_t) z_x86_trampoline_stack2 + Z_X86_TRAMPOLINE_STACK_SIZE,
#endif
.ist7 = (uint64_t) _exception_stack2 + CONFIG_EXCEPTION_STACK_SIZE,
.ist7 = (uint64_t) _exception_stack2 + CONFIG_X86_EXCEPTION_STACK_SIZE,
.iomapb = 0xFFFF,
.cpu = &(_kernel.cpus[2])
};
@ -74,7 +74,7 @@ struct x86_tss64 tss3 = {
#ifdef CONFIG_X86_KPTI
.ist2 = (uint64_t) z_x86_trampoline_stack3 + Z_X86_TRAMPOLINE_STACK_SIZE,
#endif
.ist7 = (uint64_t) _exception_stack3 + CONFIG_EXCEPTION_STACK_SIZE,
.ist7 = (uint64_t) _exception_stack3 + CONFIG_X86_EXCEPTION_STACK_SIZE,
.iomapb = 0xFFFF,
.cpu = &(_kernel.cpus[3])
};

8
arch/x86/core/intel64/locore.S
View file

@ -1022,27 +1022,27 @@ gdt80: /* LGDT descriptor for long mode */
.global _exception_stack
.align 16
_exception_stack:
.fill CONFIG_EXCEPTION_STACK_SIZE, 1, 0xAA
.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
#if CONFIG_MP_NUM_CPUS > 1
.global _exception_stack1
.align 16
_exception_stack1:
.fill CONFIG_EXCEPTION_STACK_SIZE, 1, 0xAA
.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
#endif
#if CONFIG_MP_NUM_CPUS > 2
.global _exception_stack2
.align 16
_exception_stack2:
.fill CONFIG_EXCEPTION_STACK_SIZE, 1, 0xAA
.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
#endif
#if CONFIG_MP_NUM_CPUS > 3
.global _exception_stack3
.align 16
_exception_stack3:
.fill CONFIG_EXCEPTION_STACK_SIZE, 1, 0xAA
.fill CONFIG_X86_EXCEPTION_STACK_SIZE, 1, 0xAA
#endif
#ifdef CONFIG_X86_KPTI