diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-26 17:10:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-26 17:10:53 -0500 |
| commit | 693650b15d04cd5a5861bd3136c9ed9e23f95c41 (patch) | |
| tree | b4a3b3ca5d9b6b6f10e3d6880f1caa17219776c2 /lib/efi_loader/efi_boottime.c | |
| parent | 2ad8d0cb950da2233a2ec030533f4e54c6d04126 (diff) | |
| parent | 2b5e7108594d4e100c88f44353d1fed6456d6471 (diff) | |
Merge tag 'efi-2022-01-rc3-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-01-rc3-2
Test:
* fix pylint warnings
UEFI:
* disable interrupts before removing devices in ExitBootServices()
* implement poweroff in efi_system_reset() on sandbox
* allow booting via EFI even if some block device fails
Diffstat (limited to 'lib/efi_loader/efi_boottime.c')
| -rw-r--r-- | lib/efi_loader/efi_boottime.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 6fdd0ef77a..8492b732f3 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -2167,6 +2167,7 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, } if (!efi_st_keep_devices) { + bootm_disable_interrupts(); if (IS_ENABLED(CONFIG_USB_DEVICE)) udc_disconnect(); board_quiesce_devices(); @@ -2179,9 +2180,6 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, /* Fix up caches for EFI payloads if necessary */ efi_exit_caches(); - /* This stops all lingering devices */ - bootm_disable_interrupts(); - /* Disable boot time services */ systab.con_in_handle = NULL; systab.con_in = NULL; |