x86, kexec_file_load: fill in acpi_rsdp_addr boot param unconditionally
Subsystems (3)
PATCH 1/1 x86, kexec_file_load: fill in acpi_rsdp_addr boot param unconditionally
When efi=noruntime or efi=oldmap is used, EFI services won't be available in the second kernel, therefore the second kernel will not be able to get the ACPI RSDP address from firmware by calling EFI services so it won't boot. Previously we are expecting the user to set the acpi_rsdp=<addr> on kernel command line for second kernel as there was no other way to pass RSDP address to second kernel.
After commit e6e094e053af ("x86/acpi, x86/boot: Take RSDP address from boot params if available"), now it's possible to set an acpi_rsdp_addr parameter in the boot_params passed to second kernel, and kernel will prefer using this value for the RSDP address when it's set.
And with commit 3a63f70bf4c3 ("x86/boot: Early parse RSDP and save it in boot_params"), now the acpi_rsdp_addr will always be filled with valid RSDP address. So we just fill in that value for second kernel's boot_params unconditionally, this ensure second kernel always use the same RSDP value as the first kernel.
Tested with an EFI enabled KVM VM with efi=noruntime.
---
This is update of part of patch series: "[PATCH v3 0/3] make kexec work with efi=noruntime or efi=old_map."
But "[PATCH v3 1/3] x86, kexec_file_load: Don't setup EFI info if EFI runtime is not enabled" is already in [tip:x86/urgent], and with Chao's commit 3a63f70bf4c3 in [tip:x86/boot], we can just fill in acpi_rsdp_addr boot param unconditionally to fix the problem, so only I update and resend this patch.
arch/x86/kernel/kexec-bzimage64.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kernel/kexec-bzimage64.c +3 -1
@@ -218,6 +218,9 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params, params->screen_info.ext_mem_k =0 ; params->alt_mem_k =0 ; +/* Always fill in RSDP, it's either 0 or a valid value */ + params->acpi_rsdp_addr = boot_params.acpi_rsdp_addr; +/* Default APM info */ memset (¶ms->apm_bios_info,0 ,sizeof (params->apm_bios_info));
@@ -256,7 +259,6 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params,setup_efi_state (params, params_load_addr, efi_map_offset, efi_map_sz, efi_setup_data_offset);#endif -/* Setup EDD info */ memcpy (params->eddbuf, boot_params.eddbuf,EDDMAXNR *sizeof (struct edd_info ));
Signature · 1 line
2.20.1
tip-bot for Kairui Song
merge bot[tip:x86/boot] x86/kexec: Fill in acpi_rsdp_addr from the first kernel
x86/kexec: Fill in acpi_rsdp_addr from the first kernel
Commit-ID: ccec81e4251f5a5421e02874e394338a897056ca Gitweb: https://git.kernel.org/tip/ccec81e4251f5a5421e02874e394338a897056ca Author: Kairui Song <[email protected]> AuthorDate: Tue, 5 Feb 2019 01:38:52 +0800 Committer: Borislav Petkov <[email protected]> CommitDate: Wed, 6 Feb 2019 15:29:03 +0100
x86/kexec: Fill in acpi_rsdp_addr from the first kernel
When efi=noruntime or efi=oldmap is used on the kernel command line, EFI services won't be available in the second kernel, therefore the second kernel will not be able to get the ACPI RSDP address from firmware by calling EFI services and so it won't boot.
Commit
e6e094e053af ("x86/acpi, x86/boot: Take RSDP address from boot params if available")
added an acpi_rsdp_addr field to boot_params which stores the RSDP address for other kernel users.
Recently, after
3a63f70bf4c3 ("x86/boot: Early parse RSDP and save it in boot_params")
the acpi_rsdp_addr will always be filled with a valid RSDP address.
So fill in that value into the second kernel's boot_params thus ensuring that the second kernel receives the RSDP value from the first kernel.
[ bp: massage commit message. ]
--- arch/x86/kernel/kexec-bzimage64.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kernel/kexec-bzimage64.c +3 -1
@@ -215,6 +215,9 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params, params->screen_info.ext_mem_k =0 ; params->alt_mem_k =0 ; +/* Always fill in RSDP: it is either 0 or a valid value */ + params->acpi_rsdp_addr = boot_params.acpi_rsdp_addr; +/* Default APM info */ memset (¶ms->apm_bios_info,0 ,sizeof (params->apm_bios_info));
@@ -253,7 +256,6 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params,setup_efi_state (params, params_load_addr, efi_map_offset, efi_map_sz, efi_setup_data_offset);#endif -/* Setup EDD info */ memcpy (params->eddbuf, boot_params.eddbuf,EDDMAXNR *sizeof (struct edd_info ));