mmc: fsl_esdhc: drop i.MX DDR support code
[oweals/u-boot.git] / cmd / bootefi.c
index 82d755ceb31d88f98d0ccdcf43c13fa22e4e05ce..f613cce7e2628053e74b6f8f190cc6990a642060 100644 (file)
  *  Copyright (c) 2016 Alexander Graf
  */
 
-#include <charset.h>
 #include <common.h>
+#include <charset.h>
 #include <command.h>
 #include <dm.h>
 #include <efi_loader.h>
 #include <efi_selftest.h>
+#include <env.h>
 #include <errno.h>
 #include <linux/libfdt.h>
 #include <linux/libfdt_env.h>
 #include <mapmem.h>
 #include <memalign.h>
-#include <asm/global_data.h>
 #include <asm-generic/sections.h>
-#include <asm-generic/unaligned.h>
 #include <linux/linkage.h>
 
-#ifdef CONFIG_ARMV7_NONSEC
-#include <asm/armv7.h>
-#include <asm/secure.h>
-#endif
-
 DECLARE_GLOBAL_DATA_PTR;
 
-#define OBJ_LIST_NOT_INITIALIZED 1
-
-static efi_status_t efi_obj_list_initialized = OBJ_LIST_NOT_INITIALIZED;
-
 static struct efi_device_path *bootefi_image_path;
 static struct efi_device_path *bootefi_device_path;
 
-/* Initialize and populate EFI object list */
-efi_status_t efi_init_obj_list(void)
-{
-       efi_status_t ret = EFI_SUCCESS;
-
-       /* Initialize once only */
-       if (efi_obj_list_initialized != OBJ_LIST_NOT_INITIALIZED)
-               return efi_obj_list_initialized;
-
-       /* Initialize system table */
-       ret = efi_initialize_system_table();
-       if (ret != EFI_SUCCESS)
-               goto out;
-
-       /* Initialize root node */
-       ret = efi_root_node_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-
-       /* Initialize EFI driver uclass */
-       ret = efi_driver_init();
-       if (ret != EFI_SUCCESS)
-               goto out;
-
-       ret = efi_console_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-#ifdef CONFIG_PARTITIONS
-       ret = efi_disk_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-#endif
-#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
-       ret = efi_gop_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-#endif
-#ifdef CONFIG_NET
-       ret = efi_net_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-#endif
-#ifdef CONFIG_GENERATE_ACPI_TABLE
-       ret = efi_acpi_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-#endif
-#ifdef CONFIG_GENERATE_SMBIOS_TABLE
-       ret = efi_smbios_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-#endif
-       ret = efi_watchdog_register();
-       if (ret != EFI_SUCCESS)
-               goto out;
-
-       /* Initialize EFI runtime services */
-       ret = efi_reset_system_init();
-       if (ret != EFI_SUCCESS)
-               goto out;
-
-out:
-       efi_obj_list_initialized = ret;
-       return ret;
-}
-
-/*
- * Allow unaligned memory access.
- *
- * This routine is overridden by architectures providing this feature.
- */
-void __weak allow_unaligned(void)
-{
-}
-
-/*
+/**
  * Set the load options of an image from an environment variable.
  *
- * @loaded_image_info: the image
- * @env_var:           name of the environment variable
+ * @handle:    the image handle
+ * @env_var:   name of the environment variable
+ * Return:     status code
  */
-static void set_load_options(struct efi_loaded_image *loaded_image_info,
-                            const char *env_var)
+static efi_status_t set_load_options(efi_handle_t handle, const char *env_var)
 {
+       struct efi_loaded_image *loaded_image_info;
        size_t size;
        const char *env = env_get(env_var);
        u16 *pos;
+       efi_status_t ret;
+
+       ret = EFI_CALL(systab.boottime->open_protocol(
+                                       handle,
+                                       &efi_guid_loaded_image,
+                                       (void **)&loaded_image_info,
+                                       efi_root, NULL,
+                                       EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL));
+       if (ret != EFI_SUCCESS)
+               return EFI_INVALID_PARAMETER;
 
        loaded_image_info->load_options = NULL;
        loaded_image_info->load_options_size = 0;
        if (!env)
-               return;
+               goto out;
+
        size = utf8_utf16_strlen(env) + 1;
        loaded_image_info->load_options = calloc(size, sizeof(u16));
        if (!loaded_image_info->load_options) {
                printf("ERROR: Out of memory\n");
-               return;
+               EFI_CALL(systab.boottime->close_protocol(handle,
+                                                        &efi_guid_loaded_image,
+                                                        efi_root, NULL));
+               return EFI_OUT_OF_RESOURCES;
        }
        pos = loaded_image_info->load_options;
        utf8_utf16_strcpy(&pos, env);
        loaded_image_info->load_options_size = size * 2;
+
+out:
+       return EFI_CALL(systab.boottime->close_protocol(handle,
+                                                       &efi_guid_loaded_image,
+                                                       efi_root, NULL));
 }
 
