Commit 4ecf7191 authored by Stefan Assmann's avatar Stefan Assmann Committed by Ingo Molnar

x86/efi: Fix reboot_mode when EFI runtime services are disabled

When EFI runtime services are disabled, for example by the "noefi"
kernel cmdline parameter, the reboot_type could still be set to
BOOT_EFI causing reboot to fail.

Fix this by checking if EFI runtime services are enabled.
Signed-off-by: default avatarStefan Assmann <sassmann@kpanic.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20170724122248.24006-1-sassmann@kpanic.de
[ Fixed 'not disabled' double negation. ]
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 18d5e6c3
...@@ -471,12 +471,12 @@ static int __init reboot_init(void) ...@@ -471,12 +471,12 @@ static int __init reboot_init(void)
/* /*
* The DMI quirks table takes precedence. If no quirks entry * The DMI quirks table takes precedence. If no quirks entry
* matches and the ACPI Hardware Reduced bit is set, force EFI * matches and the ACPI Hardware Reduced bit is set and EFI
* reboot. * runtime services are enabled, force EFI reboot.
*/ */
rv = dmi_check_system(reboot_dmi_table); rv = dmi_check_system(reboot_dmi_table);
if (!rv && efi_reboot_required()) if (!rv && efi_reboot_required() && !efi_runtime_disabled())
reboot_type = BOOT_EFI; reboot_type = BOOT_EFI;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment