[PATCH 2/2] efi_loader: Reset system after CapsuleUpdate on disk

[Masami Hiramatsu]

Add a config option to reset system soon after processing capsule update
on disk. This is required in UEFI specification 2.9 Section 8.5.5
 "Delivery of Capsules via file on Mass Storage device" as;

    In all cases that a capsule is identified for processing the system is
    restarted after capsule processing is completed.

Signed-off-by: Masami Hiramatsu <masami.hiramatsu at linaro.org>
---
 lib/efi_loader/Kconfig       |   10 ++++++++++
 lib/efi_loader/efi_capsule.c |    9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
index 24f9a2bb75..db05c3ad90 100644
--- a/lib/efi_loader/Kconfig
+++ b/lib/efi_loader/Kconfig
@@ -146,6 +146,16 @@ config EFI_IGNORE_OSINDICATIONS
 	  without setting the EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SUPPORTED
 	  flag in variable OsIndications.
 
+config EFI_RESET_AFTER_CAPSULE_ON_DISK
+	bool "Reset right after CapsuleUpdate on-disk"
+	depends on EFI_CAPSULE_ON_DISK
+	default y
+	help
+	  UEFI specification requests the system to be restarted after capsule
+	  processing is complete. This implements that, but for some reason,
+	  if you want to keep the (old) system running after the capsule update
+	  on-disk, you can say 'n' here.
+
 config EFI_CAPSULE_ON_DISK_EARLY
 	bool "Initiate capsule-on-disk at U-Boot boottime"
 	depends on EFI_CAPSULE_ON_DISK
diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c
index 98dab1c6f5..44d4fa2f82 100644
--- a/lib/efi_loader/efi_capsule.c
+++ b/lib/efi_loader/efi_capsule.c
@@ -1142,6 +1142,15 @@ efi_status_t efi_launch_capsules(void)
 		free(files[i]);
 	free(files);
 
+	/*
+	 * UEFI spec requires to reset system after complete processing capsule
+	 * update on the storage.
+	 */
+	if (IS_ENABLED(CONFIG_EFI_RESET_AFTER_CAPSULE_ON_DISK)) {
+		log_info("Restarting the system to boot the updated firmware.\n");
+		do_reset(NULL, 0, 0, NULL);
+	}
+
 	if (IS_ENABLED(CONFIG_EFI_ESRT)) {
 		/* Rebuild the ESRT to reflect any updated FW images. */
 		ret = efi_esrt_populate();