[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <157045977153.9978.11327097635396647421.tip-bot2@tip-bot2>
Date: Mon, 07 Oct 2019 14:49:31 -0000
From: "tip-bot2 for Mike Travis" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Mike Travis <mike.travis@....com>, Steve Wahl <steve.wahl@....com>,
Dimitri Sivanich <dimitri.sivanich@....com>,
Andrew Morton <akpm@...ux-foundation.org>,
Borislav Petkov <bp@...en8.de>,
Christoph Hellwig <hch@...radead.org>,
"H. Peter Anvin" <hpa@...or.com>,
Hedi Berriche <hedi.berriche@....com>,
Justin Ernst <justin.ernst@....com>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Peter Zijlstra <peterz@...radead.org>,
Russ Anderson <russ.anderson@....com>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...nel.org>, linux-kernel@...r.kernel.org
Subject: [tip: x86/platform] x86/platform/uv: Check EFI Boot to set reboot type
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.travis@....com>
AuthorDate: Tue, 10 Sep 2019 09:58:46 -05:00
Committer: Ingo Molnar <mingo@...nel.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.travis@....com>
Reviewed-by: Steve Wahl <steve.wahl@....com>
Reviewed-by: Dimitri Sivanich <dimitri.sivanich@....com>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Christoph Hellwig <hch@...radead.org>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Hedi Berriche <hedi.berriche@....com>
Cc: Justin Ernst <justin.ernst@....com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Russ Anderson <russ.anderson@....com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: https://lkml.kernel.org/r/20190910145840.215091717@stormcage.eag.rdlabs.hpecorp.net
Signed-off-by: Ingo Molnar <mingo@...nel.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();
}
/*
Powered by blists - more mailing lists