1 files changed, 11 insertions, 1 deletions

diff --git a/drivers/firmware/efi/reboot.c b/drivers/firmware/efi/reboot.c
index 9c59d1c795d1..62ead9b9d871 100644
--- a/drivers/firmware/efi/reboot.c
+++ b/drivers/firmware/efi/reboot.c
@@ -9,7 +9,8 @@ int efi_reboot_quirk_mode = -1;
 
 void efi_reboot(enum reboot_mode reboot_mode, const char *__unused)
 {
-        int efi_mode;
+        const char *str[] = { "cold", "warm", "shutdown", "platform" };
+        int efi_mode, cap_reset_mode;
 
         if (!efi_enabled(EFI_RUNTIME_SERVICES))
                 return;
@@ -30,6 +31,15 @@ void efi_reboot(enum reboot_mode reboot_mode, const char *__unused)
         if (efi_reboot_quirk_mode != -1)
                 efi_mode = efi_reboot_quirk_mode;
 
+        if (efi_capsule_pending(&cap_reset_mode)) {
+                if (efi_mode != cap_reset_mode)
+                        printk(KERN_CRIT "efi: %s reset requested but pending "
+                               "capsule update requires %s reset... Performing "
+                               "%s reset.\n", str[efi_mode], str[cap_reset_mode],
+                               str[cap_reset_mode]);
+                efi_mode = cap_reset_mode;
+        }
+
         efi.reset_system(efi_mode, EFI_SUCCESS, 0, NULL);
 }