diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpu/x86/64bit/Makefile.mk | 8 | ||||
| -rw-r--r-- | src/cpu/x86/64bit/pt1G.S | 29 | ||||
| -rw-r--r-- | src/cpu/x86/Kconfig | 7 |
3 files changed, 43 insertions, 1 deletions
diff --git a/src/cpu/x86/64bit/Makefile.mk b/src/cpu/x86/64bit/Makefile.mk index 24a5a966fb..680ab2d42a 100644 --- a/src/cpu/x86/64bit/Makefile.mk +++ b/src/cpu/x86/64bit/Makefile.mk @@ -3,8 +3,14 @@ all_x86-y += mode_switch.S all_x86-y += mode_switch2.S +ifeq ($(CONFIG_USE_1G_PAGETABLES),y) +PAGETABLE_SRC := pt1G.S +else +PAGETABLE_SRC := pt.S +endif + # Add --defsym=_start=0 to suppress a linker warning. -$(objcbfs)/pt: $(dir)/pt.S $(obj)/config.h +$(objcbfs)/pt: $(dir)/$(PAGETABLE_SRC) $(obj)/config.h $(CC_bootblock) $(CFLAGS_bootblock) $(CPPFLAGS_bootblock) -o $@.tmp $< -Wl,--section-start=.rodata=$(CONFIG_ARCH_X86_64_PGTBL_LOC),--defsym=_start=0 $(OBJCOPY_ramstage) -Obinary -j .rodata $@.tmp $@ rm $@.tmp diff --git a/src/cpu/x86/64bit/pt1G.S b/src/cpu/x86/64bit/pt1G.S new file mode 100644 index 0000000000..3ddb620eaa --- /dev/null +++ b/src/cpu/x86/64bit/pt1G.S @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* + * For reference see "AMD64 Architecture Programmer's Manual Volume 2", + * Document 24593-Rev. 3.31-July 2019 Chapter 5.3.4 + * + * Page table attributes: WB, User+Supervisor, Present, Writeable, Accessed, Dirty + */ + +.section .rodata +#define _PRES (1ULL << 0) +#define _RW (1ULL << 1) +#define _US (1ULL << 2) +#define _A (1ULL << 5) +#define _D (1ULL << 6) +#define _PS (1ULL << 7) +#define _GEN_DIR(a) (_PRES + _RW + _US + _A + (a)) +#define _GEN_PAGE(a) (_PRES + _RW + _US + _PS + _A + _D + (a)) + +.global PM4LE +.align 4096 +PM4LE: +.quad _GEN_DIR(PDE_table) + +.align 4096 +PDE_table: /* identity map 1GiB pages * 512 */ +.rept 512 +.quad _GEN_PAGE(0x40000000 * ((. - PDE_table) >> 3)) +.endr diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig index 4e17690cc3..6c784b4c5d 100644 --- a/src/cpu/x86/Kconfig +++ b/src/cpu/x86/Kconfig @@ -150,6 +150,13 @@ config NO_SMM bool default n +config USE_1G_PAGES_TLB + bool + default n + help + Select this option to enable access to up to 512 GiB of memory + by using 1 GiB large pages. + config SMM_ASEG bool default n |