1 files changed, 9 insertions, 0 deletions

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index ab0adc0fa5db..a9b31eb815f2 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -535,6 +535,15 @@ static void native_machine_emergency_restart(void)
         mode = reboot_mode == REBOOT_WARM ? 0x1234 : 0;
         *((unsigned short *)__va(0x472)) = mode;
 
+        /*
+         * If an EFI capsule has been registered with the firmware then
+         * override the reboot= parameter.
+         */
+        if (efi_capsule_pending(NULL)) {
+                pr_info("EFI capsule is pending, forcing EFI reboot.\n");
+                reboot_type = BOOT_EFI;
+        }
+
         for (;;) {
                 /* Could also try the reset bit in the Hammer NB */
                 switch (reboot_type) {