+#if !CONFIG_IS_ENABLED(GENERATE_ACPI_TABLE)
+
 /**
  * copy_fdt() - Copy the device tree to a new location available to EFI
  *
- * The FDT is relocated into a suitable location within the EFI memory map.
- * An additional 12KB is added to the space in case the device tree needs to be
+ * The FDT is copied to a suitable location within the EFI memory map.
+ * Additional 12 KiB are added to the space in case the device tree needs to be
  * expanded later with fdt_open_into().
  *
- * @fdt_addr: On entry, address of start of FDT. On exit, address of relocated
- *     FDT start
- * @fdt_sizep: Returns new size of FDT, including
- * @return new relocated address of FDT
+ * @fdtp:      On entry a pointer to the flattened device tree.
+ *             On exit a pointer to the copy of the flattened device tree.
+ *             FDT start
+ * Return:     status code
  */
-static efi_status_t copy_fdt(ulong *fdt_addrp, ulong *fdt_sizep)
+static efi_status_t copy_fdt(void **fdtp)
 {
        unsigned long fdt_ram_start = -1L, fdt_pages;
        efi_status_t ret = 0;
@@ -171,85 +108,43 @@ static efi_status_t copy_fdt(ulong *fdt_addrp, ulong *fdt_sizep)
        }
 
        /*
-        * Give us at least 4KB of breathing room in case the device tree needs
-        * to be expanded later. Round up to the nearest EFI page boundary.
+        * Give us at least 12 KiB of breathing room in case the device tree
+        * needs to be expanded later.
         */
-       fdt = map_sysmem(*fdt_addrp, 0);
-       fdt_size = fdt_totalsize(fdt);
-       fdt_size += 4096 * 3;
-       fdt_size = ALIGN(fdt_size + EFI_PAGE_SIZE - 1, EFI_PAGE_SIZE);
-       fdt_pages = fdt_size >> EFI_PAGE_SHIFT;
-
-       /* Safe fdt location is at 127MB */
-       new_fdt_addr = fdt_ram_start + (127 * 1024 * 1024) + fdt_size;
+       fdt = *fdtp;
+       fdt_pages = efi_size_in_pages(fdt_totalsize(fdt) + 0x3000);
+       fdt_size = fdt_pages << EFI_PAGE_SHIFT;
+
+       /*
+        * Safe fdt location is at 127 MiB.
+        * On the sandbox convert from the sandbox address space.
+        */
+       new_fdt_addr = (uintptr_t)map_sysmem(fdt_ram_start + 0x7f00000 +
+                                            fdt_size, 0);
        ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
-                                EFI_RUNTIME_SERVICES_DATA, fdt_pages,
+                                EFI_BOOT_SERVICES_DATA, fdt_pages,
                                 &new_fdt_addr);
        if (ret != EFI_SUCCESS) {
                /* If we can't put it there, put it somewhere */
                new_fdt_addr = (ulong)memalign(EFI_PAGE_SIZE, fdt_size);
                ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
-                                        EFI_RUNTIME_SERVICES_DATA, fdt_pages,
+                                        EFI_BOOT_SERVICES_DATA, fdt_pages,
                                         &new_fdt_addr);
                if (ret != EFI_SUCCESS) {
                        printf("ERROR: Failed to reserve space for FDT\n");
                        goto done;
                }
        }
-
-       new_fdt = map_sysmem(new_fdt_addr, fdt_size);
+       new_fdt = (void *)(uintptr_t)new_fdt_addr;
        memcpy(new_fdt, fdt, fdt_totalsize(fdt));
        fdt_set_totalsize(new_fdt, fdt_size);
 
-       *fdt_addrp = new_fdt_addr;
-       *fdt_sizep = fdt_size;
+       *fdtp = (void *)(uintptr_t)new_fdt_addr;
 done:
        return ret;
 }
 
