mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
Pull request for UEFI sub-system for v2019.07-rc1 (3)
This patch series reworks the implementation of the `bootefi` command to remove code duplication by using the LoadImage() boot service to load binaries. Missing short texts for UEFI protocols are added for display by the `efidebug dh` command. Missing parameter checks for AllocatePages() and CreateDeviceNode() are implemented. The constants for protocol GUIDs are changed to match the names in the UEFI specification. -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEbcT5xx8ppvoGt20zxIHbvCwFGsQFAly/PhwACgkQxIHbvCwF GsRlbA/+JeegsUbV0fYFvdTi4JNPRlKqkzwyo2DoWN76M2MPb+l6d4quxhOdAOaf 3MpnCHb2z0567b7Ma5+KmAFYEBNJZrxAHthmtRnYhAbJMpE1ei6HzwJ29p+IYQKB usc6eOH7ybb99v0KtxLRr1CMpvxK6zud5Zxcyym5nzoAaNP4AplaQDUM1mfYOHox sRbEuoNpPkn50ejUtldb0Oh63vJ/bBBLojwQyGnGtBcRDf5bFehHzw5spD0oHPJv 7E1kze2679kOEsjPa39rFhh/8YaUd+giJW137V2cyFeEyw6ydNKXuWo9Zg0ahLOy e+ddRjDCbi0edHbOjL6hdNTgGzdcKwy9bHqYJEacP+OLczmzimNQaALCDUzXcH1C lGLHrhbMpV+Do4mFIFdIqPyW+rfRDsz9Sp84Y02M6TBzCK3XPmPXDRVpiTcWmfbb ixD4HSQjvPDcmm98iJQIZrfcasnWbBInITqcGDDTIRg0snrYUsIoUNmQPpBDsuwD O1hPV8iOpFA/a/8GLJpIgta34YIPZzjlaU38c5+qV7Tsx0ODsdpTVx8JCWeJPeK+ uhOXTWMlokgH//2ypHzIS9cUEBkoA6I9r4/fWpIjZe3iuxtV8ct2P5dHYcmrRFjY lF1WpX3gNeWCgPbGa3Yg/crtpVW+M6hDEgknOPqTAOTjx/g7jpg= =caQ+ -----END PGP SIGNATURE----- Merge tag 'efi-2019-07-rc1-3' of git://git.denx.de/u-boot-efi Pull request for UEFI sub-system for v2019.07-rc1 (3) This patch series reworks the implementation of the `bootefi` command to remove code duplication by using the LoadImage() boot service to load binaries. Missing short texts for UEFI protocols are added for display by the `efidebug dh` command. Missing parameter checks for AllocatePages() and CreateDeviceNode() are implemented. The constants for protocol GUIDs are changed to match the names in the UEFI specification.
This commit is contained in:
Tom Rini
commit
180e38ad2d
580
cmd/bootefi.c
580
cmd/bootefi.c
|
|
@ -39,31 +39,53 @@ 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
|
||||
*
|
||||
|
|
@ -165,39 +187,310 @@ static void efi_carve_out_dt_rsv(void *fdt)
|
|||
}
|
||||
}
|
||||
|
||||
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
|
||||
* @fdt_opt: pointer to argument
|
||||
* Return: status code
|
||||
*
|
||||
* If specified, fdt will be installed as configuration table,
|
||||
* otherwise no fdt will be passed.
|
||||
*/
|
||||
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 };
|
||||
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;
|
||||
}
|
||||
|
||||
/* Create memory reservation as indicated by the device tree */
|
||||
/* Create memory reservations as indicated by the device tree */
|
||||
efi_carve_out_dt_rsv(fdt);
|
||||
|
||||
/* Prepare fdt for payload */
|
||||
/* Prepare device tree for payload */
|
||||
ret = copy_fdt(&fdt);
|
||||
if (ret)
|
||||
return ret;
|
||||
if (ret) {
|
||||
printf("ERROR: out of memory\n");
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
}
|
||||
|
||||
if (image_setup_libfdt(&img, fdt, 0, NULL)) {
|
||||
printf("ERROR: failed to process device tree\n");
|
||||
return EFI_LOAD_ERROR;
|
||||
}
|
||||
|
||||
/* 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) {
|
||||
printf("ERROR: failed to install device tree\n");
|
||||
return ret;
|
||||
}
|
||||
#endif /* GENERATE_ACPI_TABLE */
|
||||
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* do_bootefi_exec() - execute EFI 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(efi_handle_t handle)
|
||||
{
|
||||
efi_status_t ret;
|
||||
|
||||
/* Transfer environment variable as load options */
|
||||
ret = set_load_options(handle, "bootargs");
|
||||
if (ret != EFI_SUCCESS)
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
return ret;
|
||||
|
||||
/* we don't support much: */
|
||||
env_set("efi_8be4df61-93ca-11d2-aa0d-00e098032b8c_OsIndicationsSupported",
|
||||
"{ro,boot}(blob)0000000000000000");
|
||||
|
||||
/* Call our payload! */
|
||||
ret = EFI_CALL(efi_start_image(handle, NULL, NULL));
|
||||
|
||||
efi_restore_gd();
|
||||
|
||||
/*
|
||||
* 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
|
||||
*
|
||||
* @fdt_opt: string of fdt start address
|
||||
* Return: status code
|
||||
*
|
||||
* Execute EFI Boot Manager
|
||||
*/
|
||||
static int do_efibootmgr(const char *fdt_opt)
|
||||
{
|
||||
efi_handle_t handle;
|
||||
efi_status_t ret;
|
||||
|
||||
/* Allow unaligned memory access */
|
||||
allow_unaligned();
|
||||
|
||||
switch_to_non_secure_mode();
|
||||
|
||||
/* Initialize EFI drivers */
|
||||
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;
|
||||
}
|
||||
|
||||
ret = efi_install_fdt(fdt_opt);
|
||||
if (ret == EFI_INVALID_PARAMETER)
|
||||
return CMD_RET_USAGE;
|
||||
else if (ret != EFI_SUCCESS)
|
||||
return CMD_RET_FAILURE;
|
||||
|
||||
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);
|
||||
printf("## Application terminated, r = %lu\n", ret & ~EFI_ERROR_MASK);
|
||||
|
||||
if (ret != EFI_SUCCESS)
|
||||
return CMD_RET_FAILURE;
|
||||
|
||||
return CMD_RET_SUCCESS;
|
||||
}
|
||||
|
||||
/*
|
||||
* do_bootefi_image() - execute EFI binary from command line
|
||||
*
|
||||
* @image_opt: string of image start address
|
||||
* @fdt_opt: string of fdt start address
|
||||
* Return: status code
|
||||
*
|
||||
* Set up memory image for the binary to be loaded, prepare
|
||||
* device path and then call do_bootefi_exec() to execute it.
|
||||
*/
|
||||
static int do_bootefi_image(const char *image_opt, const char *fdt_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;
|
||||
|
||||
/* Allow unaligned memory access */
|
||||
allow_unaligned();
|
||||
|
||||
switch_to_non_secure_mode();
|
||||
|
||||
/* Initialize EFI drivers */
|
||||
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;
|
||||
}
|
||||
|
||||
ret = efi_install_fdt(fdt_opt);
|
||||
if (ret == EFI_INVALID_PARAMETER)
|
||||
return CMD_RET_USAGE;
|
||||
else if (ret != EFI_SUCCESS)
|
||||
return CMD_RET_FAILURE;
|
||||
|
||||
#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) {
|
||||
/*
|
||||
* 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 out;
|
||||
|
||||
ret = efi_add_protocol(mem_handle, &efi_guid_device_path,
|
||||
file_path);
|
||||
if (ret != EFI_SUCCESS)
|
||||
goto out;
|
||||
} else {
|
||||
assert(device_path && image_path);
|
||||
file_path = efi_dp_append(device_path, image_path);
|
||||
}
|
||||
|
||||
ret = EFI_CALL(efi_load_image(false, efi_root,
|
||||
file_path, image_buf, size, &handle));
|
||||
if (ret != EFI_SUCCESS)
|
||||
goto out;
|
||||
|
||||
ret = do_bootefi_exec(handle);
|
||||
printf("## Application terminated, r = %lu\n", ret & ~EFI_ERROR_MASK);
|
||||
|
||||
out:
|
||||
if (mem_handle)
|
||||
efi_delete_handle(mem_handle);
|
||||
if (file_path)
|
||||
efi_free_pool(file_path);
|
||||
|
||||
if (ret != EFI_SUCCESS)
|
||||
return CMD_RET_FAILURE;
|
||||
|
||||
return CMD_RET_SUCCESS;
|
||||
}
|
||||
|
||||
#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,
|
||||
|
|
@ -212,109 +505,9 @@ static efi_status_t bootefi_run_prepare(const char *load_options_path,
|
|||
return ret;
|
||||
|
||||
/* Transfer environment variable as load options */
|
||||
set_load_options(*loaded_image_infop, load_options_path);
|
||||
|
||||
return 0;
|
||||
return set_load_options((efi_handle_t)*image_objp, load_options_path);
|
||||
}
|
||||
|
||||
/**
|
||||
* bootefi_run_finish() - finish up after running an EFI test
|
||||
*
|
||||
* @loaded_image_info: Pointer to a struct which holds the loaded image info
|
||||
* @image_objj: 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)
|
||||
{
|
||||
efi_restore_gd();
|
||||
free(loaded_image_info->load_options);
|
||||
efi_delete_handle(&image_obj->header);
|
||||
}
|
||||
|
||||
/**
|
||||
* 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
|
||||
* 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)
|
||||
{
|
||||
efi_handle_t mem_handle = NULL;
|
||||
struct efi_device_path *memdp = NULL;
|
||||
efi_status_t ret;
|
||||
struct efi_loaded_image_obj *image_obj = NULL;
|
||||
struct efi_loaded_image *loaded_image_info = NULL;
|
||||
|
||||
/*
|
||||
* Special case for efi payload not loaded from disk, such as
|
||||
* 'bootefi hello' or for example payload loaded directly into
|
||||
* memory via JTAG, etc:
|
||||
*/
|
||||
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(EFI_RESERVED_MEMORY_TYPE, 0, 0);
|
||||
device_path = image_path = memdp;
|
||||
/*
|
||||
* Grub expects that the device path of the loaded image is
|
||||
* installed on a handle.
|
||||
*/
|
||||
ret = efi_create_handle(&mem_handle);
|
||||
if (ret != EFI_SUCCESS)
|
||||
return ret; /* TODO: leaks device_path */
|
||||
ret = efi_add_protocol(mem_handle, &efi_guid_device_path,
|
||||
device_path);
|
||||
if (ret != EFI_SUCCESS)
|
||||
goto err_add_protocol;
|
||||
} else {
|
||||
assert(device_path && image_path);
|
||||
}
|
||||
|
||||
ret = bootefi_run_prepare("bootargs", device_path, image_path,
|
||||
&image_obj, &loaded_image_info);
|
||||
if (ret)
|
||||
goto err_prepare;
|
||||
|
||||
/* Load the EFI payload */
|
||||
ret = efi_load_pe(image_obj, efi, loaded_image_info);
|
||||
if (ret != EFI_SUCCESS)
|
||||
goto err_prepare;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
/* we don't support much: */
|
||||
env_set("efi_8be4df61-93ca-11d2-aa0d-00e098032b8c_OsIndicationsSupported",
|
||||
"{ro,boot}(blob)0000000000000000");
|
||||
|
||||
/* Call our payload! */
|
||||
debug("%s: Jumping to 0x%p\n", __func__, image_obj->entry);
|
||||
ret = EFI_CALL(efi_start_image(&image_obj->header, NULL, NULL));
|
||||
|
||||
err_prepare:
|
||||
/* image has returned, loaded-image obj goes *poof*: */
|
||||
bootefi_run_finish(image_obj, loaded_image_info);
|
||||
|
||||
err_add_protocol:
|
||||
if (mem_handle)
|
||||
efi_delete_handle(mem_handle);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CMD_BOOTEFI_SELFTEST
|
||||
/**
|
||||
* bootefi_test_prepare() - prepare to run an EFI test
|
||||
*
|
||||
|
|
@ -360,36 +553,33 @@ failure:
|
|||
return ret;
|
||||
}
|
||||
|
||||
#endif /* CONFIG_CMD_BOOTEFI_SELFTEST */
|
||||
|
||||
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;
|
||||
|
||||
addr = efi_bootmgr_load(&device_path, &file_path);
|
||||
if (!addr)
|
||||
return 1;
|
||||
|
||||
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);
|
||||
|
||||
if (r != EFI_SUCCESS)
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
efi_restore_gd();
|
||||
free(loaded_image_info->load_options);
|
||||
efi_delete_handle(&image_obj->header);
|
||||
}
|
||||
|
||||
/* Interpreter command to boot an arbitrary EFI image from memory */
|
||||
static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||
/**
|
||||
* do_efi_selftest() - execute EFI Selftest
|
||||
*
|
||||
* @fdt_opt: string of fdt start address
|
||||
* Return: status code
|
||||
*
|
||||
* Execute EFI Selftest
|
||||
*/
|
||||
static int do_efi_selftest(const char *fdt_opt)
|
||||
{
|
||||
unsigned long addr;
|
||||
char *saddr;
|
||||
efi_status_t r;
|
||||
unsigned long fdt_addr;
|
||||
struct efi_loaded_image_obj *image_obj;
|
||||
struct efi_loaded_image *loaded_image_info;
|
||||
efi_status_t ret;
|
||||
|
||||
/* Allow unaligned memory access */
|
||||
allow_unaligned();
|
||||
|
|
@ -397,81 +587,46 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|||
switch_to_non_secure_mode();
|
||||
|
||||
/* 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;
|
||||
}
|
||||
|
||||
ret = efi_install_fdt(fdt_opt);
|
||||
if (ret == EFI_INVALID_PARAMETER)
|
||||
return CMD_RET_USAGE;
|
||||
else if (ret != EFI_SUCCESS)
|
||||
return CMD_RET_FAILURE;
|
||||
|
||||
ret = bootefi_test_prepare(&image_obj, &loaded_image_info,
|
||||
"\\selftest", "efi_selftest");
|
||||
if (ret != EFI_SUCCESS)
|
||||
return CMD_RET_FAILURE;
|
||||
|
||||
/* Execute the test */
|
||||
ret = EFI_CALL(efi_selftest(&image_obj->header, &systab));
|
||||
bootefi_run_finish(image_obj, loaded_image_info);
|
||||
|
||||
return ret != EFI_SUCCESS;
|
||||
}
|
||||
#endif /* CONFIG_CMD_BOOTEFI_SELFTEST */
|
||||
|
||||
/* Interpreter command to boot an arbitrary EFI image from memory */
|
||||
static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||
{
|
||||
if (argc < 2)
|
||||
return CMD_RET_USAGE;
|
||||
|
||||
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(argc > 2 ? argv[2] : NULL);
|
||||
#ifdef CONFIG_CMD_BOOTEFI_SELFTEST
|
||||
if (!strcmp(argv[1], "selftest")) {
|
||||
struct efi_loaded_image_obj *image_obj;
|
||||
struct efi_loaded_image *loaded_image_info;
|
||||
|
||||
r = bootefi_test_prepare(&image_obj, &loaded_image_info,
|
||||
"\\selftest", "efi_selftest");
|
||||
if (r != EFI_SUCCESS)
|
||||
return CMD_RET_FAILURE;
|
||||
|
||||
/* Execute the test */
|
||||
r = EFI_CALL(efi_selftest(&image_obj->header, &systab));
|
||||
bootefi_run_finish(image_obj, loaded_image_info);
|
||||
return r != EFI_SUCCESS;
|
||||
} else
|
||||
else if (!strcmp(argv[1], "selftest"))
|
||||
return do_efi_selftest(argc > 2 ? argv[2] : NULL);
|
||||
#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], argc > 2 ? argv[2] : NULL);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SYS_LONGHELP
|
||||
|
|
@ -490,7 +645,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"
|
||||
|
|
@ -515,6 +670,13 @@ void efi_set_bootdev(const char *dev, const char *devnr, const char *path)
|
|||
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;
|
||||
|
||||
efi_dp_split_file_path(image, &device, &image);
|
||||
efi_free_pool(image_tmp);
|
||||
}
|
||||
bootefi_image_path = image;
|
||||
} else {
|
||||
bootefi_device_path = NULL;
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ static const struct {
|
|||
} guid_list[] = {
|
||||
{
|
||||
"Device Path",
|
||||
DEVICE_PATH_GUID,
|
||||
EFI_DEVICE_PATH_PROTOCOL_GUID,
|
||||
},
|
||||
{
|
||||
"Device Path To Text",
|
||||
|
|
@ -217,7 +217,7 @@ static const struct {
|
|||
},
|
||||
{
|
||||
"Block IO",
|
||||
BLOCK_IO_GUID,
|
||||
EFI_BLOCK_IO_PROTOCOL_GUID,
|
||||
},
|
||||
{
|
||||
"Simple File System",
|
||||
|
|
@ -225,11 +225,31 @@ static const struct {
|
|||
},
|
||||
{
|
||||
"Loaded Image",
|
||||
LOADED_IMAGE_PROTOCOL_GUID,
|
||||
EFI_LOADED_IMAGE_PROTOCOL_GUID,
|
||||
},
|
||||
{
|
||||
"GOP",
|
||||
EFI_GOP_GUID,
|
||||
"Graphics Output",
|
||||
EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID,
|
||||
},
|
||||
{
|
||||
"HII String",
|
||||
EFI_HII_STRING_PROTOCOL_GUID,
|
||||
},
|
||||
{
|
||||
"HII Database",
|
||||
EFI_HII_DATABASE_PROTOCOL_GUID,
|
||||
},
|
||||
{
|
||||
"HII Config Routing",
|
||||
EFI_HII_CONFIG_ROUTING_PROTOCOL_GUID,
|
||||
},
|
||||
{
|
||||
"Simple Network",
|
||||
EFI_SIMPLE_NETWORK_PROTOCOL_GUID,
|
||||
},
|
||||
{
|
||||
"PXE Base Code",
|
||||
EFI_PXE_BASE_CODE_PROTOCOL_GUID,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -32,3 +32,4 @@ CONFIG_SMC911X_32_BIT=y
|
|||
CONFIG_BAUDRATE=38400
|
||||
CONFIG_CONS_INDEX=0
|
||||
CONFIG_OF_LIBFDT=y
|
||||
# CONFIG_EFI_LOADER is not set
|
||||
|
|
|
|||
|
|
@ -31,3 +31,4 @@ CONFIG_SMC911X_32_BIT=y
|
|||
CONFIG_BAUDRATE=38400
|
||||
CONFIG_CONS_INDEX=0
|
||||
CONFIG_OF_LIBFDT=y
|
||||
# CONFIG_EFI_LOADER is not set
|
||||
|
|
|
|||
|
|
@ -168,6 +168,10 @@ enum efi_mem_type {
|
|||
* part of the processor.
|
||||
*/
|
||||
EFI_PAL_CODE,
|
||||
/*
|
||||
* Non-volatile memory.
|
||||
*/
|
||||
EFI_PERSISTENT_MEMORY_TYPE,
|
||||
|
||||
EFI_MAX_MEMORY_TYPE,
|
||||
EFI_TABLE_END, /* For efi_build_mem_table() */
|
||||
|
|
|
|||
|
|
@ -290,10 +290,6 @@ struct efi_runtime_services {
|
|||
EFI_GUID(0x8be4df61, 0x93ca, 0x11d2, 0xaa, 0x0d, \
|
||||
0x00, 0xe0, 0x98, 0x03, 0x2b, 0x8c)
|
||||
|
||||
#define LOADED_IMAGE_PROTOCOL_GUID \
|
||||
EFI_GUID(0x5b1b31a1, 0x9562, 0x11d2, 0x8e, 0x3f, \
|
||||
0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
|
||||
|
||||
#define EFI_FDT_GUID \
|
||||
EFI_GUID(0xb1b621d5, 0xf19c, 0x41a5, \
|
||||
0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0)
|
||||
|
|
@ -329,11 +325,11 @@ struct efi_system_table {
|
|||
struct efi_configuration_table *tables;
|
||||
};
|
||||
|
||||
#define LOADED_IMAGE_GUID \
|
||||
#define EFI_LOADED_IMAGE_PROTOCOL_GUID \
|
||||
EFI_GUID(0x5b1b31a1, 0x9562, 0x11d2, \
|
||||
0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
|
||||
|
||||
#define LOADED_IMAGE_DEVICE_PATH_GUID \
|
||||
#define EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL_GUID \
|
||||
EFI_GUID(0xbc62157e, 0x3e33, 0x4fec, \
|
||||
0x99, 0x20, 0x2d, 0x3b, 0x36, 0xd7, 0x50, 0xdf)
|
||||
|
||||
|
|
@ -355,7 +351,7 @@ struct efi_loaded_image {
|
|||
unsigned long unload;
|
||||
};
|
||||
|
||||
#define DEVICE_PATH_GUID \
|
||||
#define EFI_DEVICE_PATH_PROTOCOL_GUID \
|
||||
EFI_GUID(0x09576e91, 0x6d3f, 0x11d2, \
|
||||
0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
|
||||
|
||||
|
|
@ -478,7 +474,7 @@ struct efi_device_path_file_path {
|
|||
u16 str[];
|
||||
} __packed;
|
||||
|
||||
#define BLOCK_IO_GUID \
|
||||
#define EFI_BLOCK_IO_PROTOCOL_GUID \
|
||||
EFI_GUID(0x964e5b21, 0x6459, 0x11d2, \
|
||||
0x8e, 0x39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
|
||||
|
||||
|
|
@ -1123,7 +1119,7 @@ struct efi_hii_config_access_protocol {
|
|||
efi_browser_action_request_t *action_request);
|
||||
};
|
||||
|
||||
#define EFI_GOP_GUID \
|
||||
#define EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID \
|
||||
EFI_GUID(0x9042a9de, 0x23dc, 0x4a38, \
|
||||
0x96, 0xfb, 0x7a, 0xde, 0xd0, 0x80, 0x51, 0x6a)
|
||||
|
||||
|
|
@ -1175,7 +1171,7 @@ struct efi_gop {
|
|||
struct efi_gop_mode *mode;
|
||||
};
|
||||
|
||||
#define EFI_SIMPLE_NETWORK_GUID \
|
||||
#define EFI_SIMPLE_NETWORK_PROTOCOL_GUID \
|
||||
EFI_GUID(0xa19832b9, 0xac25, 0x11d3, \
|
||||
0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)
|
||||
|
||||
|
|
@ -1268,7 +1264,7 @@ struct efi_simple_network {
|
|||
struct efi_simple_network_mode *mode;
|
||||
};
|
||||
|
||||
#define EFI_PXE_GUID \
|
||||
#define EFI_PXE_BASE_CODE_PROTOCOL_GUID \
|
||||
EFI_GUID(0x03c4e603, 0xac28, 0x11d3, \
|
||||
0x9a, 0x2d, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,9 @@
|
|||
EFI_GUID(0xe61d73b9, 0xa384, 0x4acc, \
|
||||
0xae, 0xab, 0x82, 0xe8, 0x28, 0xf3, 0x62, 0x8b)
|
||||
|
||||
/* Root node */
|
||||
extern efi_handle_t efi_root;
|
||||
|
||||
int __efi_entry_check(void);
|
||||
int __efi_exit_check(void);
|
||||
const char *__efi_nesting(void);
|
||||
|
|
@ -409,8 +412,6 @@ efi_status_t efi_setup_loaded_image(struct efi_device_path *device_path,
|
|||
struct efi_device_path *file_path,
|
||||
struct efi_loaded_image_obj **handle_ptr,
|
||||
struct efi_loaded_image **info_ptr);
|
||||
efi_status_t efi_load_image_from_path(struct efi_device_path *file_path,
|
||||
void **buffer, efi_uintn_t *size);
|
||||
/* Print information about all loaded images */
|
||||
void efi_print_image_infos(void *pc);
|
||||
|
||||
|
|
@ -564,8 +565,7 @@ struct efi_load_option {
|
|||
|
||||
void efi_deserialize_load_option(struct efi_load_option *lo, u8 *data);
|
||||
unsigned long efi_serialize_load_option(struct efi_load_option *lo, u8 **data);
|
||||
void *efi_bootmgr_load(struct efi_device_path **device_path,
|
||||
struct efi_device_path **file_path);
|
||||
efi_status_t efi_bootmgr_load(efi_handle_t *handle);
|
||||
|
||||
#else /* CONFIG_IS_ENABLED(EFI_LOADER) */
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ void efi_puts(struct efi_priv *priv, const char *str)
|
|||
int efi_init(struct efi_priv *priv, const char *banner, efi_handle_t image,
|
||||
struct efi_system_table *sys_table)
|
||||
{
|
||||
efi_guid_t loaded_image_guid = LOADED_IMAGE_PROTOCOL_GUID;
|
||||
efi_guid_t loaded_image_guid = EFI_LOADED_IMAGE_PROTOCOL_GUID;
|
||||
struct efi_boot_services *boot = sys_table->boottime;
|
||||
struct efi_loaded_image *loaded_image;
|
||||
int ret;
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ efi_status_t EFIAPI efi_main(efi_handle_t image,
|
|||
struct efi_gop *gop;
|
||||
struct efi_entry_gopmode mode;
|
||||
struct efi_entry_systable table;
|
||||
efi_guid_t efi_gop_guid = EFI_GOP_GUID;
|
||||
efi_guid_t efi_gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
|
||||
efi_uintn_t key, desc_size, size;
|
||||
efi_status_t ret;
|
||||
u32 version;
|
||||
|
|
|
|||
|
|
@ -120,14 +120,14 @@ static void *get_var(u16 *name, const efi_guid_t *vendor,
|
|||
* if successful. This checks that the EFI_LOAD_OPTION is active (enabled)
|
||||
* and that the specified file to boot exists.
|
||||
*/
|
||||
static void *try_load_entry(uint16_t n, struct efi_device_path **device_path,
|
||||
struct efi_device_path **file_path)
|
||||
static efi_status_t try_load_entry(u16 n, efi_handle_t *handle)
|
||||
{
|
||||
struct efi_load_option lo;
|
||||
u16 varname[] = L"Boot0000";
|
||||
u16 hexmap[] = L"0123456789ABCDEF";
|
||||
void *load_option, *image = NULL;
|
||||
void *load_option;
|
||||
efi_uintn_t size;
|
||||
efi_status_t ret;
|
||||
|
||||
varname[4] = hexmap[(n & 0xf000) >> 12];
|
||||
varname[5] = hexmap[(n & 0x0f00) >> 8];
|
||||
|
|
@ -136,19 +136,18 @@ static void *try_load_entry(uint16_t n, struct efi_device_path **device_path,
|
|||
|
||||
load_option = get_var(varname, &efi_global_variable_guid, &size);
|
||||
if (!load_option)
|
||||
return NULL;
|
||||
return EFI_LOAD_ERROR;
|
||||
|
||||
efi_deserialize_load_option(&lo, load_option);
|
||||
|
||||
if (lo.attributes & LOAD_OPTION_ACTIVE) {
|
||||
u32 attributes;
|
||||
efi_status_t ret;
|
||||
|
||||
debug("%s: trying to load \"%ls\" from %pD\n",
|
||||
__func__, lo.label, lo.file_path);
|
||||
|
||||
ret = efi_load_image_from_path(lo.file_path, &image, &size);
|
||||
|
||||
ret = EFI_CALL(efi_load_image(true, efi_root, lo.file_path,
|
||||
NULL, 0, handle));
|
||||
if (ret != EFI_SUCCESS)
|
||||
goto error;
|
||||
|
||||
|
|
@ -159,17 +158,22 @@ static void *try_load_entry(uint16_t n, struct efi_device_path **device_path,
|
|||
L"BootCurrent",
|
||||
(efi_guid_t *)&efi_global_variable_guid,
|
||||
attributes, size, &n));
|
||||
if (ret != EFI_SUCCESS)
|
||||
if (ret != EFI_SUCCESS) {
|
||||
if (EFI_CALL(efi_unload_image(*handle))
|
||||
!= EFI_SUCCESS)
|
||||
printf("Unloading image failed\n");
|
||||
goto error;
|
||||
}
|
||||
|
||||
printf("Booting: %ls\n", lo.label);
|
||||
efi_dp_split_file_path(lo.file_path, device_path, file_path);
|
||||
} else {
|
||||
ret = EFI_LOAD_ERROR;
|
||||
}
|
||||
|
||||
error:
|
||||
free(load_option);
|
||||
|
||||
return image;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -177,12 +181,10 @@ error:
|
|||
* EFI variable, the available load-options, finding and returning
|
||||
* the first one that can be loaded successfully.
|
||||
*/
|
||||
void *efi_bootmgr_load(struct efi_device_path **device_path,
|
||||
struct efi_device_path **file_path)
|
||||
efi_status_t efi_bootmgr_load(efi_handle_t *handle)
|
||||
{
|
||||
u16 bootnext, *bootorder;
|
||||
efi_uintn_t size;
|
||||
void *image = NULL;
|
||||
int i, num;
|
||||
efi_status_t ret;
|
||||
|
||||
|
|
@ -209,10 +211,9 @@ void *efi_bootmgr_load(struct efi_device_path **device_path,
|
|||
/* load BootNext */
|
||||
if (ret == EFI_SUCCESS) {
|
||||
if (size == sizeof(u16)) {
|
||||
image = try_load_entry(bootnext, device_path,
|
||||
file_path);
|
||||
if (image)
|
||||
return image;
|
||||
ret = try_load_entry(bootnext, handle);
|
||||
if (ret == EFI_SUCCESS)
|
||||
return ret;
|
||||
}
|
||||
} else {
|
||||
printf("Deleting BootNext failed\n");
|
||||
|
|
@ -223,19 +224,20 @@ void *efi_bootmgr_load(struct efi_device_path **device_path,
|
|||
bootorder = get_var(L"BootOrder", &efi_global_variable_guid, &size);
|
||||
if (!bootorder) {
|
||||
printf("BootOrder not defined\n");
|
||||
ret = EFI_NOT_FOUND;
|
||||
goto error;
|
||||
}
|
||||
|
||||
num = size / sizeof(uint16_t);
|
||||
for (i = 0; i < num; i++) {
|
||||
debug("%s: trying to load Boot%04X\n", __func__, bootorder[i]);
|
||||
image = try_load_entry(bootorder[i], device_path, file_path);
|
||||
if (image)
|
||||
ret = try_load_entry(bootorder[i], handle);
|
||||
if (ret == EFI_SUCCESS)
|
||||
break;
|
||||
}
|
||||
|
||||
free(bootorder);
|
||||
|
||||
error:
|
||||
return image;
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1591,6 +1591,7 @@ failure:
|
|||
* @size: size of the loaded image
|
||||
* Return: status code
|
||||
*/
|
||||
static
|
||||
efi_status_t efi_load_image_from_path(struct efi_device_path *file_path,
|
||||
void **buffer, efi_uintn_t *size)
|
||||
{
|
||||
|
|
@ -1699,19 +1700,11 @@ efi_status_t EFIAPI efi_load_image(bool boot_policy,
|
|||
&source_size);
|
||||
if (ret != EFI_SUCCESS)
|
||||
goto error;
|
||||
/*
|
||||
* split file_path which contains both the device and
|
||||
* file parts:
|
||||
*/
|
||||
efi_dp_split_file_path(file_path, &dp, &fp);
|
||||
} else {
|
||||
/* In this case, file_path is the "device" path, i.e.
|
||||
* something like a HARDWARE_DEVICE:MEMORY_MAPPED
|
||||
*/
|
||||
dest_buffer = source_buffer;
|
||||
dp = file_path;
|
||||
fp = NULL;
|
||||
}
|
||||
/* split file_path which contains both the device and file parts */
|
||||
efi_dp_split_file_path(file_path, &dp, &fp);
|
||||
ret = efi_setup_loaded_image(dp, fp, image_obj, &info);
|
||||
if (ret == EFI_SUCCESS)
|
||||
ret = efi_load_pe(*image_obj, dest_buffer, info);
|
||||
|
|
@ -2664,6 +2657,7 @@ efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle,
|
|||
}
|
||||
|
||||
current_image = image_handle;
|
||||
EFI_PRINT("Jumping into 0x%p\n", image_obj->entry);
|
||||
ret = EFI_CALL(image_obj->entry(image_handle, &systab));
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -335,6 +335,9 @@ struct efi_device_path *efi_dp_create_device_node(const u8 type,
|
|||
{
|
||||
struct efi_device_path *ret;
|
||||
|
||||
if (length < sizeof(struct efi_device_path))
|
||||
return NULL;
|
||||
|
||||
ret = dp_alloc(length);
|
||||
if (!ret)
|
||||
return ret;
|
||||
|
|
@ -917,14 +920,14 @@ struct efi_device_path *efi_dp_from_mem(uint32_t memory_type,
|
|||
*
|
||||
* @full_path: device path including device and file path
|
||||
* @device_path: path of the device
|
||||
* @file_path: relative path of the file
|
||||
* @file_path: relative path of the file or NULL if there is none
|
||||
* Return: status code
|
||||
*/
|
||||
efi_status_t efi_dp_split_file_path(struct efi_device_path *full_path,
|
||||
struct efi_device_path **device_path,
|
||||
struct efi_device_path **file_path)
|
||||
{
|
||||
struct efi_device_path *p, *dp, *fp;
|
||||
struct efi_device_path *p, *dp, *fp = NULL;
|
||||
|
||||
*device_path = NULL;
|
||||
*file_path = NULL;
|
||||
|
|
@ -935,7 +938,7 @@ efi_status_t efi_dp_split_file_path(struct efi_device_path *full_path,
|
|||
while (!EFI_DP_TYPE(p, MEDIA_DEVICE, FILE_PATH)) {
|
||||
p = efi_dp_next(p);
|
||||
if (!p)
|
||||
return EFI_INVALID_PARAMETER;
|
||||
goto out;
|
||||
}
|
||||
fp = efi_dp_dup(p);
|
||||
if (!fp)
|
||||
|
|
@ -944,6 +947,7 @@ efi_status_t efi_dp_split_file_path(struct efi_device_path *full_path,
|
|||
p->sub_type = DEVICE_PATH_SUB_TYPE_END;
|
||||
p->length = sizeof(*p);
|
||||
|
||||
out:
|
||||
*device_path = dp;
|
||||
*file_path = fp;
|
||||
return EFI_SUCCESS;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#include <part.h>
|
||||
#include <malloc.h>
|
||||
|
||||
const efi_guid_t efi_block_io_guid = BLOCK_IO_GUID;
|
||||
const efi_guid_t efi_block_io_guid = EFI_BLOCK_IO_PROTOCOL_GUID;
|
||||
|
||||
/**
|
||||
* struct efi_disk_obj - EFI disk object
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
static const efi_guid_t efi_gop_guid = EFI_GOP_GUID;
|
||||
static const efi_guid_t efi_gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
|
||||
|
||||
/**
|
||||
* struct efi_gop_obj - graphical output protocol object
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@
|
|||
#include <pe.h>
|
||||
|
||||
const efi_guid_t efi_global_variable_guid = EFI_GLOBAL_VARIABLE_GUID;
|
||||
const efi_guid_t efi_guid_device_path = DEVICE_PATH_GUID;
|
||||
const efi_guid_t efi_guid_loaded_image = LOADED_IMAGE_GUID;
|
||||
const efi_guid_t efi_guid_loaded_image_device_path
|
||||
= LOADED_IMAGE_DEVICE_PATH_GUID;
|
||||
const efi_guid_t efi_guid_device_path = EFI_DEVICE_PATH_PROTOCOL_GUID;
|
||||
const efi_guid_t efi_guid_loaded_image = EFI_LOADED_IMAGE_PROTOCOL_GUID;
|
||||
const efi_guid_t efi_guid_loaded_image_device_path =
|
||||
EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL_GUID;
|
||||
const efi_guid_t efi_simple_file_system_protocol_guid =
|
||||
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID;
|
||||
const efi_guid_t efi_file_info_guid = EFI_FILE_INFO_GUID;
|
||||
|
|
|
|||
|
|
@ -376,6 +376,10 @@ efi_status_t efi_allocate_pages(int type, int memory_type,
|
|||
efi_status_t r = EFI_SUCCESS;
|
||||
uint64_t addr;
|
||||
|
||||
/* Check import parameters */
|
||||
if (memory_type >= EFI_PERSISTENT_MEMORY_TYPE &&
|
||||
memory_type <= 0x6FFFFFFF)
|
||||
return EFI_INVALID_PARAMETER;
|
||||
if (!memory)
|
||||
return EFI_INVALID_PARAMETER;
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
#include <efi_loader.h>
|
||||
#include <malloc.h>
|
||||
|
||||
static const efi_guid_t efi_net_guid = EFI_SIMPLE_NETWORK_GUID;
|
||||
static const efi_guid_t efi_pxe_guid = EFI_PXE_GUID;
|
||||
static const efi_guid_t efi_net_guid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
|
||||
static const efi_guid_t efi_pxe_guid = EFI_PXE_BASE_CODE_PROTOCOL_GUID;
|
||||
static struct efi_pxe_packet *dhcp_ack;
|
||||
static bool new_rx_packet;
|
||||
static void *new_tx_packet;
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@
|
|||
|
||||
const efi_guid_t efi_u_boot_guid = U_BOOT_GUID;
|
||||
|
||||
efi_handle_t efi_root = NULL;
|
||||
|
||||
struct efi_root_dp {
|
||||
struct efi_device_path_vendor vendor;
|
||||
struct efi_device_path end;
|
||||
|
|
@ -26,7 +28,6 @@ struct efi_root_dp {
|
|||
*/
|
||||
efi_status_t efi_root_node_register(void)
|
||||
{
|
||||
efi_handle_t root = NULL;
|
||||
struct efi_root_dp *dp;
|
||||
|
||||
/* Create device path protocol */
|
||||
|
|
@ -46,7 +47,7 @@ efi_status_t efi_root_node_register(void)
|
|||
dp->end.length = sizeof(struct efi_device_path);
|
||||
|
||||
/* Create root node and install protocols */
|
||||
return EFI_CALL(efi_install_multiple_protocol_interfaces(&root,
|
||||
return EFI_CALL(efi_install_multiple_protocol_interfaces(&efi_root,
|
||||
/* Device path protocol */
|
||||
&efi_guid_device_path, dp,
|
||||
/* Device path to text protocol */
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#include <common.h>
|
||||
#include <efi_api.h>
|
||||
|
||||
static const efi_guid_t loaded_image_guid = LOADED_IMAGE_GUID;
|
||||
static const efi_guid_t loaded_image_guid = EFI_LOADED_IMAGE_PROTOCOL_GUID;
|
||||
static const efi_guid_t fdt_guid = EFI_FDT_GUID;
|
||||
static const efi_guid_t acpi_guid = EFI_ACPI_TABLE_GUID;
|
||||
static const efi_guid_t smbios_guid = SMBIOS_TABLE_GUID;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ efi_selftest_events.o \
|
|||
efi_selftest_event_groups.o \
|
||||
efi_selftest_exception.o \
|
||||
efi_selftest_exitbootservices.o \
|
||||
efi_selftest_fdt.o \
|
||||
efi_selftest_gop.o \
|
||||
efi_selftest_loaded_image.o \
|
||||
efi_selftest_manageprotocols.o \
|
||||
|
|
@ -42,6 +41,10 @@ efi_selftest_watchdog.o
|
|||
obj-$(CONFIG_CPU_V7) += efi_selftest_unaligned.o
|
||||
obj-$(CONFIG_EFI_LOADER_HII) += efi_selftest_hii.o
|
||||
|
||||
ifeq ($(CONFIG_GENERATE_ACPI_TABLE),)
|
||||
obj-y += efi_selftest_fdt.o
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_BLK)$(CONFIG_PARTITIONS),yy)
|
||||
obj-y += efi_selftest_block_device.o
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ static const struct efi_gop_pixel DARK_BLUE = {128, 0, 0, 0};
|
|||
static const struct efi_gop_pixel LIGHT_BLUE = {255, 192, 192, 0};
|
||||
|
||||
static struct efi_boot_services *boottime;
|
||||
static efi_guid_t efi_gop_guid = EFI_GOP_GUID;
|
||||
static efi_guid_t efi_gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
|
||||
static struct efi_gop *gop;
|
||||
static struct efi_gop_pixel *bitmap;
|
||||
static struct efi_event *event;
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@
|
|||
|
||||
static struct efi_boot_services *boottime;
|
||||
|
||||
static const efi_guid_t block_io_protocol_guid = BLOCK_IO_GUID;
|
||||
static const efi_guid_t guid_device_path = DEVICE_PATH_GUID;
|
||||
static const efi_guid_t block_io_protocol_guid = EFI_BLOCK_IO_PROTOCOL_GUID;
|
||||
static const efi_guid_t guid_device_path = EFI_DEVICE_PATH_PROTOCOL_GUID;
|
||||
static const efi_guid_t guid_simple_file_system_protocol =
|
||||
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID;
|
||||
static const efi_guid_t guid_file_system_info = EFI_FILE_SYSTEM_INFO_GUID;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ struct interface {
|
|||
void (EFIAPI * inc)(void);
|
||||
} interface;
|
||||
|
||||
static efi_guid_t guid_device_path = DEVICE_PATH_GUID;
|
||||
static efi_guid_t guid_device_path = EFI_DEVICE_PATH_PROTOCOL_GUID;
|
||||
|
||||
static efi_guid_t guid_device_path_to_text_protocol =
|
||||
EFI_DEVICE_PATH_TO_TEXT_PROTOCOL_GUID;
|
||||
|
|
|
|||
|
|
@ -13,13 +13,15 @@
|
|||
#include <efi_selftest.h>
|
||||
#include <linux/libfdt.h>
|
||||
|
||||
static struct efi_boot_services *boottime;
|
||||
static const struct efi_system_table *systemtab;
|
||||
static const struct efi_boot_services *boottime;
|
||||
static const char *fdt;
|
||||
|
||||
/* This should be sufficient for */
|
||||
#define BUFFERSIZE 0x100000
|
||||
|
||||
static efi_guid_t fdt_guid = EFI_FDT_GUID;
|
||||
static const efi_guid_t fdt_guid = EFI_FDT_GUID;
|
||||
static const efi_guid_t acpi_guid = EFI_ACPI_TABLE_GUID;
|
||||
|
||||
/*
|
||||
* Convert FDT value to host endianness.
|
||||
|
|
@ -115,6 +117,23 @@ static char *get_property(const u16 *property)
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* efi_st_get_config_table() - get configuration table
|
||||
*
|
||||
* @guid: GUID of the configuration table
|
||||
* Return: pointer to configuration table or NULL
|
||||
*/
|
||||
static void *efi_st_get_config_table(const efi_guid_t *guid)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < systab.nr_tables; i++) {
|
||||
if (!guidcmp(guid, &systemtab->tables[i].guid))
|
||||
return systemtab->tables[i].table;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Setup unit test.
|
||||
*
|
||||
|
|
@ -125,21 +144,22 @@ static char *get_property(const u16 *property)
|
|||
static int setup(const efi_handle_t img_handle,
|
||||
const struct efi_system_table *systable)
|
||||
{
|
||||
efi_uintn_t i;
|
||||
void *acpi;
|
||||
|
||||
systemtab = systable;
|
||||
boottime = systable->boottime;
|
||||
|
||||
/* Find configuration tables */
|
||||
for (i = 0; i < systable->nr_tables; ++i) {
|
||||
if (!efi_st_memcmp(&systable->tables[i].guid, &fdt_guid,
|
||||
sizeof(efi_guid_t)))
|
||||
fdt = systable->tables[i].table;
|
||||
}
|
||||
acpi = efi_st_get_config_table(&acpi_guid);
|
||||
fdt = efi_st_get_config_table(&fdt_guid);
|
||||
|
||||
if (!fdt) {
|
||||
efi_st_error("Missing device tree\n");
|
||||
return EFI_ST_FAILURE;
|
||||
}
|
||||
|
||||
if (acpi) {
|
||||
efi_st_error("Found ACPI table and device tree\n");
|
||||
return EFI_ST_FAILURE;
|
||||
}
|
||||
return EFI_ST_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
@ -183,5 +203,4 @@ EFI_UNIT_TEST(fdt) = {
|
|||
.phase = EFI_EXECUTE_BEFORE_BOOTTIME_EXIT,
|
||||
.setup = setup,
|
||||
.execute = execute,
|
||||
.on_request = true,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#include <efi_selftest.h>
|
||||
|
||||
static struct efi_boot_services *boottime;
|
||||
static efi_guid_t efi_gop_guid = EFI_GOP_GUID;
|
||||
static efi_guid_t efi_gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
|
||||
static struct efi_gop *gop;
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ static struct efi_boot_services *boottime;
|
|||
static efi_handle_t handle_image;
|
||||
static efi_handle_t handle_volume;
|
||||
|
||||
static const efi_guid_t guid_device_path = DEVICE_PATH_GUID;
|
||||
static const efi_guid_t guid_device_path = EFI_DEVICE_PATH_PROTOCOL_GUID;
|
||||
static const efi_guid_t guid_simple_file_system_protocol =
|
||||
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID;
|
||||
static const efi_guid_t guid_file_info = EFI_FILE_INFO_GUID;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#include <common.h>
|
||||
#include <efi_api.h>
|
||||
|
||||
static efi_guid_t loaded_image_protocol_guid = LOADED_IMAGE_GUID;
|
||||
static efi_guid_t loaded_image_protocol_guid = EFI_LOADED_IMAGE_PROTOCOL_GUID;
|
||||
|
||||
/**
|
||||
* check_loaded_image_protocol() - check image_base/image_size
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ struct dhcp {
|
|||
static struct efi_boot_services *boottime;
|
||||
static struct efi_simple_network *net;
|
||||
static struct efi_event *timer;
|
||||
static const efi_guid_t efi_net_guid = EFI_SIMPLE_NETWORK_GUID;
|
||||
static const efi_guid_t efi_net_guid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
|
||||
/* IP packet ID */
|
||||
static unsigned int net_ip_id;
|
||||
|
||||
|
|
|
|||
|
|
@ -310,6 +310,7 @@ instances of:
|
|||
|
||||
- `buildconfig.get(...`
|
||||
- `@pytest.mark.buildconfigspec(...`
|
||||
- `@pytest.mark.notbuildconfigspec(...`
|
||||
|
||||
### Complete invocation example
|
||||
|
||||
|
|
|
|||
|
|
@ -460,11 +460,15 @@ def setup_buildconfigspec(item):
|
|||
"""
|
||||
|
||||
mark = item.get_marker('buildconfigspec')
|
||||
if not mark:
|
||||
return
|
||||
for option in mark.args:
|
||||
if not ubconfig.buildconfig.get('config_' + option.lower(), None):
|
||||
pytest.skip('.config feature "%s" not enabled' % option.lower())
|
||||
if mark:
|
||||
for option in mark.args:
|
||||
if not ubconfig.buildconfig.get('config_' + option.lower(), None):
|
||||
pytest.skip('.config feature "%s" not enabled' % option.lower())
|
||||
notmark = item.get_marker('notbuildconfigspec')
|
||||
if notmark:
|
||||
for option in notmark.args:
|
||||
if ubconfig.buildconfig.get('config_' + option.lower(), None):
|
||||
pytest.skip('.config feature "%s" enabled' % option.lower())
|
||||
|
||||
def tool_is_in_path(tool):
|
||||
for path in os.environ["PATH"].split(os.pathsep):
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ def test_efi_selftest(u_boot_console):
|
|||
This function executes all selftests that are not marked as on request.
|
||||
"""
|
||||
u_boot_console.run_command(cmd='setenv efi_selftest')
|
||||
u_boot_console.run_command(cmd='bootefi selftest ${fdtcontroladdr}', wait_for_prompt=False)
|
||||
u_boot_console.run_command(cmd='bootefi selftest', wait_for_prompt=False)
|
||||
m = u_boot_console.p.expect(['Summary: 0 failures', 'Press any key'])
|
||||
if m != 0:
|
||||
raise Exception('Failures occurred during the EFI selftest')
|
||||
|
|
@ -27,6 +27,7 @@ def test_efi_selftest(u_boot_console):
|
|||
|
||||
@pytest.mark.buildconfigspec('cmd_bootefi_selftest')
|
||||
@pytest.mark.buildconfigspec('of_control')
|
||||
@pytest.mark.notbuildconfigspec('generate_acpi_table')
|
||||
def test_efi_selftest_device_tree(u_boot_console):
|
||||
u_boot_console.run_command(cmd='setenv efi_selftest list')
|
||||
output = u_boot_console.run_command('bootefi selftest')
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user