diff options
author | Chao Fan <fanc.fnst@cn.fujitsu.com> | 2019-01-23 14:08:48 +0300 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2019-02-01 13:52:55 +0300 |
commit | 3a63f70bf4c3a17f5d9c9bf3bc3288a23bdfefce (patch) | |
tree | aa7b862cbe8ba794b260801f5f80a0f5a9b552d8 /arch/x86/boot/compressed/acpi.c | |
parent | 93a209aaaad495d7d0bc9b6186a4495934f70402 (diff) | |
download | linux-3a63f70bf4c3a17f5d9c9bf3bc3288a23bdfefce.tar.xz |
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
Diffstat (limited to 'arch/x86/boot/compressed/acpi.c')
-rw-r--r-- | arch/x86/boot/compressed/acpi.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c index 66bda1b5cf94..b2b50ad5299a 100644 --- a/arch/x86/boot/compressed/acpi.c +++ b/arch/x86/boot/compressed/acpi.c @@ -184,3 +184,22 @@ static acpi_physical_address bios_get_rsdp_addr(void) 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; +} |