-static efi_status_t efi_do_enter(
-                       efi_handle_t image_handle, struct efi_system_table *st,
-                       EFIAPI efi_status_t (*entry)(
-                               efi_handle_t 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 efi_status_t efi_run_in_el2(EFIAPI efi_status_t (*entry)(
-                       efi_handle_t image_handle, struct efi_system_table *st),
-                       efi_handle_t image_handle, struct efi_system_table *st)
-{
-       /* Enable caches again */
-       dcache_enable();
-
-       return efi_do_enter(image_handle, st, entry);
-}
-#endif
-
-#ifdef CONFIG_ARMV7_NONSEC
-static bool is_nonsec;
-
-static efi_status_t efi_run_in_hyp(EFIAPI efi_status_t (*entry)(
-                       efi_handle_t image_handle, struct efi_system_table *st),
-                       efi_handle_t image_handle, struct efi_system_table *st)
-{
-       /* Enable caches again */
-       dcache_enable();
-
-       is_nonsec = true;
-
-       return efi_do_enter(image_handle, st, entry);
-}
-#endif
-
-/*
+/**
  * efi_carve_out_dt_rsv() - Carve out DT reserved memory ranges
  *
  * The mem_rsv entries of the FDT are added to the memory map. Any failures are
@@ -270,321 +165,423 @@ static void efi_carve_out_dt_rsv(void *fdt)
                if (fdt_get_mem_rsv(fdt, i, &addr, &size) != 0)
                        continue;
 
-               pages = ALIGN(size, EFI_PAGE_SIZE) >> EFI_PAGE_SHIFT;
-               if (!efi_add_memory_map(addr, pages, EFI_RESERVED_MEMORY_TYPE,
-                                       false))
+               /* Convert from sandbox address space. */
+               addr = (uintptr_t)map_sysmem(addr, 0);
+
+               pages = efi_size_in_pages(size + (addr & EFI_PAGE_MASK));
+               addr &= ~EFI_PAGE_MASK;
+               if (efi_add_memory_map(addr, pages, EFI_RESERVED_MEMORY_TYPE,
+                                      false) != EFI_SUCCESS)
                        printf("FDT memrsv map %d: Failed to add to map\n", i);
        }
 }
 
-static efi_status_t efi_install_fdt(ulong fdt_addr)
+/**
+ * get_config_table() - get configuration table
+ *
+ * @guid:      GUID of the configuration table
+ * Return:     pointer to configuration table or NULL
+ */
+static void *get_config_table(const efi_guid_t *guid)
+{
+       size_t i;
+
+       for (i = 0; i < systab.nr_tables; i++) {
+               if (!guidcmp(guid, &systab.tables[i].guid))
+                       return systab.tables[i].table;
+       }
+       return NULL;
+}
+
+#endif /* !CONFIG_IS_ENABLED(GENERATE_ACPI_TABLE) */
+
+/**
+ * efi_install_fdt() - install fdt passed by a command argument
+ *
+ * If fdt_opt is available, the device tree located at that memory address will
+ * will be installed as configuration table, otherwise the device tree located
+ * at the address indicated by environment variable fdtcontroladdr will be used.
+ *
+ * On architectures (x86) using ACPI tables device trees shall not be installed
+ * as configuration table.
+ *
+ * @fdt_opt:   pointer to argument
+ * Return:     status code
+ */
+static efi_status_t efi_install_fdt(const char *fdt_opt)
 {
+       /*
+        * The EBBR spec requires that we have either an FDT or an ACPI table
+        * but not both.
+        */
+#if CONFIG_IS_ENABLED(GENERATE_ACPI_TABLE)
+       if (fdt_opt) {
+               printf("ERROR: can't have ACPI table and device tree.\n");
+               return EFI_LOAD_ERROR;
+       }
+#else
+       unsigned long fdt_addr;
+       void *fdt;
        bootm_headers_t img = { 0 };
-       ulong fdt_pages, fdt_size, fdt_start;
        efi_status_t ret;
-       void *fdt;
 
+       if (fdt_opt) {
+               fdt_addr = simple_strtoul(fdt_opt, NULL, 16);
+               if (!fdt_addr)
+                       return EFI_INVALID_PARAMETER;
+       } else {
+               /* Look for device tree that is already installed */
+               if (get_config_table(&efi_guid_fdt))
+                       return EFI_SUCCESS;
+               /* Use our own device tree as default */
+               fdt_opt = env_get("fdtcontroladdr");
+               if (!fdt_opt) {
+                       printf("ERROR: need device tree\n");
+                       return EFI_NOT_FOUND;
+               }
+               fdt_addr = simple_strtoul(fdt_opt, NULL, 16);
+               if (!fdt_addr) {
+                       printf("ERROR: invalid $fdtcontroladdr\n");
+                       return EFI_LOAD_ERROR;
+               }
+       }
+
+       /* Install device tree */
        fdt = map_sysmem(fdt_addr, 0);
        if (fdt_check_header(fdt)) {
                printf("ERROR: invalid device tree\n");
-               return EFI_INVALID_PARAMETER;
+               return EFI_LOAD_ERROR;
        }
 
-       /* Prepare fdt for payload */
-       ret = copy_fdt(&fdt_addr, &fdt_size);
-       if (ret)
-               return ret;
+       /* Create memory reservations as indicated by the device tree */
+       efi_carve_out_dt_rsv(fdt);
+
+       /* Prepare device tree for payload */
+       ret = copy_fdt(&fdt);
+       if (ret) {
+               printf("ERROR: out of memory\n");
+               return EFI_OUT_OF_RESOURCES;
+       }
 
-       unmap_sysmem(fdt);
-       fdt = map_sysmem(fdt_addr, 0);
-       fdt_size = fdt_totalsize(fdt);
        if (image_setup_libfdt(&img, fdt, 0, NULL)) {
                printf("ERROR: failed to process device tree\n");
                return EFI_LOAD_ERROR;
        }
 
-       efi_carve_out_dt_rsv(fdt);
-
-       /* Link to it in the efi tables */
+       /* Install device tree as UEFI table */
        ret = efi_install_configuration_table(&efi_guid_fdt, fdt);
-       if (ret != EFI_SUCCESS)
-               return EFI_OUT_OF_RESOURCES;
-
-       /* And reserve the space in the memory map */
-       fdt_start = fdt_addr;
-       fdt_pages = fdt_size >> EFI_PAGE_SHIFT;
-
-       ret = efi_add_memory_map(fdt_start, fdt_pages,
-                                EFI_BOOT_SERVICES_DATA, true);
+       if (ret != EFI_SUCCESS) {
+               printf("ERROR: failed to install device tree\n");
+               return ret;
+       }
+#endif /* GENERATE_ACPI_TABLE */
 
-       return ret;
+       return EFI_SUCCESS;
 }
 
 /**
  * do_bootefi_exec() - execute EFI binary
  *
- * @efi:               address of the binary
- * @device_path:       path of the device from which the binary was loaded
- * @image_path:                device path of the binary
+ * @handle:            handle of loaded image
  * Return:             status code
  *
  * Load the EFI binary into a newly assigned memory unwinding the relocation
  * information, install the loaded image protocol, and call the binary.
  */
