GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/x86: Link gdt_init.S into bootblock 

Followup work forces gdtptr and gdt towards the top of
bootblock. They need to be realmode-addressable, i.e.
within top 64 KiB or same segment with .reset.

Change-Id: Ib6f23b2808d0a7e0d277d00a9b0f30c49fdefdd5
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47965
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Kyösti Mälkki 2020-11-19 16:41:28 +02:00 committed by Hung-Te Lin
parent 54b5e20cf8
commit 97b76f7191
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/arch/x86/Makefile.inc
View File

@ -98,6 +98,7 @@ bootblock-y += memmove.c
bootblock-$(CONFIG_COLLECT_TIMESTAMPS_TSC) += timestamp.c bootblock-$(CONFIG_COLLECT_TIMESTAMPS_TSC) += timestamp.c
bootblock-$(CONFIG_X86_TOP4G_BOOTMEDIA_MAP) += mmap_boot.c bootblock-$(CONFIG_X86_TOP4G_BOOTMEDIA_MAP) += mmap_boot.c
bootblock-$(CONFIG_BOOTBLOCK_NORMAL) += bootblock_normal.c bootblock-$(CONFIG_BOOTBLOCK_NORMAL) += bootblock_normal.c
bootblock-y += gdt_init.S
bootblock-y += id.S bootblock-y += id.S
bootblock-$(CONFIG_HAVE_CF9_RESET) += cf9_reset.c bootblock-$(CONFIG_HAVE_CF9_RESET) += cf9_reset.c
@ -160,8 +161,6 @@ ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32)$(CONFIG_ARCH_ROMSTAGE_X86_64),y)
romstage-y += boot.c romstage-y += boot.c
romstage-y += post.c romstage-y += post.c
# gdt_init.S is included by entry32.inc when romstage is the first C
# environment.
romstage-y += gdt_init.S romstage-y += gdt_init.S
romstage-y += cpu_common.c romstage-y += cpu_common.c
romstage-$(CONFIG_IDT_IN_EVERY_STAGE) += exception.c romstage-$(CONFIG_IDT_IN_EVERY_STAGE) += exception.c

4
src/arch/x86/c_start.S
View File

@ -142,10 +142,10 @@ gdtaddr:
/* This is the gdt for GCC part of coreboot. /* This is the gdt for GCC part of coreboot.
* It is different from the gdt in ASM part of coreboot * It is different from the gdt in ASM part of coreboot
* which is defined in entry32.inc * which is defined in gdt_init.S
* *
* When the machine is initially started, we use a very simple * When the machine is initially started, we use a very simple
* gdt from ROM (that in entry32.inc) which only contains those * gdt from ROM (that in gdt_init.S) which only contains those
* entries we need for protected mode. * entries we need for protected mode.
* *
* When we're executing code from RAM, we want to do more complex * When we're executing code from RAM, we want to do more complex

2
src/cpu/x86/16bit/entry16.inc
View File

@ -124,7 +124,7 @@ _start16bit:
ljmpl $ROM_CODE_SEG, $__protected_start ljmpl $ROM_CODE_SEG, $__protected_start
/** /**
* The gdt is defined in entry32.inc, it has a 4 Gb code segment * The gdt is defined in gdt_init.S, it has a 4 Gb code segment
* at 0x08, and a 4 GB data segment at 0x10; * at 0x08, and a 4 GB data segment at 0x10;
*/ */
__gdtptr: __gdtptr:

1
src/cpu/x86/32bit/entry32.inc
View File

@ -4,7 +4,6 @@
#include <arch/rom_segs.h> #include <arch/rom_segs.h>
#include <cpu/x86/post_code.h> #include <cpu/x86/post_code.h>
#include <arch/x86/gdt_init.S>
.code32 .code32
/* /*