summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHeinrich Schuchardt <xypron.glpk@gmx.de>2020-09-10 07:47:58 +0200
committerHeinrich Schuchardt <xypron.glpk@gmx.de>2020-09-14 23:28:52 +0200
commit5bf12a78599d4a311265c174496233aa15ed4252 (patch)
tree3eb74c79ca37b2226ddc30ef9e1fe964bd594f43 /lib
parentd68d7f47a9f1942ee64e0b119f0e1e2ebf660ed1 (diff)
downloadu-boot-socfpga-5bf12a78599d4a311265c174496233aa15ed4252.tar.gz
efi_selftest: restore gd before do_reset()
Before calling do_reset() in the EFI selftest we must restore the global data pointer. Fixes: fa63753f86cc ("efi_selftest: substitute ResetSystem() by do_reset()") Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/efi_selftest/efi_selftest.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/efi_selftest/efi_selftest.c b/lib/efi_selftest/efi_selftest.c
index 6eec8ae2a7..165fa265f2 100644
--- a/lib/efi_selftest/efi_selftest.c
+++ b/lib/efi_selftest/efi_selftest.c
@@ -311,11 +311,13 @@ efi_status_t EFIAPI efi_selftest(efi_handle_t image_handle,
efi_st_printf("Preparing for reset. Press any key...\n");
efi_st_get_key();
- if (IS_ENABLED(CONFIG_EFI_HAVE_RUNTIME_RESET))
+ if (IS_ENABLED(CONFIG_EFI_HAVE_RUNTIME_RESET)) {
runtime->reset_system(EFI_RESET_WARM, EFI_NOT_READY,
sizeof(reset_message), reset_message);
- else
+ } else {
+ efi_restore_gd();
do_reset(NULL, 0, 0, NULL);
+ }
efi_st_printf("\n");
efi_st_error("Reset failed\n");