-static efi_status_t do_bootefi_exec(void *efi,
-                                   struct efi_device_path *device_path,
-                                   struct efi_device_path *image_path)
+static efi_status_t do_bootefi_exec(efi_handle_t handle)
 {
-       efi_handle_t mem_handle = NULL;
-       struct efi_device_path *memdp = NULL;
        efi_status_t ret;
-       struct efi_loaded_image_obj *image_handle = NULL;
-       struct efi_loaded_image *loaded_image_info = NULL;
+       efi_uintn_t exit_data_size = 0;
+       u16 *exit_data = NULL;
+
+       /* Transfer environment variable as load options */
+       ret = set_load_options(handle, "bootargs");
+       if (ret != EFI_SUCCESS)
+               return ret;
+
+       /* Call our payload! */
+       ret = EFI_CALL(efi_start_image(handle, &exit_data_size, &exit_data));
+       printf("## Application terminated, r = %lu\n", ret & ~EFI_ERROR_MASK);
+       if (ret && exit_data) {
+               printf("## %ls\n", exit_data);
+               efi_free_pool(exit_data);
+       }
 
-       EFIAPI efi_status_t (*entry)(efi_handle_t image_handle,
-                                    struct efi_system_table *st);
+       efi_restore_gd();
 
        /*
-        * Special case for efi payload not loaded from disk, such as
-        * 'bootefi hello' or for example payload loaded directly into
-        * memory via jtag, etc:
+        * FIXME: Who is responsible for
+        *      free(loaded_image_info->load_options);
+        * Once efi_exit() is implemented correctly,
+        * handle itself doesn't exist here.
         */
+
+       return ret;
+}
+
+/**
+ * do_efibootmgr() - execute EFI boot manager
+ *
+ * Return:     status code
+ */
+static int do_efibootmgr(void)
+{
+       efi_handle_t handle;
+       efi_status_t ret;
+
+       ret = efi_bootmgr_load(&handle);
+       if (ret != EFI_SUCCESS) {
+               printf("EFI boot manager: Cannot load any image\n");
+               return CMD_RET_FAILURE;
+       }
+
+       ret = do_bootefi_exec(handle);
+
+       if (ret != EFI_SUCCESS)
+               return CMD_RET_FAILURE;
+
+       return CMD_RET_SUCCESS;
+}
+
+/**
+ * do_bootefi_image() - execute EFI binary
+ *
+ * Set up memory image for the binary to be loaded, prepare device path, and
+ * then call do_bootefi_exec() to execute it.
+ *
+ * @image_opt: string of image start address
+ * Return:     status code
+ */
+static int do_bootefi_image(const char *image_opt)
+{
+       void *image_buf;
+       struct efi_device_path *device_path, *image_path;
+       struct efi_device_path *file_path = NULL;
+       unsigned long addr, size;
+       const char *size_str;
+       efi_handle_t mem_handle = NULL, handle;
+       efi_status_t ret;
+
+#ifdef CONFIG_CMD_BOOTEFI_HELLO
+       if (!strcmp(image_opt, "hello")) {
+               char *saddr;
+
+               saddr = env_get("loadaddr");
+               size = __efi_helloworld_end - __efi_helloworld_begin;
+
+               if (saddr)
+                       addr = simple_strtoul(saddr, NULL, 16);
+               else
+                       addr = CONFIG_SYS_LOAD_ADDR;
+
+               image_buf = map_sysmem(addr, size);
+               memcpy(image_buf, __efi_helloworld_begin, size);
+
+               device_path = NULL;
+               image_path = NULL;
+       } else
+#endif
+       {
+               size_str = env_get("filesize");
+               if (size_str)
+                       size = simple_strtoul(size_str, NULL, 16);
+               else
+                       size = 0;
+
+               addr = simple_strtoul(image_opt, NULL, 16);
+               /* Check that a numeric value was passed */
+               if (!addr && *image_opt != '0')
+                       return CMD_RET_USAGE;
+
+               image_buf = map_sysmem(addr, size);
+
+               device_path = bootefi_device_path;
+               image_path = bootefi_image_path;
+       }
+
        if (!device_path && !image_path) {
-               printf("WARNING: using memory device/image path, this may confuse some payloads!\n");
-               /* actual addresses filled in after efi_load_pe() */
-               memdp = efi_dp_from_mem(0, 0, 0);
-               device_path = image_path = memdp;
                /*
-                * Grub expects that the device path of the loaded image is
-                * installed on a handle.
+                * Special case for efi payload not loaded from disk,
+                * such as 'bootefi hello' or for example payload
+                * loaded directly into memory via JTAG, etc:
+                */
+               file_path = efi_dp_from_mem(EFI_RESERVED_MEMORY_TYPE,
+                                           (uintptr_t)image_buf, size);
+               /*
+                * Make sure that device for device_path exist
+                * in load_image(). Otherwise, shell and grub will fail.
                 */
                ret = efi_create_handle(&mem_handle);
                if (ret != EFI_SUCCESS)
-                       goto exit;
+                       goto out;
+
                ret = efi_add_protocol(mem_handle, &efi_guid_device_path,
-                                      device_path);
+                                      file_path);
                if (ret != EFI_SUCCESS)
-                       goto exit;
+                       goto out;
        } else {
                assert(device_path && image_path);
+               file_path = efi_dp_append(device_path, image_path);
        }
 
