From: Ilias Apalodimas <ilias.apalodimas@linaro.org>
To: Masahisa Kojima <masahisa.kojima@linaro.org>
Cc: u-boot@lists.denx.de, Heinrich Schuchardt <xypron.glpk@gmx.de>,
Simon Glass <sjg@chromium.org>,
Takahiro Akashi <takahiro.akashi@linaro.org>
Subject: Re: [PATCH v4 4/8] efi_loader: support boot from URI device path
Date: Mon, 25 Sep 2023 15:37:47 +0300 [thread overview]
Message-ID: <ZRF/G1+qSllqoNYL@hera> (raw)
In-Reply-To: <20230922071119.1439482-5-masahisa.kojima@linaro.org>
On Fri, Sep 22, 2023 at 04:11:15PM +0900, Masahisa Kojima wrote:
> This supports to boot from the URI device path.
> When user selects the URI device path, bootmgr downloads
> the file using wget into the address specified by loadaddr
> env variable.
> If the file is .iso or .img file, mount the image with blkmap
> then try to boot with the default file(e.g. EFI/BOOT/BOOTAA64.EFI).
> If the file is .efi file, load and start the downloaded file.
>
> Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
> ---
> lib/efi_loader/efi_bootmgr.c | 189 +++++++++++++++++++++++++++++++++++
> 1 file changed, 189 insertions(+)
>
> diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c
> index a40762c74c..605be5041e 100644
> --- a/lib/efi_loader/efi_bootmgr.c
> +++ b/lib/efi_loader/efi_bootmgr.c
> @@ -7,10 +7,14 @@
>
> #define LOG_CATEGORY LOGC_EFI
>
> +#include <blk.h>
> +#include <blkmap.h>
> #include <common.h>
> #include <charset.h>
> +#include <dm.h>
> #include <log.h>
> #include <malloc.h>
> +#include <net.h>
> #include <efi_default_filename.h>
> #include <efi_loader.h>
> #include <efi_variable.h>
> @@ -168,6 +172,182 @@ out:
> return ret;
> }
>
> +/**
> + * mount_image() - mount the image with blkmap
> + *
> + * @lo_label u16 label string of load option
> + * @image_addr: image address
> + * @image_size image size
> + * Return: pointer to the UCLASS_BLK udevice, NULL if failed
> + */
> +static struct udevice *mount_image(u16 *lo_label, ulong image_addr, int image_size)
> +{
> + int err;
> + struct blkmap *bm;
> + struct udevice *bm_dev;
> + char *label = NULL, *p;
> +
> + label = efi_alloc(utf16_utf8_strlen(lo_label) + 1);
> + if (!label)
> + return NULL;
> +
> + p = label;
> + utf16_utf8_strcpy(&p, lo_label);
> + err = blkmap_create_ramdisk(label, image_addr, image_size, &bm_dev);
> + if (err) {
> + efi_free_pool(label);
> + return NULL;
> + }
> + bm = dev_get_plat(bm_dev);
> +
> + efi_free_pool(label);
> +
> + return bm->blk;
> +}
> +
> +/**
> + * try_load_default_file() - try to load the default file
> + *
> + * Search the device having EFI_SIMPLE_FILE_SYSTEM_PROTOCOL,
> + * then try to load with the default boot file(e.g. EFI/BOOT/BOOTAA64.EFI).
> + *
> + * @dev pointer to the UCLASS_BLK or UCLASS_PARTITION udevice
> + * @image_handle: pointer to handle for newly installed image
> + * Return: status code
> + */
> +static efi_status_t try_load_default_file(struct udevice *dev,
> + efi_handle_t *image_handle)
> +{
Maybe I misunderstood you on the previous series. Wasn't the plan to merge
the patch that adds boot options automatically when a disk is scanned? This
code could only look for a boot option with '1234567' in its load options
instead of rescanning all devices with the EFI_SIMPLE_FILE_SYSTEM_PROTOCO
installed
> + efi_status_t ret;
> + efi_handle_t handle;
> + struct efi_handler *handler;
> + struct efi_device_path *file_path;
> + struct efi_device_path *device_path;
> +
> + if (dev_tag_get_ptr(dev, DM_TAG_EFI, (void **)&handle)) {
> + log_warning("DM_TAG_EFI not found\n");
> + return EFI_INVALID_PARAMETER;
> + }
> +
> + ret = efi_search_protocol(handle,
> + &efi_simple_file_system_protocol_guid, &handler);
> + if (ret != EFI_SUCCESS)
> + return ret;
> +
> + ret = EFI_CALL(bs->open_protocol(handle, &efi_guid_device_path,
> + (void **)&device_path, efi_root, NULL,
> + EFI_OPEN_PROTOCOL_GET_PROTOCOL));
> + if (ret != EFI_SUCCESS)
> + return ret;
> +
> + file_path = expand_media_path(device_path);
> + ret = EFI_CALL(efi_load_image(true, efi_root, file_path, NULL, 0,
> + image_handle));
> +
> + efi_free_pool(file_path);
> +
> + return ret;
> +}
> +
> +/**
> + * load_default_file_from_blk_dev() - load the default file
> + *
> + * @blk pointer to the UCLASS_BLK udevice
> + * @handle: pointer to handle for newly installed image
> + * Return: status code
> + */
> +static efi_status_t load_default_file_from_blk_dev(struct udevice *blk,
> + efi_handle_t *handle)
> +{
> + efi_status_t ret;
> + struct udevice *partition;
> +
> + /* image that has no partition table but a file system */
> + ret = try_load_default_file(blk, handle);
> + if (ret == EFI_SUCCESS)
> + return ret;
> +
> + /* try the partitions */
> + device_foreach_child(partition, blk) {
> + enum uclass_id id;
> +
> + id = device_get_uclass_id(partition);
> + if (id != UCLASS_PARTITION)
> + continue;
> +
> + ret = try_load_default_file(partition, handle);
> + if (ret == EFI_SUCCESS)
> + return ret;
> + }
> +
> + return EFI_NOT_FOUND;
> +}
> +
> +/**
> + * try_load_from_uri_path() - Handle the URI device path
> + *
> + * @uridp: uri device path
> + * @lo_label label of load option
> + * @handle: pointer to handle for newly installed image
> + * Return: status code
> + */
> +static efi_status_t try_load_from_uri_path(struct efi_device_path_uri *uridp,
> + u16 *lo_label,
> + efi_handle_t *handle)
> +{
> + char *s;
> + int uri_len;
> + int image_size;
> + efi_status_t ret;
> + ulong image_addr;
> +
> + s = env_get("loadaddr");
> + if (!s) {
> + log_err("Error: loadaddr is not set\n");
> + return EFI_INVALID_PARAMETER;
> + }
> + image_addr = hextoul(s, NULL);
> + image_size = wget_with_dns(image_addr, uridp->uri);
> + if (image_size < 0)
> + return EFI_INVALID_PARAMETER;
> +
> + /*
> + * If the file extension is ".iso" or ".img", mount it and try to load
> + * the default file.
> + * If the file is PE-COFF image, load the downloaded file.
> + */
> + uri_len = strlen(uridp->uri); /* todo: directly use uridp->uri */
> + if (!strncmp(&uridp->uri[uri_len - 4], ".iso", 4) ||
> + !strncmp(&uridp->uri[uri_len - 4], ".img", 4)) {
> + struct udevice *blk;
> +
> + blk = mount_image(lo_label, image_addr, image_size);
> + if (!blk)
> + return EFI_INVALID_PARAMETER;
> +
> + ret = load_default_file_from_blk_dev(blk, handle);
> + } else if (efi_check_pe((void *)image_addr, image_size, NULL) == EFI_SUCCESS) {
> + efi_handle_t mem_handle = NULL;
> + struct efi_device_path *file_path = NULL;
> +
> + file_path = efi_dp_from_mem(EFI_RESERVED_MEMORY_TYPE,
> + (uintptr_t)image_addr, image_size);
> + ret = efi_install_multiple_protocol_interfaces(
> + &mem_handle, &efi_guid_device_path, file_path, NULL);
> + if (ret != EFI_SUCCESS)
> + return EFI_INVALID_PARAMETER;
> +
> + ret = EFI_CALL(efi_load_image(false, efi_root, file_path,
> + (void *)image_addr, image_size,
> + handle));
> + } else {
> + log_err("Error: file type is not supported\n");
> + return EFI_INVALID_PARAMETER;
> + }
> +
> + return ret;
> +}
> +
> /**
> * try_load_entry() - try to load image for boot option
> *
> @@ -211,6 +391,15 @@ static efi_status_t try_load_entry(u16 n, efi_handle_t *handle,
> if (EFI_DP_TYPE(lo.file_path, MEDIA_DEVICE, FILE_PATH)) {
> /* file_path doesn't contain a device path */
> ret = try_load_from_short_path(lo.file_path, handle);
> + } else if (EFI_DP_TYPE(lo.file_path, MESSAGING_DEVICE, MSG_URI)) {
> + if (IS_ENABLED(CONFIG_BLKMAP) &&
> + IS_ENABLED(CONFIG_CMD_WGET) &&
> + IS_ENABLED(CONFIG_CMD_DNS)) {
> + ret = try_load_from_uri_path(
> + (struct efi_device_path_uri *)
> + lo.file_path,
> + lo.label, handle);
> + }
is ret initialized in this function? Otherwise we need to initialize it if
one of the Kconfig options are disabled
> } else {
> file_path = expand_media_path(lo.file_path);
> ret = EFI_CALL(efi_load_image(true, efi_root, file_path,
> --
> 2.34.1
>
Thanks
/Ilias
next prev parent reply other threads:[~2023-09-25 12:37 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-22 7:11 [PATCH v4 0/8] Add EFI HTTP boot support Masahisa Kojima
2023-09-22 7:11 ` [PATCH v4 1/8] net: wget: prevent overwriting reserved memory Masahisa Kojima
2023-09-25 10:50 ` Ilias Apalodimas
2023-09-22 7:11 ` [PATCH v4 2/8] net: wget: add wget with dns utility function Masahisa Kojima
2023-09-25 10:52 ` Ilias Apalodimas
2023-09-22 7:11 ` [PATCH v4 3/8] blk: blkmap: add ramdisk creation " Masahisa Kojima
2023-09-25 12:09 ` Ilias Apalodimas
2023-09-22 7:11 ` [PATCH v4 4/8] efi_loader: support boot from URI device path Masahisa Kojima
2023-09-25 12:37 ` Ilias Apalodimas [this message]
2023-09-26 3:01 ` Masahisa Kojima
2023-09-28 11:35 ` Maxim Uvarov
2023-09-29 2:13 ` Masahisa Kojima
2023-09-29 6:24 ` Maxim Uvarov
2023-09-29 7:00 ` Masahisa Kojima
2023-09-29 7:43 ` Maxim Uvarov
2023-09-22 7:11 ` [PATCH v4 5/8] efi_loader: set EFI HTTP Boot download buffer as reserved Masahisa Kojima
2023-09-25 12:46 ` Ilias Apalodimas
2023-09-26 3:11 ` Masahisa Kojima
2023-09-22 7:11 ` [PATCH v4 6/8] cmd: efidebug: add uri device path Masahisa Kojima
2023-09-22 7:11 ` [PATCH v4 7/8] doc: uefi: add HTTP Boot support Masahisa Kojima
2023-09-25 12:12 ` Ilias Apalodimas
2023-09-26 3:02 ` Masahisa Kojima
2023-09-22 7:11 ` [PATCH v4 8/8] efi_loader: create BlockIo device boot option Masahisa Kojima
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZRF/G1+qSllqoNYL@hera \
--to=ilias.apalodimas@linaro.org \
--cc=masahisa.kojima@linaro.org \
--cc=sjg@chromium.org \
--cc=takahiro.akashi@linaro.org \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.