From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 81BA8C43334 for ; Sun, 10 Jul 2022 09:04:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9713E843A2; Sun, 10 Jul 2022 11:04:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="kPzuO60A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6DB06844B4; Sun, 10 Jul 2022 11:04:12 +0200 (CEST) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1CF4A842FA for ; Sun, 10 Jul 2022 11:04:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1657443830; bh=7yP1YXHgTns4ZYADmM7YSS0JGO8OS3otOaDjarwomOI=; h=X-UI-Sender-Class:Date:Subject:To:Cc:References:From:In-Reply-To; b=kPzuO60Agw9RVKaC8tDwsH9WraYbG+c1X5+0rAYruBy10mtQKSronX57rEq9womKE xt6Xzhma3i98BlnHDcaYkrYK/ON5y5K8C1SGbEfy5a8WSmAZij5Mj1/RsfHnD8YlK/ po/8JVXV8SkU51ZmxWKMRgcLM1CQ09SspyasJXHo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [192.168.123.94] ([62.143.94.109]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N6KUT-1nUtg70ubZ-016cgT; Sun, 10 Jul 2022 11:03:50 +0200 Message-ID: Date: Sun, 10 Jul 2022 11:03:43 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.0.1 Subject: Re: [PATCH v8 2/9] eficonfig: menu-driven addition of UEFI boot option To: Masahisa Kojima Cc: Ilias Apalodimas , Simon Glass , Takahiro Akashi , Francois Ozog , Mark Kettenis , Michal Simek , Ovidiu Panait , Ashok Reddy Soma , Huang Jianan , Roland Gaudig , Chris Morgan , u-boot@lists.denx.de References: <20220619045607.1669-1-masahisa.kojima@linaro.org> <20220619045607.1669-3-masahisa.kojima@linaro.org> Content-Language: en-US From: Heinrich Schuchardt In-Reply-To: <20220619045607.1669-3-masahisa.kojima@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:xuDlbq1ZyRWORbJ9bDi+NskjZBY3+7NZUS/RNYxmgHnaYfh3+sh yo0QqpQYtdf/wDTN3Oyw0Ae0v5bW/RLvAnvp9oyZhmuf7AldjXALpjqfzcaFAXbZZ63gbW2 7tFWK3mTILSGmaFlNRASNbs60/QwmOUjV4BQCd83eBdaJotar1dmt5zcAXZBZFP19FHPNhP B3p8PXPyvogDT/2q8d1HA== X-UI-Out-Filterresults: notjunk:1;V03:K0:/FtOtQ4bPns=:9k8WK4zoO1QZibUUmPCg/s aoEDrrCgGUsfSd2jtN6paizvi7SqypubnQ17KtwaCT7KuAGmvUAAp+xcCb2rH1bMfxcOYy+Ot K785nlOr1wL2O70lUdP3XKZV9TzzkLM1A5XTh7AC2hxZ4ro0kHXp02vuIZ4befc7lkrgTPcWo 0Io5h5AXQwbmFdGVgrXC9nBCYHoa5yF5dIPbQ5hX/iBSwVdZS4PPERKbiwpao8EMVaen8tI5w kwAC9mSNyGKNM3W3l5AR409eFCDJUM8hDRuOLGp7De6BURaSR7XNY0bZci9VTl2SbUEJFyOcE Ol57GuERxp/eGBsr2QJ8X1XjP9d5TGulHO9WPxREbAHmRY7h9E1DZhyDOKhvyzS/5AfQg2GEA b5j0FTQK9FWa9a0QmWpSxmeWX2qRjD3e+o4rGkqMWfYX6Vow7r3W7Dm9akP8emrIplolll3AJ 8L6Y1BU0/Ay1CwO1VN8LarM0UuKmJCJLY6DeMfk4Tfo3Qz53hDwR4yhsGnqmtj6E0y9aTwQxo HEph6ybE/ff2+jix2qru3AOlqxoyMiEgpWXUqk7/WZfWknr577mQ9NJo/hBONoVAk9d9CZYlb wK5Jl9CrHi1j2ec5d/5HRlgn3jNIcZE5jt6Wr/bqvF8KmZsLKTTH55alLgs8dnzao2o2x0fNF ykyYAN4H6nluOzPZAwQC7bZXJ6fGuyP5UyyCghM/PNYOXEM6xJ/tJiH5jAuCSUvgE7XF90E3o DFEZakQx0KVIAOaTrelz+dHdN0Hr19SlLkgDw/428PXItzzbKyr7cfQqhmvsicO3K+quYHZuT Wu9N4TZ5pz5SMlzMEqmZjFWIYsuO7zPoTPcUABUtykEM4NQcV5iLiCbp0p7z4D1u1vYD6loB2 I4I4pxufRrYlFRRhqbCAJpDz4K7tSDbP0KEab1oko/d1E+MX0h/yWOUQs2JkQi5uaQgfBUgCY l15ZT7/tJvBeotdeA3znO/EFivdWHTSN8kKJPJUa5tlrCV4dgT8CJoQt6D+oavu4sgPTHMmpo dpp9P2n8N8LqkcevtqDdUJNYF3JyCvQBq6ckzXd6AKFz08M2DMmiIq+h/T+i3Nj4oEEi5anr2 M3/uZFY5ZMZcDwXbzDVEyeaMOInKlZ/OOa5TIl12SEdrJiF+qtAsrP5Og== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean On 6/19/22 06:56, Masahisa Kojima wrote: > This commit add the "eficonfig" command. > The "eficonfig" command implements the menu-driven UEFI boot option > maintenance feature. This commit implements the addition of > new boot option. User can select the block device volume having > efi_simple_file_system_protocol and select the file corresponding > to the Boot#### variable. User can also enter the description and > optional_data of the BOOT#### variable in utf8. > > This commit adds "include/efi_config.h", it contains the common > definition to be used from other menus such as UEFI Secure Boot > key management. > > Signed-off-by: Masahisa Kojima > --- > Changes in v8: > - command name is change from "efimenu" to "eficonfig" > - function and struct prefixes is changed to "eficonfig" > - fix menu header string > > Changes in v7: > - add "efimenu" command and uefi variable maintenance code > moved into cmd/efimenu.c > - create include/efimenu.h to define the common definition for > the other menu such as UEFI Secure Boot key management > - update boot option edit UI, user can select description, file, > and optional_data to edit in the same menu like following. > > ** Edit Boot Option ** > > Description: debian > File: virtio 0:1/EFI\debian\grubaa64.efi > Optional Data: test > Save > Quit > > - remove exit parameter from efimenu_process_common() > - menu title type is changed from u16 to char > - efimenu_process_common() add menu title string > - reduce printf/puts function call for displaying the menu > - efi_console_get_u16_string() accept 0 length to allow > optional_data is empty > - efi_console_get_u16_string() the "size" parameter name is changes to "= count" > - efimenu is now designed to maintain the UEFI variables, remove autoboo= t related code > - remove one empty line before "Quit" entry > - efimenu_init() processes only the first time > > Changes in v6: > - fix typos > - modify volume name to match U-Boot syntax > - compile in CONFIG_EFI_LOADER=3Dn and CONFIG_CMD_BOOTEFI_BOOTMGR=3Dn > - simplify u16_strncmp() usage > - support "a\b.efi" file path, use link list to handle filepath > - modify length check condition > - UEFI related menu items only appears with CONFIG_AUTOBOOT_MENU_SHOW=3D= y > > Changes in v5: > - remove forward declarations > - add const qualifier for menu items > - fix the possible unaligned access for directory info access > - split into three commit 1)add boot option 2) delete boot option 3)chan= ge boot order > This commit is 1)add boot option. > - fix file name buffer allocation size, it should be EFI_BOOTMENU_FILE_P= ATH_MAX * sizeof(u16) > - fix wrong size checking for file selection > > Chanes in v4: > - UEFI boot option maintenance menu is integrated into bootmenu > - display the simplified volume name(e.g. usb0:1, nvme1:2) for the > volume selection > - instead of extending lib/efi_loader/efi_bootmgr.c, newly create > lib/efi_loader/efi_bootmenu_maintenance.c and implement boot > variable maintenance into it. > > Changes in RFC v3: > not included in v3 series > > Changes in RFC v2: > - enable utf8 user input for boot option name > - create lib/efi_loader/efi_console.c::efi_console_get_u16_string() for > utf8 user input handling > - use u16_strlcat instead of u16_strcat > - remove the EFI_CALLs, and newly create or expose the following > xxx_int() functions. > efi_locate_handle_buffer_int(), efi_open_volume_int(), > efi_file_open_int(), efi_file_close_int(), efi_file_read_int() and > efi_file_setpos_int(). > Note that EFI_CALLs still exist for EFI_DEVICE_PATH_TO_TEXT_PROTOCOL > and EFI_SIMPLE_TEXT_INPUT/OUTPUT_PROTOCOL > - use efi_search_protocol() instead of calling locate_protocol() to get > the device_path_to_text_protocol interface. > - remove unnecessary puts(ANSI_CLEAR_LINE), this patch is still depends = on > puts(ANSI_CLEAR_CONSOLE) > - skip SetVariable() if the bootorder is not changed > > cmd/Kconfig | 7 + > cmd/Makefile | 1 + > cmd/eficonfig.c | 1270 +++++++++++++++++++++++++++++++++ > include/efi_config.h | 91 +++ > include/efi_loader.h | 40 ++ > lib/efi_loader/efi_boottime.c | 52 +- > lib/efi_loader/efi_console.c | 78 ++ > lib/efi_loader/efi_disk.c | 11 + > lib/efi_loader/efi_file.c | 75 +- > 9 files changed, 1578 insertions(+), 47 deletions(-) > create mode 100644 cmd/eficonfig.c > create mode 100644 include/efi_config.h > > diff --git a/cmd/Kconfig b/cmd/Kconfig > index 09193b61b9..bb7f1d0463 100644 > --- a/cmd/Kconfig > +++ b/cmd/Kconfig > @@ -1870,6 +1870,13 @@ config CMD_EFIDEBUG > particularly for managing boot parameters as well as examining > various EFI status for debugging. > > +config CMD_EFICONFIG > + bool "eficonfig - provide menu-driven uefi variables maintenance inter= face" > + depends on CMD_BOOTEFI_BOOTMGR > + help > + Enable the 'eficonfig' command which provides the menu-driven UEFI > + variable maintenance interface. > + > config CMD_EXCEPTION > bool "exception - raise exception" > depends on ARM || RISCV || SANDBOX || X86 > diff --git a/cmd/Makefile b/cmd/Makefile > index 5e43a1e022..0afa687e94 100644 > --- a/cmd/Makefile > +++ b/cmd/Makefile > @@ -63,6 +63,7 @@ obj-$(CONFIG_ENV_IS_IN_EEPROM) +=3D eeprom.o > obj-$(CONFIG_CMD_EEPROM) +=3D eeprom.o > obj-$(CONFIG_EFI) +=3D efi.o > obj-$(CONFIG_CMD_EFIDEBUG) +=3D efidebug.o > +obj-$(CONFIG_CMD_EFICONFIG) +=3D eficonfig.o > obj-$(CONFIG_CMD_ELF) +=3D elf.o > obj-$(CONFIG_CMD_EROFS) +=3D erofs.o > obj-$(CONFIG_HUSH_PARSER) +=3D exit.o > diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c > new file mode 100644 > index 0000000000..20747db115 > --- /dev/null > +++ b/cmd/eficonfig.c > @@ -0,0 +1,1270 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Menu-driven UEFI Variable maintenance > + * > + * Copyright (c) 2022 Masahisa Kojima, Linaro Limited > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +static struct efi_simple_text_input_protocol *cin; > +static struct efi_simple_text_output_protocol *cout; > + > +#define EFICONFIG_DESCRIPTION_MAX 32 > +#define EFICONFIG_OPTIONAL_DATA_MAX 64 > +#define EFICONFIG_EDIT_BOOT_OPTION_MENU_ENTRY 5 > + > +#define EFICONFIG_AUTO_GENERATED_ENTRY_GUID \ > + EFI_GUID(0x38c1acc1, 0x9fc0, 0x41f0, \ > + 0xb9, 0x01, 0xfa, 0x74, 0xd6, 0xd6, 0xe4, 0xde) > +const efi_guid_t efi_guid_bootmenu_auto_generated =3D > + EFICONFIG_AUTO_GENERATED_ENTRY_GUID; > + > +struct eficonfig_boot_selection_data { > + u16 bootorder_index; > + int *selected; > +}; > + > +struct eficonfig_filepath_info { > + u16 *name; > + struct list_head list; > +}; > + > +/** > + * struct eficonfig_boot_option - structure to be used for uefi boot op= tion update > + * > + * @file_info: user selected file info > + * @boot_index: index of the uefi BootOrder variable > + * @description: pointer to the description string > + * @optional_data: pointer to the optional_data > + * @edit_completed: flag indicates edit complete > + */ > +struct eficonfig_boot_option { > + struct eficonfig_select_file_info file_info; > + unsigned int boot_index; > + u16 *description; > + u16 *optional_data; > + bool edit_completed; > +}; > + > +struct eficonfig_volume_entry_data { > + struct eficonfig_select_file_info *file_info; > + struct efi_simple_file_system_protocol *v; > + struct efi_device_path *dp; > +}; > + > +struct eficonfig_file_entry_data { > + struct eficonfig_select_file_info *file_info; > + bool is_directory; > + u16 *file_name; > +}; > + > +/** > + * eficonfig_print_msg() - print message > + * > + * display the message to the user, user proceeds the screen > + * with ENTER key press. > + * > + * @items: pointer to the structure of each menu entry > + * @count: the number of menu entry > + * @menu_header: pointer to the menu header string > + * Return: status code > + */ > +void eficonfig_print_msg(char *msg) None of you patches adds this function to an include. So it should be static. > +{ > + char c; > + > + puts(ANSI_CURSOR_HIDE); > + puts(ANSI_CLEAR_CONSOLE); > + printf(ANSI_CURSOR_POSITION, 3, 4); > + printf(msg); > + > + /* Flush input */ > + while (tstc()) > + getchar(); > + > + printf("\n\n Press ENTER to continue"); We want to minimize the size of the U-Boot binary. Isn't the following single function call good enough? printf(ANSI_CURSOR_HIDE ANSI_CLEAR_CONSOLE ANSI_CURSOR_POSITION msg "\n\n Press ENTER to continue", 3, 4); > + while (1) { > + while (!tstc()) { > + WATCHDOG_RESET(); If there is no user to hit a key, why should be stop the watchdog reset? > + mdelay(10); There is no benefit of calling mdelay here. > + } > + c =3D getchar(); > + if (c =3D=3D '\r') > + break; > + } > +} We should replace the whole loop by: getchar(); > + Please, provide Sphinx style function descriptions for all functions. > +static void eficonfig_print_entry(void *data) > +{ > + struct eficonfig_entry *entry =3D data; > + int reverse =3D (entry->efi_menu->active =3D=3D entry->num); > + > + /* TODO: support scroll or page for many entries */ > + > + /* > + * Move cursor to line where the entry will be drawn (entry->count) > + * First 3 lines(menu header) + one empty line > + */ > + printf(ANSI_CURSOR_POSITION " ", entry->num + 4, 1); > + > + if (reverse) > + puts(ANSI_COLOR_REVERSE); > + > + printf("%s", entry->title); > + > + if (reverse) > + puts(ANSI_COLOR_RESET); > +} > + > +static void eficonfig_display_statusline(struct menu *m) > +{ > + struct eficonfig_entry *entry; > + > + if (menu_default_choice(m, (void *)&entry) < 0) > + return; > + > + printf(ANSI_CURSOR_POSITION > + "\n%s\n" > + ANSI_CURSOR_POSITION > + "\n" > + " Press UP/DOWN to move, ENTER to select, ESC/CTRL+C to quit", > + 0, 1, entry->efi_menu->menu_header, entry->efi_menu->count + 5,= 1); > +} > + > +static char *eficonfig_choice_entry(void *data) > +{ > + int i; > + int esc =3D 0; > + struct eficonfig_entry *iter; > + enum bootmenu_key key =3D KEY_NONE; > + struct efimenu *efi_menu =3D data; > + > + while (1) { > + bootmenu_loop((struct bootmenu_data *)efi_menu, &key, &esc); > + > + switch (key) { > + case KEY_UP: > + if (efi_menu->active > 0) > + --efi_menu->active; > + /* no menu key selected, regenerate menu */ > + return NULL; > + case KEY_DOWN: > + if (efi_menu->active < efi_menu->count - 1) > + ++efi_menu->active; > + /* no menu key selected, regenerate menu */ > + return NULL; > + case KEY_SELECT: > + iter =3D efi_menu->first; > + for (i =3D 0; i < efi_menu->active; ++i) > + iter =3D iter->next; > + return iter->key; > + case KEY_QUIT: > + /* Quit by choosing the last entry */ > + iter =3D efi_menu->first; > + while (iter->next) > + iter =3D iter->next; > + return iter->key; > + default: > + break; > + } > + } > + > + /* never happens */ > + debug("eficonfig: this should not happen"); This comment and message is wrong. key =3D KEY_NONE is an expected value for key. > + return NULL; > +} > + > +static void eficonfig_destroy(struct efimenu *efi_menu) > +{ > + struct eficonfig_entry *next; > + struct eficonfig_entry *iter =3D efi_menu->first; > + > + while (iter) { > + next =3D iter->next; > + free(iter); > + iter =3D next; > + } > + free(efi_menu->menu_header); > + free(efi_menu); > +} > + > +/** > + * eficonfig_process_quit() - callback function for "Quit" entry > + * > + * @data: pointer to the data > + * Return: status code > + */ > +efi_status_t eficonfig_process_quit(void *data) > +{ > + return EFI_ABORTED; > +} > + > +/** > + * eficonfig_process_common() - main handler for uefi menu %s/uefi/UEFI/ > + * > + * Construct the structures required to show the menu, then handle > + * the user input intracting with u-boot menu functions. > + * > + * @items: pointer to the structure of each menu entry > + * @count: the number of menu entry > + * @menu_header: pointer to the menu header string > + * Return: status code > + */ > +efi_status_t eficonfig_process_common(const struct eficonfig_item *item= s, int count, > + char *menu_header) > +{ > + u32 i; > + efi_status_t ret; > + struct menu *menu; > + void *choice =3D NULL; > + struct eficonfig_entry *entry; > + struct efimenu *efi_menu; > + struct eficonfig_entry *iter =3D NULL; > + > + if (count > EFICONFIG_ENTRY_NUM_MAX) > + return EFI_OUT_OF_RESOURCES; > + > + efi_menu =3D calloc(1, sizeof(struct efimenu)); > + if (!efi_menu) > + return EFI_OUT_OF_RESOURCES; > + > + efi_menu->delay =3D -1; > + efi_menu->active =3D 0; > + efi_menu->first =3D NULL; > + > + if (menu_header) { > + efi_menu->menu_header =3D strdup(menu_header); > + if (!efi_menu->menu_header) { > + free(efi_menu); > + return EFI_OUT_OF_RESOURCES; > + } > + } > + > + for (i =3D 0; i < count; i++) { > + entry =3D calloc(1, sizeof(struct eficonfig_entry)); > + if (!entry) { > + ret =3D EFI_LOAD_ERROR; > + goto out; > + } > + > + entry->num =3D i; > + entry->title =3D items->title; > + sprintf(entry->key, "%d", i); > + entry->efi_menu =3D efi_menu; > + entry->func =3D items->func; > + entry->data =3D items->data; > + entry->next =3D NULL; > + > + if (!iter) > + efi_menu->first =3D entry; > + else > + iter->next =3D entry; > + > + iter =3D entry; > + items++; > + } > + efi_menu->count =3D count; > + > + menu =3D menu_create(NULL, 0, 1, eficonfig_display_statusline, > + eficonfig_print_entry, eficonfig_choice_entry, > + efi_menu); > + if (!menu) { > + ret =3D EFI_INVALID_PARAMETER; > + goto out; > + } > + > + for (entry =3D efi_menu->first; entry; entry =3D entry->next) { > + if (!menu_item_add(menu, entry->key, entry)) { > + ret =3D EFI_INVALID_PARAMETER; > + goto out; > + } > + } > + > + menu_default_set(menu, efi_menu->first->key); > + > + puts(ANSI_CURSOR_HIDE); > + puts(ANSI_CLEAR_CONSOLE); > + printf(ANSI_CURSOR_POSITION, 1, 1); Please, use a single function call. > + > + if (menu_get_choice(menu, &choice)) { > + entry =3D choice; > + if (entry->func) > + ret =3D entry->func(entry->data); > + } > + > +out: > + menu_destroy(menu); > + eficonfig_destroy(efi_menu); > + > + puts(ANSI_CLEAR_CONSOLE); > + printf(ANSI_CURSOR_POSITION, 1, 1); > + puts(ANSI_CURSOR_SHOW); ditto > + > + return ret; > +} > + > +static efi_status_t eficonfig_volume_selected(void *data) > +{ > + struct eficonfig_volume_entry_data *info =3D data; > + > + if (info) { > + info->file_info->current_volume =3D info->v; > + info->file_info->dp_volume =3D info->dp; > + } > + > + return EFI_SUCCESS; > +} > + > +static efi_status_t eficonfig_file_selected(void *data) > +{ > + struct eficonfig_file_entry_data *info =3D data; > + > + if (!info) > + return EFI_INVALID_PARAMETER; > + > + if (u16_strcmp(info->file_name, u".") =3D=3D 0 && > + u16_strlen(info->file_name) =3D=3D 1) { > + /* stay current path */ > + } else if (u16_strcmp(info->file_name, u"..") =3D=3D 0 && > + u16_strlen(info->file_name) =3D=3D 2) { > + struct eficonfig_filepath_info *iter; > + struct list_head *pos, *n; > + int is_last; > + > + memset(info->file_info->current_path, 0, EFICONFIG_FILE_PATH_BUF_SIZE= ); > + list_for_each_safe(pos, n, &info->file_info->filepath_list) { > + iter =3D list_entry(pos, struct eficonfig_filepath_info, list); > + > + is_last =3D list_is_last(&iter->list, &info->file_info->filepath_lis= t); > + if (is_last) { > + list_del(&iter->list); > + free(iter->name); > + free(iter); > + break; > + } > + u16_strlcat(info->file_info->current_path, iter->name, > + EFICONFIG_FILE_PATH_MAX); > + u16_strlcat(info->file_info->current_path, u"\\", > + EFICONFIG_FILE_PATH_MAX); > + } > + } else { > + size_t new_len; > + struct eficonfig_filepath_info *filepath; > + > + new_len =3D u16_strlen(info->file_info->current_path) + > + u16_strlen(info->file_name); > + if (new_len >=3D EFICONFIG_FILE_PATH_MAX) { > + eficonfig_print_msg("File path is too long!"); > + return EFI_INVALID_PARAMETER; > + } > + u16_strlcat(info->file_info->current_path, info->file_name, > + EFICONFIG_FILE_PATH_MAX); > + > + filepath =3D calloc(1, sizeof(struct eficonfig_filepath_info)); > + if (!filepath) > + return EFI_OUT_OF_RESOURCES; > + > + filepath->name =3D u16_strdup(info->file_name); > + if (!filepath->name) { > + free(filepath); > + return EFI_OUT_OF_RESOURCES; > + } > + list_add_tail(&filepath->list, &info->file_info->filepath_list); > + > + if (info->is_directory) { > + /* > + * Remainig buffer should have enough space to contain u"\\" and > + * at least one character for file name > + */ > + if (new_len + 2 >=3D EFICONFIG_FILE_PATH_MAX) { > + eficonfig_print_msg("Directory path is too long!"); > + return EFI_INVALID_PARAMETER; > + } > + u16_strlcat(info->file_info->current_path, u"\\", > + EFICONFIG_FILE_PATH_MAX); > + } else { > + info->file_info->file_selected =3D true; > + } > + } > + return EFI_SUCCESS; > +} > + > +static efi_status_t eficonfig_select_volume(struct eficonfig_select_fil= e_info *file_info) > +{ > + u32 i; > + efi_status_t ret; > + efi_uintn_t count; > + struct efi_handler *handler; > + struct efi_device_path *device_path; > + efi_handle_t *volume_handles =3D NULL; > + struct eficonfig_item *menu_item, *iter; > + struct efi_simple_file_system_protocol *v; > + > + ret =3D efi_locate_handle_buffer_int(BY_PROTOCOL, &efi_simple_file_sys= tem_protocol_guid, > + NULL, &count, (efi_handle_t **)&volume_handles); > + if (ret !=3D EFI_SUCCESS) { > + eficonfig_print_msg("No block device found!"); > + return ret; > + } > + > + menu_item =3D calloc(count + 1, sizeof(struct eficonfig_item)); > + if (!menu_item) { > + efi_free_pool(volume_handles); > + return EFI_OUT_OF_RESOURCES; > + } > + > + iter =3D menu_item; > + for (i =3D 0; i < count; i++) { > + char *devname; > + struct efi_block_io *block_io; > + struct eficonfig_volume_entry_data *info; > + > + ret =3D efi_search_protocol(volume_handles[i], > + &efi_simple_file_system_protocol_guid, &handler); > + if (ret !=3D EFI_SUCCESS) > + continue; > + ret =3D efi_protocol_open(handler, (void **)&v, efi_root, NULL, > + EFI_OPEN_PROTOCOL_GET_PROTOCOL); > + if (ret !=3D EFI_SUCCESS) > + continue; > + > + ret =3D efi_search_protocol(volume_handles[i], &efi_guid_device_path,= &handler); > + if (ret !=3D EFI_SUCCESS) > + continue; > + ret =3D efi_protocol_open(handler, (void **)&device_path, > + efi_root, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL); > + if (ret !=3D EFI_SUCCESS) > + continue; > + > + ret =3D efi_search_protocol(volume_handles[i], &efi_block_io_guid, &h= andler); > + if (ret !=3D EFI_SUCCESS) > + continue; > + ret =3D efi_protocol_open(handler, (void **)&block_io, > + efi_root, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL); > + if (ret !=3D EFI_SUCCESS) > + continue; > + > + info =3D calloc(1, sizeof(struct eficonfig_volume_entry_data)); > + if (!info) { > + ret =3D EFI_OUT_OF_RESOURCES; > + goto out; > + } > + > + devname =3D calloc(1, BOOTMENU_DEVICE_NAME_MAX); > + if (!devname) { > + free(info); > + ret =3D EFI_OUT_OF_RESOURCES; > + goto out; > + } > + efi_disk_get_device_name(block_io, devname, BOOTMENU_DEVICE_NAME_MAX)= ; > + > + info->v =3D v; > + info->dp =3D device_path; > + info->file_info =3D file_info; > + iter->title =3D devname; > + iter->func =3D eficonfig_volume_selected; > + iter->data =3D info; > + iter++; > + } > + > + iter->title =3D strdup("Quit"); > + iter->func =3D eficonfig_process_quit; > + iter->data =3D NULL; > + count +=3D 1; > + > + ret =3D eficonfig_process_common(menu_item, count, " ** Select Volume= **"); > + > +out: > + iter =3D menu_item; > + for (i =3D 0; i < count; i++, iter++) { > + free(iter->data); > + free(iter->title); > + } > + > + free(menu_item); > + > + efi_free_pool(volume_handles); > + > + return ret; > +} > + > +static efi_status_t eficonfig_select_file(struct eficonfig_select_file_= info *file_info, > + struct efi_file_handle *root) > +{ > + u32 i; > + u32 count =3D 0; > + efi_uintn_t len; > + efi_status_t ret; > + struct efi_file_handle *f; > + struct efi_file_info *buf; > + struct eficonfig_item *menu_item, *iter; > + > + buf =3D calloc(1, sizeof(struct efi_file_info) + EFICONFIG_FILE_PATH_B= UF_SIZE); > + if (!buf) > + return EFI_OUT_OF_RESOURCES; > + > + while (!file_info->file_selected) { > + count =3D 0; > + > + ret =3D efi_file_open_int(root, &f, file_info->current_path, EFI_FILE= _MODE_READ, 0); > + if (ret !=3D EFI_SUCCESS) { > + /* TODO: need to fileter out non-FAT partition? */ %s/fileter/filter/ > + eficonfig_print_msg("Reading volume failed! Please make sure the sel= ected\n" > + " volume is FAT12/FAT16/FAT32 partition."); Who cares if the file is on FAT, ext4, or any other file system else if U-Boot can read it? > + ret =3D EFI_ABORTED; > + goto out; > + } > + > + /* calculate directory information total count */ /* Count the number of directory entries */ > + for (;;) { > + len =3D sizeof(struct efi_file_info) + EFICONFIG_FILE_PATH_BUF_SIZE; > + ret =3D efi_file_read_int(f, &len, buf); > + if (ret !=3D EFI_SUCCESS || len =3D=3D 0) > + break; > + > + count++; > + } > + > + menu_item =3D calloc(count + 1, sizeof(struct eficonfig_item)); > + if (!menu_item) { > + efi_file_close_int(f); > + ret =3D EFI_OUT_OF_RESOURCES; > + goto out; > + } > + > + /* read directory and construct menu structure */ > + efi_file_setpos_int(f, 0); > + iter =3D menu_item; > + for (i =3D 0; i < count; i++) { > + char *name, *p; > + int name_len; > + struct eficonfig_file_entry_data *info; > + > + len =3D sizeof(struct efi_file_info) + EFICONFIG_FILE_PATH_BUF_SIZE; > + ret =3D efi_file_read_int(f, &len, buf); > + if (ret !=3D EFI_SUCCESS || len =3D=3D 0) > + goto err; > + > + info =3D calloc(1, sizeof(struct eficonfig_file_entry_data)); > + if (!info) { > + ret =3D EFI_OUT_OF_RESOURCES; > + goto err; > + } > + > + if (buf->attribute & EFI_FILE_DIRECTORY) { Should we filter out '.' and '..'? > + /* append u'/' at the end of directory name */ > + name_len =3D utf16_utf8_strlen(buf->file_name) + 2; > + name =3D calloc(1, name_len); > + if (!name) { > + ret =3D EFI_OUT_OF_RESOURCES; > + goto err; > + } > + p =3D name; > + utf16_utf8_strcpy(&p, buf->file_name); > + name[u16_strlen(buf->file_name)] =3D u'/'; > + > + info->is_directory =3D true; > + } else { > + name_len =3D utf16_utf8_strlen(buf->file_name) + 1; > + name =3D calloc(1, name_len); > + if (!name) { > + ret =3D EFI_OUT_OF_RESOURCES; > + goto err; > + } > + p =3D name; > + utf16_utf8_strcpy(&p, buf->file_name); > + } > + > + info->file_name =3D u16_strdup(buf->file_name); > + info->file_info =3D file_info; > + iter->title =3D name; > + iter->func =3D eficonfig_file_selected; > + iter->data =3D info; > + iter++; > + } > + > + /* add "Quit" entry */ > + iter->title =3D "Quit"; > + iter->func =3D eficonfig_process_quit; > + iter->data =3D NULL; > + count +=3D 1; We want to reduce code size. Start the function with unsigned int count =3D 1; > + > + ret =3D eficonfig_process_common(menu_item, count, " ** Select File = **"); > +err: > + efi_file_close_int(f); > + iter =3D menu_item; > + for (i =3D 0; i < count - 1; i++, iter++) { > + free(((struct eficonfig_file_entry_data *)(iter->data))->file_name); > + free(iter->title); > + free(iter->data); > + } > + > + free(menu_item); > + > + if (ret !=3D EFI_SUCCESS) > + break; > + } > + > +out: > + free(buf); > + return ret; > +} > + > +static efi_status_t eficonfig_boot_add_enter_description(void *data) > +{ > + u16 *tmp; > + efi_status_t ret; > + struct eficonfig_boot_option *bo =3D data; > + > + printf(ANSI_CLEAR_CONSOLE > + ANSI_CURSOR_POSITION > + "\n ** Edit Description **\n" > + "\n" > + " enter description: " > + ANSI_CURSOR_POSITION > + " Press ENTER to complete, ESC/CTRL+C to quit", > + 0, 1, 8, 1); > + > + tmp =3D calloc(1, EFICONFIG_DESCRIPTION_MAX * sizeof(u16)); > + if (!tmp) > + return EFI_OUT_OF_RESOURCES; > + > + ret =3D efi_console_get_u16_string(cin, cout, tmp, > + EFICONFIG_DESCRIPTION_MAX, NULL, 4, 22); > + if (ret =3D=3D EFI_SUCCESS) > + u16_strcpy(bo->description, tmp); > + > + free(tmp); > + > + /* to stay the parent menu */ > + ret =3D (ret =3D=3D EFI_ABORTED) ? EFI_NOT_READY : ret; > + > + return ret; > +} > + > +static efi_status_t eficonfig_boot_add_optional_data(void *data) > +{ > + u16 *tmp; > + efi_status_t ret; > + struct eficonfig_boot_option *bo =3D data; > + > + printf(ANSI_CLEAR_CONSOLE > + ANSI_CURSOR_POSITION > + "\n ** Edit Optional Data **\n" > + "\n" > + " enter optional data:" > + ANSI_CURSOR_POSITION > + " Press ENTER to complete, ESC/CTRL+C to quit", > + 0, 1, 8, 1); > + > + tmp =3D calloc(1, EFICONFIG_OPTIONAL_DATA_MAX * sizeof(u16)); > + ret =3D efi_console_get_u16_string(cin, cout, tmp, > + EFICONFIG_OPTIONAL_DATA_MAX, NULL, 4, 24); > + > + if (ret =3D=3D EFI_SUCCESS) > + u16_strcpy(bo->optional_data, tmp); > + > + free(tmp); > + > + /* to stay the parent menu */ > + ret =3D (ret =3D=3D EFI_ABORTED) ? EFI_NOT_READY : ret; > + > + return ret; > +} > + > +static efi_status_t eficonfig_boot_edit_save(void *data) > +{ > + struct eficonfig_boot_option *bo =3D data; > + > + if (u16_strlen(bo->description) =3D=3D 0) { > + eficonfig_print_msg("Boot Description is empty!"); > + bo->edit_completed =3D false; > + return EFI_NOT_READY; > + } > + if (u16_strlen(bo->file_info.current_path) =3D=3D 0) { > + eficonfig_print_msg("File is not selected!"); > + bo->edit_completed =3D false; > + return EFI_NOT_READY; > + } > + > + bo->edit_completed =3D true; > + > + return EFI_SUCCESS; > +} > + > +static efi_status_t eficonfig_boot_edit_quit(void *data) > +{ > + return EFI_ABORTED; > +} > + > +/** > + * eficonfig_select_file_handler() - handle user file selection > + * > + * @data: pointer to the data > + * Return: status code > + */ > +efi_status_t eficonfig_select_file_handler(void *data) > +{ > + size_t len; > + efi_status_t ret; > + struct list_head *pos, *n; > + struct efi_file_handle *root; > + struct eficonfig_filepath_info *item; > + struct eficonfig_select_file_info *file_info =3D data; > + struct eficonfig_select_file_info *tmp =3D NULL; > + > + tmp =3D calloc(1, sizeof(struct eficonfig_select_file_info)); > + if (!tmp) > + return EFI_OUT_OF_RESOURCES; > + > + tmp->current_path =3D calloc(1, EFICONFIG_FILE_PATH_BUF_SIZE); > + if (!tmp->current_path) { > + free(tmp); > + return EFI_OUT_OF_RESOURCES; > + } > + INIT_LIST_HEAD(&tmp->filepath_list); > + > + while (!tmp->file_selected) { > + tmp->current_volume =3D NULL; > + memset(tmp->current_path, 0, EFICONFIG_FILE_PATH_BUF_SIZE); > + > + ret =3D eficonfig_select_volume(tmp); > + if (ret !=3D EFI_SUCCESS) > + goto out; > + > + if (!tmp->current_volume) > + return EFI_INVALID_PARAMETER; > + > + ret =3D efi_open_volume_int(tmp->current_volume, &root); > + if (ret !=3D EFI_SUCCESS) > + goto out; > + > + ret =3D eficonfig_select_file(tmp, root); > + if (ret =3D=3D EFI_ABORTED) > + continue; > + if (ret !=3D EFI_SUCCESS) > + goto out; > + } > + > +out: > + if (ret =3D=3D EFI_SUCCESS) { > + len =3D u16_strlen(tmp->current_path); > + len =3D (len >=3D EFICONFIG_FILE_PATH_MAX) ? (EFICONFIG_FILE_PATH_MAX= - 1) : len; > + memcpy(file_info->current_path, tmp->current_path, len * sizeof(u16))= ; > + file_info->current_path[len] =3D u'\0'; > + file_info->current_volume =3D tmp->current_volume; > + file_info->dp_volume =3D tmp->dp_volume; > + } > + > + list_for_each_safe(pos, n, &tmp->filepath_list) { > + item =3D list_entry(pos, struct eficonfig_filepath_info, list); > + list_del(&item->list); > + free(item->name); > + free(item); > + } > + free(tmp->current_path); > + free(tmp); > + > + /* to stay the parent menu */ > + ret =3D (ret =3D=3D EFI_ABORTED) ? EFI_NOT_READY : ret; > + > + return ret; > +} > + > +efi_status_t eficonfig_get_unused_bootoption(u16 *buf, efi_uintn_t buf_= size, > + unsigned int *index) > +{ > + u32 i; > + efi_status_t ret; > + efi_uintn_t size; > + > + if (buf_size < u16_strsize(u"Boot####")) > + return EFI_BUFFER_TOO_SMALL; > + > + for (i =3D 0; i <=3D 0xFFFF; i++) { > + size =3D 0; > + efi_create_indexed_name(buf, buf_size, "Boot", i); > + ret =3D efi_get_variable_int(buf, &efi_global_variable_guid, > + NULL, &size, NULL, NULL); > + if (ret =3D=3D EFI_BUFFER_TOO_SMALL) > + continue; > + else > + break; > + } > + > + if (i > 0xFFFF) > + return EFI_OUT_OF_RESOURCES; > + > + *index =3D i; > + > + return EFI_SUCCESS; > +} > + > +static efi_status_t eficonfig_set_boot_option(u16 *varname, struct efi_= device_path *dp, > + u16 *label, char *optional_data) > +{ > + void *p =3D NULL; > + efi_status_t ret; > + efi_uintn_t size; > + struct efi_load_option lo; > + > + lo.file_path =3D dp; > + lo.file_path_length =3D efi_dp_size(dp) + sizeof(END); > + lo.attributes =3D LOAD_OPTION_ACTIVE; > + lo.optional_data =3D optional_data; > + lo.label =3D label; > + > + size =3D efi_serialize_load_option(&lo, (u8 **)&p); > + if (!size) > + return EFI_INVALID_PARAMETER; > + > + ret =3D efi_set_variable_int(varname, &efi_global_variable_guid, > + EFI_VARIABLE_NON_VOLATILE | > + EFI_VARIABLE_BOOTSERVICE_ACCESS | > + EFI_VARIABLE_RUNTIME_ACCESS, > + size, p, false); > + free(p); > + > + return ret; > +} > + > +efi_status_t eficonfig_append_bootorder(u16 index) > +{ > + u16 *bootorder; > + efi_status_t ret; > + u16 *new_bootorder =3D NULL; > + efi_uintn_t last, size, new_size; > + > + /* append new boot option */ > + bootorder =3D efi_get_var(u"BootOrder", &efi_global_variable_guid, &si= ze); > + last =3D size / sizeof(u16); > + new_size =3D size + sizeof(u16); > + new_bootorder =3D calloc(1, new_size); > + if (!new_bootorder) { > + ret =3D EFI_OUT_OF_RESOURCES; > + goto out; > + } > + memcpy(new_bootorder, bootorder, size); > + new_bootorder[last] =3D index; > + > + ret =3D efi_set_variable_int(u"BootOrder", &efi_global_variable_guid, > + EFI_VARIABLE_NON_VOLATILE | > + EFI_VARIABLE_BOOTSERVICE_ACCESS | > + EFI_VARIABLE_RUNTIME_ACCESS, > + new_size, new_bootorder, false); > + if (ret !=3D EFI_SUCCESS) > + goto out; > + > +out: > + free(bootorder); > + free(new_bootorder); > + > + return ret; > +} > + > +static efi_status_t eficonfig_convert_dp_to_device_name(struct efi_devi= ce_path *dp, > + char *buf, int size) This function seems to be generic enough to live in lib/efi_loader/ as a library function. > +{ > + u32 i; > + efi_status_t ret; > + struct efi_handler *handler; > + efi_uintn_t count, dp_size, iter_dp_size; > + efi_handle_t *volume_handles =3D NULL; > + struct efi_device_path *iter_dp; > + > + if (!dp || !buf || !size) > + return EFI_INVALID_PARAMETER; > + > + ret =3D efi_locate_handle_buffer_int(BY_PROTOCOL, &efi_simple_file_sys= tem_protocol_guid, > + NULL, &count, (efi_handle_t **)&volume_handles); Please, use efi_dp_find_obj() to retrieve the handle. > + if (ret !=3D EFI_SUCCESS) > + return ret; > + > + dp_size =3D efi_dp_size(dp); > + > + for (i =3D 0; i < count; i++) { > + struct efi_block_io *block_io; > + > + ret =3D efi_search_protocol(volume_handles[i], > + &efi_simple_file_system_protocol_guid, &handler); > + if (ret !=3D EFI_SUCCESS) > + continue; > + > + ret =3D efi_search_protocol(volume_handles[i], &efi_guid_device_path,= &handler); > + if (ret !=3D EFI_SUCCESS) > + continue; > + ret =3D efi_protocol_open(handler, (void **)&iter_dp, > + efi_root, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL); > + if (ret !=3D EFI_SUCCESS) > + continue; > + > + ret =3D efi_search_protocol(volume_handles[i], &efi_block_io_guid, &h= andler); > + if (ret !=3D EFI_SUCCESS) > + continue; > + ret =3D efi_protocol_open(handler, (void **)&block_io, > + efi_root, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL); > + if (ret !=3D EFI_SUCCESS) > + continue; > + > + iter_dp_size =3D efi_dp_size(iter_dp); > + if (dp_size =3D=3D iter_dp_size) { > + if (memcmp(dp, iter_dp, dp_size) =3D=3D 0) { > + efi_disk_get_device_name(block_io, buf, size); > + return EFI_SUCCESS; > + } > + } > + } > + > + return EFI_NOT_FOUND; > +} > + > +static efi_status_t create_boot_option_entry(void *data, char *title, u= 16 *val, > + eficonfig_entry_func func, struct eficonfig_item *iter) > +{ > + u32 len; > + char *p; > + > + len =3D strlen(title) + 1; > + if (val) > + len +=3D utf16_utf8_strlen(val); > + iter->title =3D calloc(1, len); > + if (!iter->title) > + return EFI_OUT_OF_RESOURCES; > + > + strcpy(iter->title, title); > + if (val) { > + p =3D iter->title + strlen(title); > + utf16_utf8_strcpy(&p, val); > + } > + > + iter->func =3D func; > + iter->data =3D data; > + > + return EFI_SUCCESS; > +} > + > +/** > + * eficonfig_show_boot_option() - prepare menu entry for editing boot o= ption > + * > + * Construct the structures to create edit boot option menu > + * > + * @bo: pointer to the boot option > + * @header_str: pointer to the header string > + * Return: status code > + */ > +static efi_status_t eficonfig_show_boot_option(struct eficonfig_boot_op= tion *bo, > + char *header_str) > +{ > + u32 i, len; > + u16 *file_name, *p; > + struct eficonfig_item *menu_item, *iter; > + efi_status_t ret =3D EFI_OUT_OF_RESOURCES; > + char devname[BOOTMENU_DEVICE_NAME_MAX] =3D {0}; > + > + menu_item =3D calloc(EFICONFIG_EDIT_BOOT_OPTION_MENU_ENTRY, sizeof(str= uct eficonfig_item)); > + if (!menu_item) > + goto out; > + > + iter =3D menu_item; > + > + ret =3D create_boot_option_entry(bo, "Description: ", bo->description, > + eficonfig_boot_add_enter_description, iter++); > + if (ret !=3D EFI_SUCCESS) > + goto out; > + > + /* file name */ > + eficonfig_convert_dp_to_device_name(bo->file_info.dp_volume, devname, > + BOOTMENU_DEVICE_NAME_MAX); > + /* > + * efi_convert_device_path_to_text() automatically adds u'/' at the be= ginning of > + * file name, add manually u'/' at the last of device name if there is= no u'/' There is nothing manual here. %s/add manually u'\/' at the last of device name/append u'\/'/ > + * at bo->file_info.current_path[0]. > + */ > + if (bo->file_info.current_path[0] !=3D u'\0' && bo->file_info.current_= path[0] !=3D u'/') > + strlcat(devname, "/", BOOTMENU_DEVICE_NAME_MAX); > + > + len =3D strlen(devname); > + len +=3D utf16_utf8_strlen(bo->file_info.current_path) + 1; > + file_name =3D calloc(1, len * sizeof(u16)); > + if (!file_name) > + goto out; > + > + p =3D file_name; > + utf8_utf16_strcpy(&p, devname); > + u16_strlcat(file_name, bo->file_info.current_path, len); > + ret =3D create_boot_option_entry(&bo->file_info, "File: ", file_name, > + eficonfig_select_file_handler, iter++); > + if (ret !=3D EFI_SUCCESS) > + goto out; > + > + ret =3D create_boot_option_entry(bo, "Optional Data: ", bo->optional_d= ata, > + eficonfig_boot_add_optional_data, iter++); > + if (ret !=3D EFI_SUCCESS) > + goto out; > + > + ret =3D create_boot_option_entry(bo, "Save", NULL, > + eficonfig_boot_edit_save, iter++); > + if (ret !=3D EFI_SUCCESS) > + goto out; > + > + ret =3D create_boot_option_entry(bo, "Quit", NULL, > + eficonfig_boot_edit_quit, iter++); > + if (ret !=3D EFI_SUCCESS) > + goto out; > + > + ret =3D eficonfig_process_common(menu_item, EFICONFIG_EDIT_BOOT_OPTION= _MENU_ENTRY, > + header_str); > + > +out: > + iter =3D menu_item; > + for (i =3D 0; i < EFICONFIG_EDIT_BOOT_OPTION_MENU_ENTRY; i++) { > + free(iter->title); > + iter++; > + } > + > + free(file_name); > + free(menu_item); > + > + return ret; > +} > + > +/** > + * eficonfig_edit_boot_option() - prepare boot option structure for edi= ting > + * > + * Construct the boot option structure and copy the existing value > + * > + * @varname: pointer to the uefi variable name > + * @bo: pointer to the boot option > + * @description: pointer to the description > + * @optional_data: pointer to the optional_data > + * @optional_data_size: optional_data_size > + * @dp: pointer to the device path > + * @header_str: pointer to the header string > + * Return : status code > + */ > +static efi_status_t eficonfig_edit_boot_option(u16 *varname, struct efi= config_boot_option *bo, > + u16 *description, const u8 *optional_data, > + efi_uintn_t optional_data_size, > + struct efi_device_path *dp, > + char *header_str) > +{ > + size_t len; > + char *buf =3D NULL; > + efi_status_t ret; > + char *iter =3D NULL; > + char *tmp =3D NULL, *p; > + efi_uintn_t dp_size, fp_size; > + struct efi_device_path *device_dp =3D NULL; > + struct efi_device_path_file_path *fp; > + > + bo->file_info.current_path =3D calloc(1, EFICONFIG_FILE_PATH_BUF_SIZE)= ; > + if (!bo->file_info.current_path) { > + ret =3D EFI_OUT_OF_RESOURCES; > + goto out; > + } > + > + bo->description =3D calloc(1, EFICONFIG_DESCRIPTION_MAX * sizeof(u16))= ; > + if (!bo->description) { > + ret =3D EFI_OUT_OF_RESOURCES; > + goto out; > + } > + > + bo->optional_data =3D calloc(1, EFICONFIG_OPTIONAL_DATA_MAX * sizeof(u= 16)); > + if (!bo->optional_data) { > + ret =3D EFI_OUT_OF_RESOURCES; > + goto out; > + } > + > + if (description && u16_strlen(description) >=3D EFICONFIG_DESCRIPTION_= MAX) { > + ret =3D EFI_INVALID_PARAMETER; > + goto out; > + } > + if (description) > + u16_strcpy(bo->description, description); > + > + if (dp) { > + u16 *file_str; > + struct efi_device_path *file_dp =3D NULL; > + > + efi_dp_split_file_path(dp, &device_dp, &file_dp); > + bo->file_info.dp_volume =3D device_dp; > + file_str =3D efi_dp_str(file_dp); > + u16_strcpy(bo->file_info.current_path, file_str); > + efi_free_pool(file_dp); > + efi_free_pool(file_str); > + } > + > + if (optional_data && optional_data_size >=3D EFICONFIG_OPTIONAL_DATA_M= AX * sizeof(u16)) { > + ret =3D EFI_INVALID_PARAMETER; > + goto out; > + } > + if (optional_data && optional_data_size > 0) > + memcpy(bo->optional_data, optional_data, optional_data_size); > + > + while (1) { > + ret =3D eficonfig_show_boot_option(bo, header_str); > + if (ret =3D=3D EFI_SUCCESS && bo->edit_completed) > + break; > + if (ret =3D=3D EFI_NOT_READY) > + continue; > + if (ret !=3D EFI_SUCCESS) > + goto out; > + } > + > + dp_size =3D efi_dp_size(bo->file_info.dp_volume); > + fp_size =3D sizeof(struct efi_device_path) + > + ((u16_strlen(bo->file_info.current_path) + 1) * sizeof(u16)); > + buf =3D calloc(1, dp_size + fp_size + sizeof(END)); > + if (!buf) > + goto out; > + > + iter =3D buf; > + memcpy(iter, bo->file_info.dp_volume, dp_size); > + iter +=3D dp_size; > + > + fp =3D (struct efi_device_path_file_path *)iter; > + fp->dp.type =3D DEVICE_PATH_TYPE_MEDIA_DEVICE; > + fp->dp.sub_type =3D DEVICE_PATH_SUB_TYPE_FILE_PATH; > + fp->dp.length =3D (u16)fp_size; > + u16_strcpy(fp->str, bo->file_info.current_path); > + iter +=3D fp_size; > + *((struct efi_device_path *)iter) =3D END; > + > + len =3D utf16_utf8_strlen(bo->optional_data) + 1; > + tmp =3D calloc(1, len); > + if (!tmp) > + goto out; > + p =3D tmp; > + utf16_utf8_strncpy(&p, bo->optional_data, u16_strlen(bo->optional_data= )); > + > + ret =3D eficonfig_set_boot_option(varname, (struct efi_device_path *)b= uf, > + bo->description, tmp); > + if (ret !=3D EFI_SUCCESS) > + goto out; > + > +out: > + free(tmp); > + free(buf); > + free(bo->optional_data); > + free(bo->description); > + free(bo->file_info.current_path); > + efi_free_pool(device_dp); > + > + return ret; > +} > + > +static efi_status_t eficonfig_process_add_boot_option(void *data) > +{ > + u16 varname[9]; > + efi_status_t ret; > + struct eficonfig_boot_option *bo =3D NULL; > + > + bo =3D calloc(1, sizeof(struct eficonfig_boot_option)); > + if (!bo) > + return EFI_OUT_OF_RESOURCES; > + > + ret =3D eficonfig_get_unused_bootoption(varname, sizeof(varname), &bo-= >boot_index); > + if (ret !=3D EFI_SUCCESS) > + return ret; > + > + ret =3D eficonfig_edit_boot_option(varname, bo, NULL, NULL, 0, NULL, > + " ** Add Boot Option ** "); > + if (ret !=3D EFI_SUCCESS) > + goto out; > + > + ret =3D eficonfig_append_bootorder((u16)bo->boot_index); > + if (ret !=3D EFI_SUCCESS) > + goto out; > + > +out: > + free(bo); > + > + /* to stay the parent menu */ > + ret =3D (ret =3D=3D EFI_ABORTED) ? EFI_SUCCESS : ret; > + > + return ret; > +} > + > +static efi_status_t eficonfig_init(void) > +{ > + efi_status_t ret; > + static bool init; > + struct efi_handler *handler; > + > + if (!init) { > + ret =3D efi_search_protocol(efi_root, &efi_guid_text_input_protocol, = &handler); > + if (ret !=3D EFI_SUCCESS) > + return ret; > + > + ret =3D efi_protocol_open(handler, (void **)&cin, efi_root, NULL, > + EFI_OPEN_PROTOCOL_GET_PROTOCOL); > + if (ret !=3D EFI_SUCCESS) > + return ret; > + > + ret =3D efi_search_protocol(efi_root, &efi_guid_text_output_protocol,= &handler); > + if (ret !=3D EFI_SUCCESS) > + return ret; > + > + ret =3D efi_protocol_open(handler, (void **)&cout, efi_root, NULL, > + EFI_OPEN_PROTOCOL_GET_PROTOCOL); > + if (ret !=3D EFI_SUCCESS) > + return ret; > + } > + > + init =3D true; > + > + return ret; > +} > + > +static const struct eficonfig_item maintenance_menu_items[] =3D { > + {"Add Boot Option", eficonfig_process_add_boot_option}, > + {"Quit", eficonfig_process_quit}, > +}; > + > +int do_eficonfig(struct cmd_tbl *cmdtp, int flag, int argc, char *const= argv[]) > +{ > + efi_status_t ret; > + > + if (argc > 1) > + return CMD_RET_USAGE; > + > + ret =3D efi_init_obj_list(); We should add efi_init_obj_list() to init_sequence_r[] in a future patch to avoid calling it it in many different places. > + if (ret !=3D EFI_SUCCESS) { > + log_err("Error: Cannot initialize UEFI sub-system, r =3D %lu\n", > + ret & ~EFI_ERROR_MASK); > + > + return CMD_RET_FAILURE; > + } > + > + ret =3D eficonfig_init(); > + if (ret !=3D EFI_SUCCESS) > + return CMD_RET_FAILURE; > + > + while (1) { > + ret =3D eficonfig_process_common(maintenance_menu_items, > + ARRAY_SIZE(maintenance_menu_items), > + " ** UEFI Maintenance Menu **"); > + if (ret =3D=3D EFI_ABORTED) > + break; > + } > + > + return CMD_RET_SUCCESS; > +} > + > +U_BOOT_CMD( > + eficonfig, 1, 0, do_eficonfig, > + "provide menu-driven UEFI variable maintenance interface", > + "" > +); > diff --git a/include/efi_config.h b/include/efi_config.h > new file mode 100644 > index 0000000000..1b48e47c48 > --- /dev/null > +++ b/include/efi_config.h > @@ -0,0 +1,91 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Menu-driven UEFI Variable maintenance > + * > + * Copyright (c) 2022 Masahisa Kojima, Linaro Limited > + */ > + > +#ifndef _EFI_CONFIG_H > +#define _EFI_CONFIG_H > + > +#define EFICONFIG_ENTRY_NUM_MAX 99 > +#define EFICONFIG_FILE_PATH_MAX 512 > +#define EFICONFIG_FILE_PATH_BUF_SIZE (EFICONFIG_FILE_PATH_MAX * sizeof(= u16)) > + > +typedef efi_status_t (*eficonfig_entry_func)(void *data); > + > +/** > + * struct eficonfig_entry - menu entry structure > + * > + * @num: menu entry index > + * @title: title of entry > + * @key: unique key > + * @efi_menu: pointer to the menu structure > + * @next: pointer to the next entry > + * @func: callback function to be called when this entry is selected > + * @data: data to be passed to the callback function > + */ > +struct eficonfig_entry { > + u32 num; > + char *title; > + char key[3]; > + struct efimenu *efi_menu; > + struct eficonfig_entry *next; > + eficonfig_entry_func func; > + void *data; > +}; > + > +/** > + * struct efimenu - efi menu structure > + * > + * @delay: delay for autoboot > + * @active: active menu entry index > + * @count: total count of menu entry > + * @menu_header: menu header string > + * @first: pointer to the first menu entry > + */ > +struct efimenu { > + int delay; > + int active; > + int count; > + char *menu_header; > + struct eficonfig_entry *first; > +}; > + > +/** > + * struct eficonfig_item - structure to construct eficonfig_entry > + * > + * @title: title of entry > + * @func: callback function to be called when this entry is selected > + * @data: data to be passed to the callback function > + */ > +struct eficonfig_item { > + char *title; > + eficonfig_entry_func func; > + void *data; > +}; > + > +/** > + * struct eficonfig_select_file_info - structure to be used for file se= lection > + * > + * @current_volume: pointer to the efi_simple_file_system_protocol > + * @dp_volume: pointer to device path of the selected device > + * @current_path: pointer to the selected file path string > + * @file_selectred: flag indicates file selecting status > + * @filepath_list: list_head structure for file path list > + */ > +struct eficonfig_select_file_info { > + struct efi_simple_file_system_protocol *current_volume; > + struct efi_device_path *dp_volume; > + u16 *current_path; > + struct list_head filepath_list; > + bool file_selected; > +}; > + > +void eficonfig_print_msg(char *msg); > +efi_status_t eficonfig_process_quit(void *data); > +efi_status_t eficonfig_process_common(const struct eficonfig_item *item= s, int count, > + char *menu_header); > +efi_status_t eficonfig_select_file_handler(void *data); > + > +#endif > diff --git a/include/efi_loader.h b/include/efi_loader.h > index c6df29993c..365ce9493e 100644 > --- a/include/efi_loader.h > +++ b/include/efi_loader.h > @@ -226,6 +226,9 @@ const char *__efi_nesting_dec(void); > #define EFI_CACHELINE_SIZE 128 > #endif > > +/* max bootmenu title size for volume selection */ > +#define BOOTMENU_DEVICE_NAME_MAX 16 > + > /* Key identifying current memory map */ > extern efi_uintn_t efi_memory_map_key; > > @@ -249,6 +252,9 @@ extern const struct efi_hii_string_protocol efi_hii_= string; > > uint16_t *efi_dp_str(struct efi_device_path *dp); > > +/* GUID for the auto generated boot menu entry */ > +extern const efi_guid_t efi_guid_bootmenu_auto_generated; > + > /* GUID of the U-Boot root node */ > extern const efi_guid_t efi_u_boot_guid; > #ifdef CONFIG_SANDBOX > @@ -314,6 +320,9 @@ extern const efi_guid_t efi_guid_firmware_management= _protocol; > extern const efi_guid_t efi_esrt_guid; > /* GUID of the SMBIOS table */ > extern const efi_guid_t smbios_guid; > +/*GUID of console */ > +extern const efi_guid_t efi_guid_text_input_protocol; > +extern const efi_guid_t efi_guid_text_output_protocol; > > extern char __efi_runtime_start[], __efi_runtime_stop[]; > extern char __efi_runtime_rel_start[], __efi_runtime_rel_stop[]; > @@ -883,6 +892,8 @@ efi_status_t efi_set_load_options(efi_handle_t handl= e, > void *load_options); > efi_status_t efi_bootmgr_load(efi_handle_t *handle, void **load_option= s); > > +efi_status_t efi_bootmenu_show_maintenance_menu(void); > + > /** > * struct efi_image_regions - A list of memory regions > * > @@ -1054,4 +1065,33 @@ efi_status_t efi_esrt_populate(void); > efi_status_t efi_load_capsule_drivers(void); > > efi_status_t platform_get_eventlog(struct udevice *dev, u64 *addr, u32= *sz); > + > +efi_status_t efi_locate_handle_buffer_int(enum efi_locate_search_type s= earch_type, > + const efi_guid_t *protocol, void *search_key, > + efi_uintn_t *no_handles, efi_handle_t **buffer); > + > +efi_status_t efi_open_volume_int(struct efi_simple_file_system_protocol= *this, > + struct efi_file_handle **root); > +efi_status_t efi_file_open_int(struct efi_file_handle *this, > + struct efi_file_handle **new_handle, > + u16 *file_name, u64 open_mode, > + u64 attributes); > +efi_status_t efi_file_close_int(struct efi_file_handle *file); > +efi_status_t efi_file_read_int(struct efi_file_handle *this, > + efi_uintn_t *buffer_size, void *buffer); > +efi_status_t efi_file_setpos_int(struct efi_file_handle *file, u64 pos)= ; > + > +typedef efi_status_t (*efi_console_filter_func)(struct efi_input_key *k= ey); > +efi_status_t efi_console_get_u16_string > + (struct efi_simple_text_input_protocol *cin, > + struct efi_simple_text_output_protocol *cout, > + u16 *buf, efi_uintn_t count, efi_console_filter_func filer_func, > + int row, int col); > + > +efi_status_t eficonfig_get_unused_bootoption(u16 *buf, > + efi_uintn_t buf_size, u32 *index); > +efi_status_t eficonfig_append_bootorder(u16 index); > + > +efi_status_t efi_disk_get_device_name(struct efi_block_io *this, char *= buf, int size); > + > #endif /* _EFI_LOADER_H */ > diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime= .c > index 4da64b5d29..1233418e77 100644 > --- a/lib/efi_loader/efi_boottime.c > +++ b/lib/efi_loader/efi_boottime.c > @@ -2453,6 +2453,35 @@ static efi_status_t EFIAPI efi_protocols_per_hand= le( > return EFI_EXIT(EFI_SUCCESS); > } > > +efi_status_t efi_locate_handle_buffer_int(enum efi_locate_search_type s= earch_type, > + const efi_guid_t *protocol, void *search_key, > + efi_uintn_t *no_handles, efi_handle_t **buffer) > +{ > + efi_status_t r; > + efi_uintn_t buffer_size =3D 0; > + > + if (!no_handles || !buffer) { > + r =3D EFI_INVALID_PARAMETER; > + goto out; > + } > + *no_handles =3D 0; > + *buffer =3D NULL; > + r =3D efi_locate_handle(search_type, protocol, search_key, &buffer_siz= e, > + *buffer); > + if (r !=3D EFI_BUFFER_TOO_SMALL) > + goto out; > + r =3D efi_allocate_pool(EFI_BOOT_SERVICES_DATA, buffer_size, > + (void **)buffer); > + if (r !=3D EFI_SUCCESS) > + goto out; > + r =3D efi_locate_handle(search_type, protocol, search_key, &buffer_siz= e, > + *buffer); > + if (r =3D=3D EFI_SUCCESS) > + *no_handles =3D buffer_size / sizeof(efi_handle_t); > +out: > + return r; > +} > + > /** > * efi_locate_handle_buffer() - locate handles implementing a protocol > * @search_type: selection criterion > @@ -2474,30 +2503,13 @@ efi_status_t EFIAPI efi_locate_handle_buffer( > efi_uintn_t *no_handles, efi_handle_t **buffer) > { > efi_status_t r; > - efi_uintn_t buffer_size =3D 0; > > EFI_ENTRY("%d, %pUs, %p, %p, %p", search_type, protocol, search_key, > no_handles, buffer); > > - if (!no_handles || !buffer) { > - r =3D EFI_INVALID_PARAMETER; > - goto out; > - } > - *no_handles =3D 0; > - *buffer =3D NULL; > - r =3D efi_locate_handle(search_type, protocol, search_key, &buffer_siz= e, > - *buffer); > - if (r !=3D EFI_BUFFER_TOO_SMALL) > - goto out; > - r =3D efi_allocate_pool(EFI_BOOT_SERVICES_DATA, buffer_size, > - (void **)buffer); > - if (r !=3D EFI_SUCCESS) > - goto out; > - r =3D efi_locate_handle(search_type, protocol, search_key, &buffer_siz= e, > - *buffer); > - if (r =3D=3D EFI_SUCCESS) > - *no_handles =3D buffer_size / sizeof(efi_handle_t); > -out: > + r =3D efi_locate_handle_buffer_int(search_type, protocol, search_key, > + no_handles, buffer); > + > return EFI_EXIT(r); > } > > diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c > index 60a3fc85ac..ca8e38b8eb 100644 > --- a/lib/efi_loader/efi_console.c > +++ b/lib/efi_loader/efi_console.c > @@ -5,6 +5,7 @@ > * Copyright (c) 2016 Alexander Graf > */ > > +#include > #include > #include > #include > @@ -1312,3 +1313,80 @@ out_of_memory: > printf("ERROR: Out of memory\n"); > return r; > } > + > +/** > + * efi_console_get_u16_string() - get user input string > + * > + * @cin: protocol interface to EFI_SIMPLE_TEXT_INPUT_PROTOCOL > + * @cout: protocol interface to EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL > + * @buf: buffer to store user input string in UTF16 > + * @count: number of u16 string including NULL terminator that buf has > + * @filter_func: callback to filter user input > + * @row: row number to locate user input form > + * @col: column number to locate user input form > + * Return: status code > + */ > +efi_status_t efi_console_get_u16_string(struct efi_simple_text_input_pr= otocol *cin, > + struct efi_simple_text_output_protocol *cout, > + u16 *buf, efi_uintn_t count, > + efi_console_filter_func filter_func, > + int row, int col) > +{ > + efi_status_t ret; > + efi_uintn_t len =3D 0; > + struct efi_input_key key; > + > + printf(ANSI_CURSOR_POSITION, row, col); > + puts(ANSI_CLEAR_LINE_TO_END); > + puts(ANSI_CURSOR_SHOW); One printf() statement is enough and reduces code size: printf(ANSI_CURSOR_POSITION ANSI_CLEAR_LINE_TO_END ANSI_CURSOR_SHOW, row col); > + > + ret =3D EFI_CALL(cin->reset(cin, false)); > + if (ret !=3D EFI_SUCCESS) > + return ret; > + > + for (;;) { > + do { > + ret =3D EFI_CALL(cin->read_key_stroke(cin, &key)); > + mdelay(10); > + } while (ret =3D=3D EFI_NOT_READY); > + > + if (key.unicode_char =3D=3D u'\b') { > + if (len > 0) > + buf[--len] =3D u'\0'; > + > + printf(ANSI_CURSOR_POSITION, row, col); > + ret =3D EFI_CALL(cout->output_string(cout, buf)); Please, use %ls to print u16 strings: printf("ANSI_CURSOR_POSITION "%ls" ANSI_CLEAR_LINE_TO_END, row, col, buf); > + if (ret !=3D EFI_SUCCESS) > + return ret; > + > + puts(ANSI_CLEAR_LINE_TO_END); > + continue; > + } else if (key.unicode_char =3D=3D u'\r') { > + buf[len] =3D u'\0'; > + return EFI_SUCCESS; > + } else if (key.unicode_char =3D=3D 0x3 || key.scan_code =3D=3D 23) { > + return EFI_ABORTED; > + } else if (key.unicode_char < 0x20) { > + /* ignore control codes other than Ctrl+C, '\r' and '\b' */ > + continue; > + } else if (key.scan_code !=3D 0) { > + /* only accept single ESC press for cancel */ > + continue; > + } > + > + if (filter_func) { > + if (filter_func(&key) !=3D EFI_SUCCESS) > + continue; > + } > + > + if (len >=3D (count - 1)) > + continue; > + > + buf[len] =3D key.unicode_char; > + len++; > + printf(ANSI_CURSOR_POSITION, row, col); > + ret =3D EFI_CALL(cout->output_string(cout, buf)); Please use %ls: printf(ANSI_CURSOR_POSITION "%ls", row, col, buf); > + if (ret !=3D EFI_SUCCESS) > + return ret; > + } > +} > diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c > index 1e82f52dc0..efc2f20ff0 100644 > --- a/lib/efi_loader/efi_disk.c > +++ b/lib/efi_loader/efi_disk.c > @@ -778,3 +778,14 @@ efi_status_t efi_disk_init(void) > > return EFI_SUCCESS; > } > + > +efi_status_t efi_disk_get_device_name(struct efi_block_io *this, char *= buf, int size) > +{ > + struct efi_disk_obj *diskobj; > + > + diskobj =3D container_of(this, struct efi_disk_obj, ops); This will fail if the EFI_BLOCK_IO_PROTOCOL is provided by a driver loaded via the bootefi command. Handles can only be created by U-Boot in contrast to protocol interfaces. What you need is the udevice as a field in struct efi_object instead of struct efi_disk_obj. See Takahiro's comment in lib/efi_loader/efi_disk.c:49: struct udevice *dev; /* TODO: move it to efi_object */ Best regards Heinrich > + > + snprintf(buf, size, "%s %d:%d", diskobj->ifname, diskobj->dev_index, d= iskobj->part); > + > + return EFI_SUCCESS; > +} > diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c > index 7a7077e6d0..c96a7f7ca3 100644 > --- a/lib/efi_loader/efi_file.c > +++ b/lib/efi_loader/efi_file.c > @@ -246,10 +246,10 @@ error: > return NULL; > } > > -static efi_status_t efi_file_open_int(struct efi_file_handle *this, > - struct efi_file_handle **new_handle, > - u16 *file_name, u64 open_mode, > - u64 attributes) > +efi_status_t efi_file_open_int(struct efi_file_handle *this, > + struct efi_file_handle **new_handle, > + u16 *file_name, u64 open_mode, > + u64 attributes) > { > struct file_handle *fh =3D to_fh(this); > efi_status_t ret; > @@ -369,11 +369,17 @@ static efi_status_t file_close(struct file_handle = *fh) > return EFI_SUCCESS; > } > > -static efi_status_t EFIAPI efi_file_close(struct efi_file_handle *file) > +efi_status_t efi_file_close_int(struct efi_file_handle *file) > { > struct file_handle *fh =3D to_fh(file); > + > + return file_close(fh); > +} > + > +static efi_status_t EFIAPI efi_file_close(struct efi_file_handle *file) > +{ > EFI_ENTRY("%p", file); > - return EFI_EXIT(file_close(fh)); > + return EFI_EXIT(efi_file_close_int(file)); > } > > static efi_status_t EFIAPI efi_file_delete(struct efi_file_handle *fil= e) > @@ -562,8 +568,8 @@ static efi_status_t dir_read(struct file_handle *fh,= u64 *buffer_size, > return EFI_SUCCESS; > } > > -static efi_status_t efi_file_read_int(struct efi_file_handle *this, > - efi_uintn_t *buffer_size, void *buffer) > +efi_status_t efi_file_read_int(struct efi_file_handle *this, > + efi_uintn_t *buffer_size, void *buffer) > { > struct file_handle *fh =3D to_fh(this); > efi_status_t ret =3D EFI_SUCCESS; > @@ -773,24 +779,11 @@ out: > return EFI_EXIT(ret); > } > > -/** > - * efi_file_setpos() - set current position in file > - * > - * This function implements the SetPosition service of the EFI file pro= tocol. > - * See the UEFI spec for details. > - * > - * @file: file handle > - * @pos: new file position > - * Return: status code > - */ > -static efi_status_t EFIAPI efi_file_setpos(struct efi_file_handle *file= , > - u64 pos) > +efi_status_t efi_file_setpos_int(struct efi_file_handle *file, u64 pos) > { > struct file_handle *fh =3D to_fh(file); > efi_status_t ret =3D EFI_SUCCESS; > > - EFI_ENTRY("%p, %llu", file, pos); > - > if (fh->isdir) { > if (pos !=3D 0) { > ret =3D EFI_UNSUPPORTED; > @@ -812,6 +805,28 @@ static efi_status_t EFIAPI efi_file_setpos(struct e= fi_file_handle *file, > fh->offset =3D pos; > > error: > + return ret; > +} > + > +/** > + * efi_file_setpos() - set current position in file > + * > + * This function implements the SetPosition service of the EFI file pro= tocol. > + * See the UEFI spec for details. > + * > + * @file: file handle > + * @pos: new file position > + * Return: status code > + */ > +static efi_status_t EFIAPI efi_file_setpos(struct efi_file_handle *file= , > + u64 pos) > +{ > + efi_status_t ret =3D EFI_SUCCESS; > + > + EFI_ENTRY("%p, %llu", file, pos); > + > + ret =3D efi_file_setpos_int(file, pos); > + > return EFI_EXIT(ret); > } > > @@ -1138,17 +1153,23 @@ struct efi_file_handle *efi_file_from_path(struc= t efi_device_path *fp) > return f; > } > > +efi_status_t efi_open_volume_int(struct efi_simple_file_system_protocol= *this, > + struct efi_file_handle **root) > +{ > + struct file_system *fs =3D to_fs(this); > + > + *root =3D file_open(fs, NULL, NULL, 0, 0); > + > + return EFI_SUCCESS; > +} > + > static efi_status_t EFIAPI > efi_open_volume(struct efi_simple_file_system_protocol *this, > struct efi_file_handle **root) > { > - struct file_system *fs =3D to_fs(this); > - > EFI_ENTRY("%p, %p", this, root); > > - *root =3D file_open(fs, NULL, NULL, 0, 0); > - > - return EFI_EXIT(EFI_SUCCESS); > + return EFI_EXIT(efi_open_volume_int(this, root)); > } > > struct efi_simple_file_system_protocol *