-       ret = efi_setup_loaded_image(device_path, image_path, &image_handle,
-                                    &loaded_image_info);
+       ret = EFI_CALL(efi_load_image(false, efi_root,
+                                     file_path, image_buf, size, &handle));
        if (ret != EFI_SUCCESS)
-               goto exit;
-
-       /*
-        * 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(image_handle, efi, loaded_image_info);
-       if (!entry) {
-               ret = EFI_LOAD_ERROR;
-               goto exit;
-       }
+               goto out;
 
-       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->end_address = mdp->start_address +
-                               loaded_image_info->image_size;
-       }
+       ret = do_bootefi_exec(handle);
 
-       /* we don't support much: */
-       env_set("efi_8be4df61-93ca-11d2-aa0d-00e098032b8c_OsIndicationsSupported",
-               "{ro,boot}(blob)0000000000000000");
+out:
+       if (mem_handle)
+               efi_delete_handle(mem_handle);
+       if (file_path)
+               efi_free_pool(file_path);
 
-       /* Call our payload! */
-       debug("%s:%d Jumping to 0x%lx\n", __func__, __LINE__, (long)entry);
+       if (ret != EFI_SUCCESS)
+               return CMD_RET_FAILURE;
 
-       if (setjmp(&image_handle->exit_jmp)) {
-               ret = image_handle->exit_status;
-               goto exit;
-       }
+       return CMD_RET_SUCCESS;
+}
 
