The following commit has been merged into the x86/platform branch of tip: Commit-ID: df55029f7ea65d8c653a79dd728918dfe25b1356 Gitweb: https://git.kernel.org/tip/df55029f7ea65d8c653a79dd728918dfe25b1356 Author: Mike Travis <mike.tra...@hpe.com> AuthorDate: Tue, 10 Sep 2019 09:58:46 -05:00 Committer: Ingo Molnar <mi...@kernel.org> CommitterDate: Mon, 07 Oct 2019 13:42:11 +02:00
x86/platform/uv: Check EFI Boot to set reboot type Change to checking for EFI Boot type from previous check on if this is a KDUMP kernel. This allows for KDUMP kernels that can handle EFI reboots. Signed-off-by: Mike Travis <mike.tra...@hpe.com> Reviewed-by: Steve Wahl <steve.w...@hpe.com> Reviewed-by: Dimitri Sivanich <dimitri.sivan...@hpe.com> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Borislav Petkov <b...@alien8.de> Cc: Christoph Hellwig <h...@infradead.org> Cc: H. Peter Anvin <h...@zytor.com> Cc: Hedi Berriche <hedi.berri...@hpe.com> Cc: Justin Ernst <justin.er...@hpe.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Russ Anderson <russ.ander...@hpe.com> Cc: Thomas Gleixner <t...@linutronix.de> Link: https://lkml.kernel.org/r/20190910145840.215091...@stormcage.eag.rdlabs.hpecorp.net Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/x86/kernel/apic/x2apic_uv_x.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index ec940ad..d5b51a7 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -15,6 +15,7 @@ #include <linux/export.h> #include <linux/pci.h> #include <linux/acpi.h> +#include <linux/efi.h> #include <asm/e820/api.h> #include <asm/uv/uv_mmrs.h> @@ -1483,6 +1484,14 @@ static void __init build_socket_tables(void) } } +/* Check which reboot to use */ +static void check_efi_reboot(void) +{ + /* If EFI reboot not available, use ACPI reboot */ + if (!efi_enabled(EFI_BOOT)) + reboot_type = BOOT_ACPI; +} + /* Setup user proc fs files */ static int proc_hubbed_show(struct seq_file *file, void *data) { @@ -1567,6 +1576,8 @@ static __init int uv_system_init_hubless(void) if (rc >= 0) uv_setup_proc_files(1); + check_efi_reboot(); + return rc; } @@ -1700,12 +1711,7 @@ static void __init uv_system_init_hub(void) /* Register Legacy VGA I/O redirection handler: */ pci_register_set_vga_state(uv_set_vga_state); - /* - * For a kdump kernel the reset must be BOOT_ACPI, not BOOT_EFI, as - * EFI is not enabled in the kdump kernel: - */ - if (is_kdump_kernel()) - reboot_type = BOOT_ACPI; + check_efi_reboot(); } /*
