diff options
| author | Alexander Graf <agraf@suse.de> | 2018-09-23 16:23:56 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2018-09-23 21:55:31 +0200 |
| commit | 24638a1f2109f61834b212b1be73dd21da411e63 (patch) | |
| tree | 919f63bdce2aab05fc69f7b6edddac44c4c07f60 /cmd/bootefi.c | |
| parent | a729eb34e3640fdcb6fc147ce0582039a3face09 (diff) | |
efi_loader: Fix loaded_image handle passing from EL3
When running in EL3 mode on AArch64, we have to first drop to EL2
to execute a UEFI payload. When dropping down, the arguments to
the entry point have to stay identical to the ones for normal entry
though.
In commit ea54ad59286 ("efi_loader: pass handle of loaded image")
we incorrectly changed that logic and had the el3 entry path diverge.
Fix it up by syncing it back to what it's supposed to be.
Fixes: ea54ad59286 ("efi_loader: pass handle of loaded image")
Signed-off-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Diffstat (limited to 'cmd/bootefi.c')
| -rw-r--r-- | cmd/bootefi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 5fc054c9da..6395d4b9b0 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -408,7 +408,7 @@ static efi_status_t do_bootefi_exec(void *efi, /* Move into EL2 and keep running there */ armv8_switch_to_el2((ulong)entry, - (ulong)&loaded_image_info_obj.handle, + (ulong)loaded_image_info_obj.handle, (ulong)&systab, 0, (ulong)efi_run_in_el2, ES_TO_AARCH64); |