-#ifdef CONFIG_ARM64
-       /* On AArch64 we need to make sure we call our payload in < EL3 */
-       if (current_el() == 3) {
-               smp_kick_all_cpus();
-               dcache_disable();       /* flush cache before switch to EL2 */
+#ifdef CONFIG_CMD_BOOTEFI_SELFTEST
+static efi_status_t bootefi_run_prepare(const char *load_options_path,
+               struct efi_device_path *device_path,
+               struct efi_device_path *image_path,
+               struct efi_loaded_image_obj **image_objp,
+               struct efi_loaded_image **loaded_image_infop)
+{
+       efi_status_t ret;
 
-               /* Move into EL2 and keep running there */
-               armv8_switch_to_el2((ulong)entry,
-                                   (ulong)image_handle,
-                                   (ulong)&systab, 0, (ulong)efi_run_in_el2,
-                                   ES_TO_AARCH64);
+       ret = efi_setup_loaded_image(device_path, image_path, image_objp,
+                                    loaded_image_infop);
+       if (ret != EFI_SUCCESS)
+               return ret;
 
-               /* Should never reach here, efi exits with longjmp */
-               while (1) { }
-       }
-#endif
+       /* Transfer environment variable as load options */
+       return set_load_options((efi_handle_t)*image_objp, load_options_path);
+}
 
