Skip to content

Commit df55029

Browse files
mike-travisIngo Molnar
authored andcommitted
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 <[email protected]> Reviewed-by: Steve Wahl <[email protected]> Reviewed-by: Dimitri Sivanich <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Hedi Berriche <[email protected]> Cc: Justin Ernst <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Russ Anderson <[email protected]> Cc: Thomas Gleixner <[email protected]> Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent f5a8f0e commit df55029

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

arch/x86/kernel/apic/x2apic_uv_x.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/export.h>
1616
#include <linux/pci.h>
1717
#include <linux/acpi.h>
18+
#include <linux/efi.h>
1819

1920
#include <asm/e820/api.h>
2021
#include <asm/uv/uv_mmrs.h>
@@ -1483,6 +1484,14 @@ static void __init build_socket_tables(void)
14831484
}
14841485
}
14851486

1487+
/* Check which reboot to use */
1488+
static void check_efi_reboot(void)
1489+
{
1490+
/* If EFI reboot not available, use ACPI reboot */
1491+
if (!efi_enabled(EFI_BOOT))
1492+
reboot_type = BOOT_ACPI;
1493+
}
1494+
14861495
/* Setup user proc fs files */
14871496
static int proc_hubbed_show(struct seq_file *file, void *data)
14881497
{
@@ -1567,6 +1576,8 @@ static __init int uv_system_init_hubless(void)
15671576
if (rc >= 0)
15681577
uv_setup_proc_files(1);
15691578

1579+
check_efi_reboot();
1580+
15701581
return rc;
15711582
}
15721583

@@ -1700,12 +1711,7 @@ static void __init uv_system_init_hub(void)
17001711
/* Register Legacy VGA I/O redirection handler: */
17011712
pci_register_set_vga_state(uv_set_vga_state);
17021713

1703-
/*
1704-
* For a kdump kernel the reset must be BOOT_ACPI, not BOOT_EFI, as
1705-
* EFI is not enabled in the kdump kernel:
1706-
*/
1707-
if (is_kdump_kernel())
1708-
reboot_type = BOOT_ACPI;
1714+
check_efi_reboot();
17091715
}
17101716

17111717
/*

0 commit comments

Comments
 (0)