[U-Boot] [PATCH v8 09/30] efi: Create a function to set up for running EFI code
Simon Glass
sjg at chromium.org
Mon Jun 18 14:08:14 UTC 2018
Add a new bootefi_run_prepare() function which holds common code used to
set up U-Boot to run EFI code. Make use of this from the existing
bootefi_test_prepare() function, as well as do_bootefi_exec().
Also shorten a few variable names.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5:
- Drop call to efi_init_obj_list() which is now done in do_bootefi()
- Introduce load_options_path to specifyc U-Boot env var for load_options_path
Changes in v4:
- Rebase to master
Changes in v3:
- Add patch to create a function to set up for running EFI code
Changes in v2: None
cmd/bootefi.c | 79 ++++++++++++++++++++++++++++-----------------------
1 file changed, 43 insertions(+), 36 deletions(-)
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
index 7faa3ea245..c174e5e8fc 100644
--- a/cmd/bootefi.c
+++ b/cmd/bootefi.c
@@ -253,6 +253,26 @@ static efi_status_t efi_install_fdt(void *fdt)
return ret;
}
+static efi_status_t bootefi_run_prepare(struct efi_loaded_image *image,
+ struct efi_object *obj,
+ const char *load_options_path,
+ struct efi_device_path *device_path,
+ struct efi_device_path *image_path)
+{
+ efi_setup_loaded_image(image, obj, device_path, image_path);
+
+ /*
+ * gd lives in a fixed register which may get clobbered while we execute
+ * the payload. So save it here and restore it on every callback entry
+ */
+ efi_save_gd();
+
+ /* Transfer environment variable as load options */
+ set_load_options(image, load_options_path);
+
+ return 0;
+}
+
/*
* Load an EFI payload into a newly allocated piece of memory, register all
* EFI objects it would want to access and jump to it.
@@ -261,8 +281,8 @@ static efi_status_t do_bootefi_exec(void *efi,
struct efi_device_path *device_path,
struct efi_device_path *image_path)
{
- struct efi_loaded_image loaded_image_info = {};
- struct efi_object loaded_image_info_obj = {};
+ struct efi_loaded_image image;
+ struct efi_object obj;
struct efi_object mem_obj = {};
struct efi_device_path *memdp = NULL;
efi_status_t ret;
@@ -290,19 +310,13 @@ static efi_status_t do_bootefi_exec(void *efi,
assert(device_path && image_path);
}
- efi_setup_loaded_image(&loaded_image_info, &loaded_image_info_obj,
- device_path, image_path);
+ ret = bootefi_run_prepare(&image, &obj, "bootargs", device_path,
+ image_path);
+ if (ret)
+ return ret;
- /*
- * gd lives in a fixed register which may get clobbered while we execute
- * the payload. So save it here and restore it on every callback entry
- */
- efi_save_gd();
-
- /* Transfer environment variable bootargs as load options */
- set_load_options(&loaded_image_info, "bootargs");
/* Load the EFI payload */
- entry = efi_load_pe(efi, &loaded_image_info);
+ entry = efi_load_pe(efi, &image);
if (!entry) {
ret = EFI_LOAD_ERROR;
goto exit;
@@ -310,10 +324,10 @@ static efi_status_t do_bootefi_exec(void *efi,
if (memdp) {
struct efi_device_path_memory *mdp = (void *)memdp;
- mdp->memory_type = loaded_image_info.image_code_type;
- mdp->start_address = (uintptr_t)loaded_image_info.image_base;
+ mdp->memory_type = image.image_code_type;
+ mdp->start_address = (uintptr_t)image.image_base;
mdp->end_address = mdp->start_address +
- loaded_image_info.image_size;
+ image.image_size;
}
/* we don't support much: */
@@ -323,8 +337,8 @@ static efi_status_t do_bootefi_exec(void *efi,
/* Call our payload! */
debug("%s:%d Jumping to 0x%lx\n", __func__, __LINE__, (long)entry);
- if (setjmp(&loaded_image_info.exit_jmp)) {
- ret = loaded_image_info.exit_status;
+ if (setjmp(&image.exit_jmp)) {
+ ret = image.exit_status;
goto exit;
}
@@ -336,7 +350,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)&obj.handle,
(ulong)&systab, 0, (ulong)efi_run_in_el2,
ES_TO_AARCH64);
@@ -345,11 +359,11 @@ static efi_status_t do_bootefi_exec(void *efi,
}
#endif
- ret = efi_do_enter(loaded_image_info_obj.handle, &systab, entry);
+ ret = efi_do_enter(obj.handle, &systab, entry);
exit:
/* image has returned, loaded-image obj goes *poof*: */
- list_del(&loaded_image_info_obj.link);
+ list_del(&obj.link);
if (mem_obj.handle)
list_del(&mem_obj.link);
@@ -367,11 +381,13 @@ exit:
* @path: File path to the test being run (often just the test name with a
* backslash before it
* @test_func: Address of the test function that is being run
+ * @load_options_path: U-Boot environment variable to use as load options
* @return 0 if OK, -ve on error
*/
static efi_status_t bootefi_test_prepare(struct efi_loaded_image *image,
struct efi_object *obj,
- const char *path, ulong test_func)
+ const char *path, ulong test_func,
+ const char *load_options_path)
{
memset(image, '\0', sizeof(*image));
memset(obj, '\0', sizeof(*obj));
@@ -380,18 +396,8 @@ static efi_status_t bootefi_test_prepare(struct efi_loaded_image *image,
(uintptr_t)test_func,
(uintptr_t)test_func);
bootefi_image_path = efi_dp_from_file(NULL, 0, path);
- efi_setup_loaded_image(image, obj, bootefi_device_path,
- bootefi_image_path);
- /*
- * gd lives in a fixed register which may get clobbered while we execute
- * the payload. So save it here and restore it on every callback entry
- */
- efi_save_gd();
-
- /* Transfer environment variable efi_selftest as load options */
- set_load_options(image, "efi_selftest");
-
- return 0;
+ return bootefi_run_prepare(image, obj, load_options_path,
+ bootefi_device_path, bootefi_image_path);
}
/**
@@ -490,7 +496,7 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
int ret;
if (bootefi_test_prepare(&image, &obj, "\\test",
- (ulong)&efi_test))
+ (ulong)&efi_test, "efi_test"))
return CMD_RET_FAILURE;
ret = efi_test(&image, &systab);
@@ -506,7 +512,8 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
#ifdef CONFIG_CMD_BOOTEFI_SELFTEST
if (!strcmp(argv[1], "selftest")) {
if (bootefi_test_prepare(&image, &obj, "\\selftest",
- (uintptr_t)&efi_selftest))
+ (uintptr_t)&efi_selftest,
+ "efi_selftest"))
return CMD_RET_FAILURE;
/* Execute the test */
--
2.18.0.rc1.244.gcf134e6275-goog
More information about the U-Boot
mailing list