-#ifdef CONFIG_ARMV7_NONSEC
-       if (armv7_boot_nonsec() && !is_nonsec) {
-               dcache_disable();       /* flush cache before switch to HYP */
+/**
+ * bootefi_test_prepare() - prepare to run an EFI test
+ *
+ * Prepare to run a test as if it were provided by a loaded image.
+ *
+ * @image_objp:                pointer to be set to the loaded image handle
+ * @loaded_image_infop:        pointer to be set to the loaded image protocol
+ * @path:              dummy file path used to construct the device path
+ *                     set in the loaded image protocol
+ * @load_options_path: name of a U-Boot environment variable. Its value is
+ *                     set as load options in the loaded image protocol.
+ * Return:             status code
+ */
+static efi_status_t bootefi_test_prepare
+               (struct efi_loaded_image_obj **image_objp,
+                struct efi_loaded_image **loaded_image_infop, const char *path,
+                const char *load_options_path)
+{
+       efi_status_t ret;
 
-               armv7_init_nonsec();
-               secure_ram_addr(_do_nonsec_entry)(
-                                       efi_run_in_hyp,
-                                       (uintptr_t)entry,
-                                       (uintptr_t)image_handle,
-                                       (uintptr_t)&systab);
+       /* Construct a dummy device path */
+       bootefi_device_path = efi_dp_from_mem(EFI_RESERVED_MEMORY_TYPE, 0, 0);
+       if (!bootefi_device_path)
+               return EFI_OUT_OF_RESOURCES;
 
-               /* Should never reach here, efi exits with longjmp */
-               while (1) { }
+       bootefi_image_path = efi_dp_from_file(NULL, 0, path);
+       if (!bootefi_image_path) {
+               ret = EFI_OUT_OF_RESOURCES;
+               goto failure;
        }
-#endif
-
-       ret = efi_do_enter(image_handle, &systab, entry);
 
-exit:
-       /* image has returned, loaded-image obj goes *poof*: */
-       if (image_handle)
-               efi_delete_handle(&image_handle->parent);
-       if (mem_handle)
-               efi_delete_handle(mem_handle);
+       ret = bootefi_run_prepare(load_options_path, bootefi_device_path,
+                                 bootefi_image_path, image_objp,
+                                 loaded_image_infop);
+       if (ret == EFI_SUCCESS)
+               return ret;
 
+       efi_free_pool(bootefi_image_path);
+       bootefi_image_path = NULL;
+failure:
+       efi_free_pool(bootefi_device_path);
+       bootefi_device_path = NULL;
        return ret;
 }
 
-static int do_bootefi_bootmgr_exec(void)
+/**
+ * bootefi_run_finish() - finish up after running an EFI test
+ *
+ * @loaded_image_info: Pointer to a struct which holds the loaded image info
+ * @image_obj: Pointer to a struct which holds the loaded image object
+ */
+static void bootefi_run_finish(struct efi_loaded_image_obj *image_obj,
+                              struct efi_loaded_image *loaded_image_info)
 {
-       struct efi_device_path *device_path, *file_path;
-       void *addr;
-       efi_status_t r;
-
-       /*
-        * 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();
+       efi_restore_gd();
+       free(loaded_image_info->load_options);
+       efi_delete_handle(&image_obj->header);
+}
 
-       addr = efi_bootmgr_load(&device_path, &file_path);
-       if (!addr)
-               return 1;
+/**
+ * do_efi_selftest() - execute EFI selftest
+ *
+ * Return:     status code
+ */
+static int do_efi_selftest(void)
+{
+       struct efi_loaded_image_obj *image_obj;
+       struct efi_loaded_image *loaded_image_info;
+       efi_status_t ret;
 
-       printf("## Starting EFI application at %p ...\n", addr);
-       r = do_bootefi_exec(addr, device_path, file_path);
-       printf("## Application terminated, r = %lu\n",
-              r & ~EFI_ERROR_MASK);
+       ret = bootefi_test_prepare(&image_obj, &loaded_image_info,
+                                  "\\selftest", "efi_selftest");
+       if (ret != EFI_SUCCESS)
+               return CMD_RET_FAILURE;
 
-       if (r != EFI_SUCCESS)
-               return 1;
+       /* Execute the test */
+       ret = EFI_CALL(efi_selftest(&image_obj->header, &systab));
+       bootefi_run_finish(image_obj, loaded_image_info);
 
-       return 0;
+       return ret != EFI_SUCCESS;
 }
+#endif /* CONFIG_CMD_BOOTEFI_SELFTEST */
 
-/* Interpreter command to boot an arbitrary EFI image from memory */
+/**
+ * do_bootefi() - execute `bootefi` command
+ *
+ * @cmdtp:     table entry describing command
+ * @flag:      bitmap indicating how the command was invoked
+ * @argc:      number of arguments
+ * @argv:      command line arguments
+ * Return:     status code
+ */
 static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       unsigned long addr;
-       char *saddr;
-       efi_status_t r;
-       unsigned long fdt_addr;
+       efi_status_t ret;
 
-       /* Allow unaligned memory access */
-       allow_unaligned();
+       if (argc < 2)
+               return CMD_RET_USAGE;
 
        /* Initialize EFI drivers */
-       r = efi_init_obj_list();
-       if (r != EFI_SUCCESS) {
-               printf("Error: Cannot set up EFI drivers, r = %lu\n",
-                      r & ~EFI_ERROR_MASK);
+       ret = efi_init_obj_list();
+       if (ret != EFI_SUCCESS) {
+               printf("Error: Cannot initialize UEFI sub-system, r = %lu\n",
+                      ret & ~EFI_ERROR_MASK);
                return CMD_RET_FAILURE;
        }
 
-       if (argc < 2)
+       ret = efi_install_fdt(argc > 2 ? argv[2] : NULL);
+       if (ret == EFI_INVALID_PARAMETER)
                return CMD_RET_USAGE;
+       else if (ret != EFI_SUCCESS)
+               return CMD_RET_FAILURE;
 
-       if (argc > 2) {
-               fdt_addr = simple_strtoul(argv[2], NULL, 16);
-               if (!fdt_addr && *argv[2] != '0')
-                       return CMD_RET_USAGE;
-               /* Install device tree */
-               r = efi_install_fdt(fdt_addr);
-               if (r != EFI_SUCCESS) {
-                       printf("ERROR: failed to install device tree\n");
-                       return CMD_RET_FAILURE;
-               }
-       } else {
-               /* Remove device tree. EFI_NOT_FOUND can be ignored here */
-               efi_install_configuration_table(&efi_guid_fdt, NULL);
-               printf("WARNING: booting without device tree\n");
-       }
-#ifdef CONFIG_CMD_BOOTEFI_HELLO
-       if (!strcmp(argv[1], "hello")) {
-               ulong size = __efi_helloworld_end - __efi_helloworld_begin;
-
-               saddr = env_get("loadaddr");
-               if (saddr)
-                       addr = simple_strtoul(saddr, NULL, 16);
-               else
-                       addr = CONFIG_SYS_LOAD_ADDR;
-               memcpy(map_sysmem(addr, size), __efi_helloworld_begin, size);
-       } else
-#endif
+       if (!strcmp(argv[1], "bootmgr"))
+               return do_efibootmgr();
 #ifdef CONFIG_CMD_BOOTEFI_SELFTEST
-       if (!strcmp(argv[1], "selftest")) {
-               struct efi_loaded_image_obj *image_handle;
-               struct efi_loaded_image *loaded_image_info;
-
-               /* Construct a dummy device path. */
-               bootefi_device_path = efi_dp_from_mem(EFI_RESERVED_MEMORY_TYPE,
-                                                     (uintptr_t)&efi_selftest,
-                                                     (uintptr_t)&efi_selftest);
-               bootefi_image_path = efi_dp_from_file(NULL, 0, "\\selftest");
-
-               r = efi_setup_loaded_image(bootefi_device_path,
-                                          bootefi_image_path, &image_handle,
-                                          &loaded_image_info);
-               if (r != EFI_SUCCESS)
-                       return CMD_RET_FAILURE;
-
-               /*
-                * 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(loaded_image_info, "efi_selftest");
-               /* Execute the test */
-               r = efi_selftest(image_handle, &systab);
-               efi_restore_gd();
-               free(loaded_image_info->load_options);
-               efi_delete_handle(&image_handle->parent);
-               return r != EFI_SUCCESS;
-       } else
+       else if (!strcmp(argv[1], "selftest"))
+               return do_efi_selftest();
 #endif
-       if (!strcmp(argv[1], "bootmgr")) {
-               return do_bootefi_bootmgr_exec();
-       } else {
-               saddr = argv[1];
-
-               addr = simple_strtoul(saddr, NULL, 16);
-               /* Check that a numeric value was passed */
-               if (!addr && *saddr != '0')
-                       return CMD_RET_USAGE;
-
-       }
 
-       printf("## Starting EFI application at %08lx ...\n", addr);
-       r = do_bootefi_exec(map_sysmem(addr, 0), bootefi_device_path,
-                           bootefi_image_path);
-       printf("## Application terminated, r = %lu\n",
-              r & ~EFI_ERROR_MASK);
-
-       if (r != EFI_SUCCESS)
-               return 1;
-       else
-               return 0;
+       return do_bootefi_image(argv[1]);
 }
 
 #ifdef CONFIG_SYS_LONGHELP
@@ -603,7 +600,7 @@ static char bootefi_help_text[] =
        "    Use environment variable efi_selftest to select a single test.\n"
        "    Use 'setenv efi_selftest list' to enumerate all tests.\n"
 #endif
-       "bootefi bootmgr [fdt addr]\n"
+       "bootefi bootmgr [fdt address]\n"
        "  - load and boot EFI payload based on BootOrder/BootXXXX variables.\n"
        "\n"
        "    If specified, the device tree located at <fdt address> gets\n"
@@ -616,47 +613,38 @@ U_BOOT_CMD(
        bootefi_help_text
 );
 
+/**
+ * efi_set_bootdev() - set boot device
+ *
+ * This function is called when a file is loaded, e.g. via the 'load' command.
+ * We use the path to this file to inform the UEFI binary about the boot device.
+ *
+ * @dev:       device, e.g. "MMC"
+ * @devnr:     number of the device, e.g. "1:2"
+ * @path:      path to file loaded
+ */
 void efi_set_bootdev(const char *dev, const char *devnr, const char *path)
 {
-       char filename[32] = { 0 }; /* dp->str is u16[32] long */
-       char *s;
+       struct efi_device_path *device, *image;
+       efi_status_t ret;
 
        /* efi_set_bootdev is typically called repeatedly, recover memory */
        efi_free_pool(bootefi_device_path);
        efi_free_pool(bootefi_image_path);
-       /* If blk_get_device_part_str fails, avoid duplicate free. */
-       bootefi_device_path = NULL;
-       bootefi_image_path = NULL;
-
-       if (strcmp(dev, "Net")) {
-               struct blk_desc *desc;
-               disk_partition_t fs_partition;
-               int part;
 
-               part = blk_get_device_part_str(dev, devnr, &desc, &fs_partition,
-                                              1);
-               if (part < 0)
-                       return;
+       ret = efi_dp_from_name(dev, devnr, path, &device, &image);
+       if (ret == EFI_SUCCESS) {
+               bootefi_device_path = device;
+               if (image) {
+                       /* FIXME: image should not contain device */
+                       struct efi_device_path *image_tmp = image;
 
-               bootefi_device_path = efi_dp_from_part(desc, part);
-       } else {
-#ifdef CONFIG_NET
-               bootefi_device_path = efi_dp_from_eth();
-#endif
-       }
-
-       if (!path)
-               return;
-
-       if (strcmp(dev, "Net")) {
-               /* Add leading / to fs paths, because they're absolute */
-               snprintf(filename, sizeof(filename), "/%s", path);
+                       efi_dp_split_file_path(image, &device, &image);
+                       efi_free_pool(image_tmp);
+               }
+               bootefi_image_path = image;
        } else {
-               snprintf(filename, sizeof(filename), "%s", path);
+               bootefi_device_path = NULL;
+               bootefi_image_path = NULL;
        }
-       /* DOS style file path: */
-       s = filename;
-       while ((s = strchr(s, '/')))
-               *s++ = '\\';
-       bootefi_image_path = efi_dp_from_file(NULL, 0, filename);
 }