diff options
| author | xypron.glpk@gmx.de <xypron.glpk@gmx.de> | 2017-07-04 23:15:21 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2017-07-19 14:14:40 +0200 |
| commit | b06d8ac39e0f36db4221367623f1908317daa60f (patch) | |
| tree | 9ff2c9d1d5323a0ce7ed24b2f0161416ea9a0cd2 /cmd | |
| parent | cc5b70812f5e3b13ea9072c2dacc939818ef8e66 (diff) | |
| download | u-boot-b06d8ac39e0f36db4221367623f1908317daa60f.tar.gz u-boot-b06d8ac39e0f36db4221367623f1908317daa60f.tar.bz2 u-boot-b06d8ac39e0f36db4221367623f1908317daa60f.zip | |
bootefi: allow return without EFI_BOOT_SERVICES.Exit
The Unified Extensible Firmware Interface Specification, version 2.7,
defines in chapter 2.1.2 - UEFI Application that an EFI application may
either directly return or call EFI_BOOT_SERVICES.Exit().
Unfortunately U-Boot makes the incorrect assumption that
EFI_BOOT_SERVICES.Exit() is always called.
So the following application leads to a memory exception on the aarch64
architecture when returning:
EFI_STATUS efi_main(
EFI_HANDLE handle,
EFI_SYSTEM_TABlE systable) {
return EFI_SUCCESS;
}
With this patch the entry point is stored in the image handle.
The new wrapper function do_enter is used to call the EFI entry point.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/bootefi.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index dcae253163..e6487dad21 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -147,15 +147,28 @@ static void *copy_fdt(void *fdt) return new_fdt; } +static ulong efi_do_enter(void *image_handle, + struct efi_system_table *st, + asmlinkage ulong (*entry)(void *image_handle, + struct efi_system_table *st)) +{ + efi_status_t ret = EFI_LOAD_ERROR; + + if (entry) + ret = entry(image_handle, st); + st->boottime->exit(image_handle, ret, 0, NULL); + return ret; +} + #ifdef CONFIG_ARM64 -static unsigned long efi_run_in_el2(ulong (*entry)(void *image_handle, - struct efi_system_table *st), void *image_handle, - struct efi_system_table *st) +static unsigned long efi_run_in_el2(asmlinkage ulong (*entry)( + void *image_handle, struct efi_system_table *st), + void *image_handle, struct efi_system_table *st) { /* Enable caches again */ dcache_enable(); - return entry(image_handle, st); + return efi_do_enter(image_handle, st, entry); } #endif @@ -260,7 +273,7 @@ static unsigned long do_bootefi_exec(void *efi, void *fdt) } #endif - return entry(&loaded_image_info, &systab); + return efi_do_enter(&loaded_image_info, &systab, entry); } |