mirror of https://gitee.com/openkylin/linux.git
x86/boot: Early parse RSDP and save it in boot_params
The RSDP is needed by KASLR so parse it early and save it in boot_params.acpi_rsdp_addr, before KASLR setup runs. RSDP is needed by other kernel facilities so have the parsing code built-in instead of a long "depends on" line in Kconfig. [ bp: - Trim commit message and comments - Add CONFIG_ACPI dependency in the Makefile - Move ->acpi_rsdp_addr assignment with the rest of boot_params massaging in extract_kernel(). ] Signed-off-by: Chao Fan <fanc.fnst@cn.fujitsu.com> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: bhe@redhat.com Cc: Cao jin <caoj.fnst@cn.fujitsu.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: indou.takao@jp.fujitsu.com Cc: Ingo Molnar <mingo@redhat.com> Cc: Juergen Gross <jgross@suse.com> Cc: kasong@redhat.com Cc: Kees Cook <keescook@chromium.org> Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: msys.mizuma@gmail.com Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tom Lendacky <thomas.lendacky@amd.com> Cc: x86-ml <x86@kernel.org> Link: https://lkml.kernel.org/r/20190123110850.12433-6-fanc.fnst@cn.fujitsu.com
This commit is contained in:
parent
93a209aaaa
commit
3a63f70bf4
|
@ -84,6 +84,8 @@ ifdef CONFIG_X86_64
|
||||||
vmlinux-objs-y += $(obj)/pgtable_64.o
|
vmlinux-objs-y += $(obj)/pgtable_64.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
vmlinux-objs-$(CONFIG_ACPI) += $(obj)/acpi.o
|
||||||
|
|
||||||
$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
|
$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
|
||||||
|
|
||||||
vmlinux-objs-$(CONFIG_EFI_STUB) += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o \
|
vmlinux-objs-$(CONFIG_EFI_STUB) += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o \
|
||||||
|
|
|
@ -184,3 +184,22 @@ static acpi_physical_address bios_get_rsdp_addr(void)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Return RSDP address on success, otherwise 0. */
|
||||||
|
acpi_physical_address get_rsdp_addr(void)
|
||||||
|
{
|
||||||
|
acpi_physical_address pa;
|
||||||
|
|
||||||
|
pa = get_acpi_rsdp();
|
||||||
|
|
||||||
|
if (!pa)
|
||||||
|
pa = boot_params->acpi_rsdp_addr;
|
||||||
|
|
||||||
|
if (!pa)
|
||||||
|
pa = efi_get_rsdp_addr();
|
||||||
|
|
||||||
|
if (!pa)
|
||||||
|
pa = bios_get_rsdp_addr();
|
||||||
|
|
||||||
|
return pa;
|
||||||
|
}
|
||||||
|
|
|
@ -351,6 +351,9 @@ asmlinkage __visible void *extract_kernel(void *rmode, memptr heap,
|
||||||
/* Clear flags intended for solely in-kernel use. */
|
/* Clear flags intended for solely in-kernel use. */
|
||||||
boot_params->hdr.loadflags &= ~KASLR_FLAG;
|
boot_params->hdr.loadflags &= ~KASLR_FLAG;
|
||||||
|
|
||||||
|
/* Save RSDP address for later use. */
|
||||||
|
boot_params->acpi_rsdp_addr = get_rsdp_addr();
|
||||||
|
|
||||||
sanitize_boot_params(boot_params);
|
sanitize_boot_params(boot_params);
|
||||||
|
|
||||||
if (boot_params->screen_info.orig_video_mode == 7) {
|
if (boot_params->screen_info.orig_video_mode == 7) {
|
||||||
|
|
|
@ -119,3 +119,10 @@ static inline void console_init(void)
|
||||||
void set_sev_encryption_mask(void);
|
void set_sev_encryption_mask(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* acpi.c */
|
||||||
|
#ifdef CONFIG_ACPI
|
||||||
|
acpi_physical_address get_rsdp_addr(void);
|
||||||
|
#else
|
||||||
|
static inline acpi_physical_address get_rsdp_addr(void) { return 0; }
|
||||||
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue