diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2021-01-24 14:34:12 +0000 |
|---|---|---|
| committer | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2021-01-29 20:22:40 +0100 |
| commit | 82d01f04facef1276cede067efd02d2a731ffe83 (patch) | |
| tree | 2f177252734b99f30fdbc1d04f7e02b4e6fdab86 | |
| parent | 688e88256f4137b23522b45727a8207983be90a1 (diff) | |
| download | u-boot-82d01f04facef1276cede067efd02d2a731ffe83.zip u-boot-82d01f04facef1276cede067efd02d2a731ffe83.tar.gz u-boot-82d01f04facef1276cede067efd02d2a731ffe83.tar.bz2 | |
efi_loader: switch to non-secure mode later
Some ARMv7 boards using PSCI require to be in secure-mode when booted via
'bootz' or 'bootm'. During distro-boot 'bootefi bootmgr' is called to check
if booting via UEFI is possible.
With the change we change the switch from secure mode to non-secure mode is
moved from the UEFI subsystem setup to just before calling StartImage().
Cc: Jernej Škrabec <jernej.skrabec@gmail.com>
Reported by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| -rw-r--r-- | cmd/bootefi.c | 4 | ||||
| -rw-r--r-- | lib/efi_loader/efi_setup.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index c8eb5c3..81dd8e0 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -8,6 +8,7 @@ #define LOG_CATEGORY LOGC_EFI #include <common.h> +#include <bootm.h> #include <charset.h> #include <command.h> #include <dm.h> @@ -338,6 +339,9 @@ static efi_status_t do_bootefi_exec(efi_handle_t handle, void *load_options) efi_uintn_t exit_data_size = 0; u16 *exit_data = NULL; + /* On ARM switch from EL3 or secure mode to EL2 or non-secure mode */ + switch_to_non_secure_mode(); + /* Call our payload! */ ret = EFI_CALL(efi_start_image(handle, &exit_data_size, &exit_data)); if (ret != EFI_SUCCESS) { diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index 5800cbf..b1c5125 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -6,7 +6,6 @@ */ #include <common.h> -#include <bootm.h> #include <efi_loader.h> #include <efi_variable.h> @@ -188,9 +187,6 @@ efi_status_t efi_init_obj_list(void) /* Allow unaligned memory access */ allow_unaligned(); - /* On ARM switch from EL3 or secure mode to EL2 or non-secure mode */ - switch_to_non_secure_mode(); - /* Initialize root node */ ret = efi_root_node_register(); if (ret != EFI_SUCCESS) |