mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-26 04:16:39 +00:00
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. Commite6e094e053
("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, after3a63f70bf4
("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. ] Signed-off-by: Kairui Song <kasong@redhat.com> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: AKASHI Takahiro <takahiro.akashi@linaro.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Baoquan He <bhe@redhat.com> Cc: Chao Fan <fanc.fnst@cn.fujitsu.com> Cc: Dave Young <dyoung@redhat.com> Cc: David Howells <dhowells@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: kexec@lists.infradead.org Cc: Philipp Rudo <prudo@linux.vnet.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: x86-ml <x86@kernel.org> Cc: Yannik Sembritzki <yannik@sembritzki.me> Link: https://lkml.kernel.org/r/20190204173852.4863-1-kasong@redhat.com
This commit is contained in:
parent
82df8261c6
commit
ccec81e425
1 changed files with 3 additions and 1 deletions
|
@ -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));
|
||||
|
|
Loading…
Reference in a new issue