April 2024 - U-Boot

[PATCH 0/2] phy: qcom: add support for the Qualcomm Synopsys eUSB2 PHY
by Neil Armstrong 05 Apr '24

05 Apr '24

Add support for the new Qualcomm Synopsys eUSB2 PHY found in the SM8550 and SM8650 SoCs. Finally enable the driver in the Qualcomm defconfig. Signed-off-by: Neil Armstrong <neil.armstrong(a)linaro.org> --- Neil Armstrong (2): phy: qcom: add Synopsys eUSB2 PHY driver qcom_defconfig: enable the Qualcomm Synopsys eUSB2 PHY driver configs/qcom_defconfig | 1 + drivers/phy/qcom/Kconfig | 8 + drivers/phy/qcom/Makefile | 1 + drivers/phy/qcom/phy-qcom-snps-eusb2.c | 365 +++++++++++++++++++++++++++++++++ 4 files changed, 375 insertions(+) --- base-commit: f0e6aba1218bca578605697eed8aa94582bf57bb change-id: 20240404-topic-sm8x50-usb-phy-d09a98f72d1b Best regards, -- Neil Armstrong <neil.armstrong(a)linaro.org>

1 3

[RFC PATCH v2 0/2] Introduce fastboot oem board command
by Alexey Romanov 05 Apr '24

05 Apr '24

Changes v2 since v1 at [1]: - Added an example of using the command as requsted by Sean Anderson [2]. Links: [1] https://lore.kernel.org/all/20231228152522.83291-1-avromanov@salutedevices.… [2] https://lore.kernel.org/all/72ac233d-c18d-4f57-bc66-451fe0bd2997@seco.com/ Alexey Romanov (2): fastboot: introduce 'oem board' subcommand board: ad401: example of fastboot oem board realization board/amlogic/ad401/fastboot.c | 222 +++++++++++++++++++++++++++++++++ drivers/fastboot/Kconfig | 7 ++ drivers/fastboot/fb_command.c | 15 +++ include/fastboot.h | 1 + 4 files changed, 245 insertions(+) create mode 100644 board/amlogic/ad401/fastboot.c -- 2.30.1

3 13

[PATCH] efi_loader: access __efi_runtime_start/stop without &
by Ilias Apalodimas 05 Apr '24

05 Apr '24

A symbol defined in a linker script (e.g. __efi_runtime_start = .;) is only a symbol, not a variable and should not be dereferenced. The common practice is either define it as extern uint32_t __efi_runtime_start or extern char __efi_runtime_start[] and access it as &__efi_runtime_start or __efi_runtime_start respectively. So let's access it properly since we define it as an array Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/efi_memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index edfad2d95a1d..98f104390c8d 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -933,8 +933,8 @@ static void add_u_boot_and_runtime(void) * Add Runtime Services. We mark surrounding boottime code as runtime as * well to fulfill the runtime alignment constraints but avoid padding. */ - runtime_start = (ulong)&__efi_runtime_start & ~runtime_mask; - runtime_end = (ulong)&__efi_runtime_stop; + runtime_start = (ulong)__efi_runtime_start & ~runtime_mask; + runtime_end = (ulong)__efi_runtime_stop; runtime_end = (runtime_end + runtime_mask) & ~runtime_mask; runtime_pages = (runtime_end - runtime_start) >> EFI_PAGE_SHIFT; efi_add_memory_map_pg(runtime_start, runtime_pages, -- 2.43.0

2 2

[PATCH 1/1] efi_loader: eliminate duplicate runtime section definitions
by Heinrich Schuchardt 05 Apr '24

05 Apr '24

The following symbols are defined in two includes: * __efi_runtime_start[] * __efi_runtime_stop[] * __efi_runtime_rel_start[] * __efi_runtime_rel_stop[] Eliminate the definitions in efi_loader.h. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- include/efi_loader.h | 3 --- lib/efi_loader/efi_memory.c | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index 7daca0afba..bb51c02817 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -345,9 +345,6 @@ extern const efi_guid_t smbios3_guid; 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[]; - /** * struct efi_open_protocol_info_item - open protocol info item * diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index edfad2d95a..81f5f98a8a 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -15,6 +15,7 @@ #include <watchdog.h> #include <asm/cache.h> #include <asm/global_data.h> +#include <asm/sections.h> #include <linux/list_sort.h> #include <linux/sizes.h> -- 2.43.0

2 1

[PATCH] ARM: stm32: Jump to ep on successful resume in PSCI suspend code
by Marek Vasut 05 Apr '24

05 Apr '24

In case the system has resumed successfully, the PSCI suspend resume code has to jump to the 'ep' successful resume entry point code path, otherwise the code has to jump to content of the LR register, which points to failed resume code path. To implement this distinction, rewrite LR register stored on stack with 'ep' value in case of a successful resume, which is really in every case unless some catastrophic failure occurred during suspend. Without this change, Linux counts every resume as failed in /sys/power/suspend_stats/fail Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> Cc: u-boot(a)dh-electronics.com Cc: u-boot(a)lists.denx.de Cc: uboot-stm32(a)st-md-mailman.stormreply.com --- arch/arm/mach-stm32mp/psci.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm/mach-stm32mp/psci.c b/arch/arm/mach-stm32mp/psci.c index 8cdeb0ab3f2..4f2379df45f 100644 --- a/arch/arm/mach-stm32mp/psci.c +++ b/arch/arm/mach-stm32mp/psci.c @@ -703,6 +703,8 @@ void __secure psci_system_suspend(u32 __always_unused function_id, { u32 saved_mcudivr, saved_pll3cr, saved_pll4cr, saved_mssckselr; u32 gicd_addr = stm32mp_get_gicd_base_address(); + u32 cpu = psci_get_cpu_id(); + u32 sp = (u32)__secure_stack_end - (cpu << ARM_PSCI_STACK_SHIFT); bool iwdg1_wake = false; bool iwdg2_wake = false; bool other_wake = false; @@ -805,4 +807,16 @@ void __secure psci_system_suspend(u32 __always_unused function_id, writel(SYSCFG_CMPENR_MPUEN, STM32_SYSCFG_BASE + SYSCFG_CMPENSETR); clrbits_le32(STM32_SYSCFG_BASE + SYSCFG_CMPCR, SYSCFG_CMPCR_SW_CTRL); + + /* + * The system has resumed successfully. Rewrite LR register stored + * on stack with 'ep' value, so that on return from this PSCI call, + * the code would jump to that 'ep' resume entry point code path + * instead of the previous 'lr' register content which (e.g. with + * Linux) points to resume failure code path. + * + * See arch/arm/cpu/armv7/psci.S _smc_psci: for the stack layout + * used here, SP-4 is PC, SP-8 is LR, SP-12 is R7, and so on. + */ + writel(ep, sp - 8); } -- 2.43.0

2 1

[PATCH 00/33] doc: board: amlogic: spring clean-up of Amlogic docs
by Christian Hewitt 05 Apr '24

05 Apr '24

Amlogic documentation spans U-Boot support from 2015-current resulting in older content being harder to follow. And due to many international contributors the docs also contain grammar quirks. This series reworks all board documents to be more consistent. There is deliberate emphasis on using the amlogic-boot-fip repo for signing tasks as this is easier for most users to follow. The original/longer signing process (described as Manual Signing) has been tidied up. In the index.rst file I've dropped board names from the features table as this adds considerable width and makes adding new boards a fiddly process. I've appended the SoC type to the boader header so it shows in the TOC list to retain a reference between boards and the table. I've added missing board docs for GS-King-X, BPI-M5, BPI-CM4IO, and we split ODROID-HC4 into its own document. It originally followed the same process as the ODROID0-C4, but now has a separate defconfig to enable SPI-NOR and PCIe SATA support. Users occasionally follow the current doc and build U-Boot for the C4 which omits this and then struggle to figure out why SATA boot doesn't work when wiki/forums say it does. There are other minor cleanups and tweaks for clarity of simply more up-to-date information for a board or process. Please review and flag any omissions or issues! Christian Hewitt (33): doc: boards: amlogic: update documentation for index page doc: boards: amlogic: update documentation for boot-flow doc: boards: amlogic: update documentation for pre-generated-fip's doc: boards: amlogic: update documentation for Beelink GT-King doc: boards: amlogic: update documentation for Beelink GT-King Pro doc: boards: amlogic: update documentation for JetHub J100 doc: boards: amlogic: update documentation for JetHub J80 doc: boards: amlogic: update documentation for Khadas VIM doc: boards: amlogic: update documentation for Khadas VIM2 doc: boards: amlogic: update documentation for Khadas VIM3 doc: boards: amlogic: update documentation for Khadas VIM3L doc: boards: amlogic: update documentation for LaFrite doc: boards: amlogic: update documentation for LePotato doc: boards: amlogic: update documentation for NanoPi-K2 doc: boards: amlogic: update documentation for ODROID-C2 doc: boards: amlogic: update documentation for ODROID-C4 doc: boards: amlogic: update documentation for ODROID GO ULTRA doc: boards: amlogic: update documentation for ODROID-N2/N2+ doc: boards: amlogic: update documentation for ODROID-N2L doc: boards: amlogic: update documentation for P200 doc: boards: amlogic: update documentation for P201 doc: boards: amlogic: update documentation for Q200 doc: boards: amlogic: update documentation for Radxa Zero doc: boards: amlogic: update documentation for S400 doc: boards: amlogic: update documentation for SEI510 doc: boards: amlogic: update documentation for SEI610 doc: boards: amlogic: update documentation for U200 doc: boards: amlogic: update documentation for W400 doc: boards: amlogic: update documentation for WeTek Core2 doc: boards: amlogic: add documentation for BananaPi CM4IO doc: boards: amlogic: add documentation for BananaPi M5 doc: boards: amlogic: add documentation for GS-King-X doc: boards: amlogic: add documentation for ODROID-HC4 board/amlogic/beelink-s922x/MAINTAINERS | 3 +- board/amlogic/u200/MAINTAINERS | 1 - board/amlogic/w400/MAINTAINERS | 2 + doc/board/amlogic/bananapi-cm4io.rst | 152 ++++++++++++++++++++ doc/board/amlogic/bananapi-m5.rst | 141 +++++++++++++++++++ doc/board/amlogic/beelink-gskingx.rst | 121 ++++++++++++++++ doc/board/amlogic/beelink-gtking.rst | 120 ++++++++-------- doc/board/amlogic/beelink-gtkingpro.rst | 120 ++++++++-------- doc/board/amlogic/boot-flow.rst | 178 ++++++++++++------------ doc/board/amlogic/index.rst | 141 +++++++++---------- doc/board/amlogic/jethub-j100.rst | 66 ++++----- doc/board/amlogic/jethub-j80.rst | 46 +++--- doc/board/amlogic/khadas-vim.rst | 76 +++++----- doc/board/amlogic/khadas-vim2.rst | 76 +++++----- doc/board/amlogic/khadas-vim3.rst | 137 +++++++++--------- doc/board/amlogic/khadas-vim3l.rst | 137 +++++++++--------- doc/board/amlogic/libretech-ac.rst | 77 +++++----- doc/board/amlogic/libretech-cc.rst | 109 ++++++--------- doc/board/amlogic/nanopi-k2.rst | 93 +++++++------ doc/board/amlogic/odroid-c2.rst | 54 +++---- doc/board/amlogic/odroid-c4.rst | 117 ++++++++-------- doc/board/amlogic/odroid-go-ultra.rst | 25 +++- doc/board/amlogic/odroid-hc4.rst | 141 +++++++++++++++++++ doc/board/amlogic/odroid-n2.rst | 122 ++++++++-------- doc/board/amlogic/odroid-n2l.rst | 33 +++-- doc/board/amlogic/p200.rst | 87 +++++++----- doc/board/amlogic/p201.rst | 87 +++++++----- doc/board/amlogic/pre-generated-fip.rst | 138 +++++++++++------- doc/board/amlogic/q200.rst | 76 +++++----- doc/board/amlogic/radxa-zero.rst | 45 +++--- doc/board/amlogic/s400.rst | 89 ++++++------ doc/board/amlogic/sei510.rst | 113 ++++++++------- doc/board/amlogic/sei610.rst | 118 ++++++++-------- doc/board/amlogic/u200.rst | 113 ++++++++------- doc/board/amlogic/w400.rst | 115 ++++++++------- doc/board/amlogic/wetek-core2.rst | 83 ++++++----- 36 files changed, 2042 insertions(+), 1310 deletions(-) create mode 100644 doc/board/amlogic/bananapi-cm4io.rst create mode 100644 doc/board/amlogic/bananapi-m5.rst create mode 100644 doc/board/amlogic/beelink-gskingx.rst create mode 100644 doc/board/amlogic/odroid-hc4.rst -- 2.34.1

5 41

[PATCH] doc: build: fix gen_compile_commands section level
by Mattijs Korpershoek 05 Apr '24

05 Apr '24

The 2 subsections of this page ("Compatible IDEs" and "Usage") are using the same header level as the title (with "==="). Because of this, they always appear in the HTML rendered ToC. Drop the subsections one level lower by replacing "=" by "-". This fixes the HTML rendering. Signed-off-by: Mattijs Korpershoek <mkorpershoek(a)baylibre.com> --- doc/build/gen_compile_commands.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/build/gen_compile_commands.rst b/doc/build/gen_compile_commands.rst index 50305cec4a83..d503764f9e3f 100644 --- a/doc/build/gen_compile_commands.rst +++ b/doc/build/gen_compile_commands.rst @@ -42,7 +42,7 @@ needed for it to be usable by the LSP, unless you set a name for the database other than it's default one (compile_commands.json). Compatible IDEs -=============== +--------------- Several popular integrated development environments (IDEs) support the use of JSON compilation databases for C/C++ development, making it easier to @@ -73,7 +73,7 @@ compile_commands.json in the root of the repository should suffice to enable code navigation. Usage -===== +----- For further details on the script's options, please refer to its help message, as in the example below. --- base-commit: cdfcc37428e06f4730ab9a17cc084eeb7676ea1a change-id: 20240405-doc-fix-headings-6109365355a3 Best regards, -- Mattijs Korpershoek <mkorpershoek(a)baylibre.com>

2 1

[PATCH v2] efi_loader: move efi_var_collect to common functions
by Ilias Apalodimas 05 Apr '24

05 Apr '24

From: Ilias Apalodimas <apalos(a)gmail.com> efi_var_collect() was initially placed in efi_var_file.c, since back then we only supported efi variables stored in a file. Since then we support variables stored in an RPMB as well and use that function to collect variables that should be present at runtime. So let's move it around in efi_var_common.c which makes more sense Suggested-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Signed-off-by: Ilias Apalodimas <apalos(a)gmail.com> --- Changes since v1: - Clean up the makefile as well - fix checkpatch error lib/efi_loader/Makefile | 2 +- lib/efi_loader/efi_var_common.c | 74 +++++++++++++++++++++++++++++++++ lib/efi_loader/efi_var_file.c | 64 ---------------------------- 3 files changed, 75 insertions(+), 65 deletions(-) diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index fcb0af7e7d6d..6a0ce6c32c88 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -72,11 +72,11 @@ obj-y += efi_string.o obj-$(CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2) += efi_unicode_collation.o obj-y += efi_var_common.o obj-y += efi_var_mem.o -obj-y += efi_var_file.o ifeq ($(CONFIG_EFI_MM_COMM_TEE),y) obj-y += efi_variable_tee.o else obj-y += efi_variable.o +obj-y += efi_var_file.o obj-$(CONFIG_EFI_VARIABLES_PRESEED) += efi_var_seed.o endif obj-y += efi_watchdog.o diff --git a/lib/efi_loader/efi_var_common.c b/lib/efi_loader/efi_var_common.c index d528747f3fb4..4268850990f5 100644 --- a/lib/efi_loader/efi_var_common.c +++ b/lib/efi_loader/efi_var_common.c @@ -9,6 +9,7 @@ #include <efi_loader.h> #include <efi_variable.h> #include <stdlib.h> +#include <u-boot/crc.h> enum efi_secure_mode { EFI_MODE_SETUP, @@ -416,3 +417,76 @@ void *efi_get_var(const u16 *name, const efi_guid_t *vendor, efi_uintn_t *size) return buf; } + +/** + * efi_var_collect() - Copy EFI variables mstching attributes mask + * + * @bufp: buffer containing variable collection + * @lenp: buffer length + * @attr_mask: mask of matched attributes + * + * Return: Status code + */ +efi_status_t __maybe_unused efi_var_collect(struct efi_var_file **bufp, loff_t *lenp, + u32 check_attr_mask) +{ + size_t len = EFI_VAR_BUF_SIZE; + struct efi_var_file *buf; + struct efi_var_entry *var, *old_var; + size_t old_var_name_length = 2; + + *bufp = NULL; /* Avoid double free() */ + buf = calloc(1, len); + if (!buf) + return EFI_OUT_OF_RESOURCES; + var = buf->var; + old_var = var; + for (;;) { + efi_uintn_t data_length, var_name_length; + u8 *data; + efi_status_t ret; + + if ((uintptr_t)buf + len <= + (uintptr_t)var->name + old_var_name_length) + return EFI_BUFFER_TOO_SMALL; + + var_name_length = (uintptr_t)buf + len - (uintptr_t)var->name; + memcpy(var->name, old_var->name, old_var_name_length); + guidcpy(&var->guid, &old_var->guid); + ret = efi_get_next_variable_name_int( + &var_name_length, var->name, &var->guid); + if (ret == EFI_NOT_FOUND) + break; + if (ret != EFI_SUCCESS) { + free(buf); + return ret; + } + old_var_name_length = var_name_length; + old_var = var; + + data = (u8 *)var->name + old_var_name_length; + data_length = (uintptr_t)buf + len - (uintptr_t)data; + ret = efi_get_variable_int(var->name, &var->guid, + &var->attr, &data_length, data, + &var->time); + if (ret != EFI_SUCCESS) { + free(buf); + return ret; + } + if ((var->attr & check_attr_mask) == check_attr_mask) { + var->length = data_length; + var = (struct efi_var_entry *)ALIGN((uintptr_t)data + data_length, 8); + } + } + + buf->reserved = 0; + buf->magic = EFI_VAR_FILE_MAGIC; + len = (uintptr_t)var - (uintptr_t)buf; + buf->crc32 = crc32(0, (u8 *)buf->var, + len - sizeof(struct efi_var_file)); + buf->length = len; + *bufp = buf; + *lenp = len; + + return EFI_SUCCESS; +} diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c index 532b6b40eefe..413e1794e88c 100644 --- a/lib/efi_loader/efi_var_file.c +++ b/lib/efi_loader/efi_var_file.c @@ -52,70 +52,6 @@ static efi_status_t __maybe_unused efi_set_blk_dev_to_system_partition(void) return EFI_SUCCESS; } -efi_status_t __maybe_unused efi_var_collect(struct efi_var_file **bufp, loff_t *lenp, - u32 check_attr_mask) -{ - size_t len = EFI_VAR_BUF_SIZE; - struct efi_var_file *buf; - struct efi_var_entry *var, *old_var; - size_t old_var_name_length = 2; - - *bufp = NULL; /* Avoid double free() */ - buf = calloc(1, len); - if (!buf) - return EFI_OUT_OF_RESOURCES; - var = buf->var; - old_var = var; - for (;;) { - efi_uintn_t data_length, var_name_length; - u8 *data; - efi_status_t ret; - - if ((uintptr_t)buf + len <= - (uintptr_t)var->name + old_var_name_length) - return EFI_BUFFER_TOO_SMALL; - - var_name_length = (uintptr_t)buf + len - (uintptr_t)var->name; - memcpy(var->name, old_var->name, old_var_name_length); - guidcpy(&var->guid, &old_var->guid); - ret = efi_get_next_variable_name_int( - &var_name_length, var->name, &var->guid); - if (ret == EFI_NOT_FOUND) - break; - if (ret != EFI_SUCCESS) { - free(buf); - return ret; - } - old_var_name_length = var_name_length; - old_var = var; - - data = (u8 *)var->name + old_var_name_length; - data_length = (uintptr_t)buf + len - (uintptr_t)data; - ret = efi_get_variable_int(var->name, &var->guid, - &var->attr, &data_length, data, - &var->time); - if (ret != EFI_SUCCESS) { - free(buf); - return ret; - } - if ((var->attr & check_attr_mask) == check_attr_mask) { - var->length = data_length; - var = (struct efi_var_entry *)ALIGN((uintptr_t)data + data_length, 8); - } - } - - buf->reserved = 0; - buf->magic = EFI_VAR_FILE_MAGIC; - len = (uintptr_t)var - (uintptr_t)buf; - buf->crc32 = crc32(0, (u8 *)buf->var, - len - sizeof(struct efi_var_file)); - buf->length = len; - *bufp = buf; - *lenp = len; - - return EFI_SUCCESS; -} - /** * efi_var_to_file() - save non-volatile variables as file * -- 2.43.0

2 1

[PATCH 0/4] Misc changes for CSSI boards
by Christophe Leroy 05 Apr '24

05 Apr '24

This series contains misc fixes and changes for CSSI boards. I will send a pull request later before close of the merge window. Hugo Dubois (2): board: cssi: Initialise port F on MIAE board: cssi: Properly initialise MAC address for fibre on CMPC885 board Jean-Michel CASAUBON (2): board: cssi: Fix MCR3000 board environment board: cssi: Allow use without HUSH shell board/cssi/cmpc885/cmpc885.c | 4 +++- board/cssi/cmpc885/cmpc885.env | 4 ++-- board/cssi/cmpcpro/cmpcpro.env | 4 ++-- board/cssi/common/common.c | 36 ++++++++++++++++++++++++++++++++-- board/cssi/mcr3000/mcr3000.env | 2 +- 5 files changed, 42 insertions(+), 8 deletions(-) -- 2.43.0

1 4

[PATCH] efi_loader: move efi_var_collect to common functions
by Ilias Apalodimas 05 Apr '24

05 Apr '24

From: Ilias Apalodimas <apalos(a)gmail.com> efi_var_collect() was initially placed in efi_var_file.c, since back then we only supported efi variables stored in a file. Since then we support variables stored in an RPMB as well and use that function to collect variables that should be present at runtime. So let's move it around in efi_var_common.c which makes more sense Suggested-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Signed-off-by: Ilias Apalodimas <apalos(a)gmail.com> --- lib/efi_loader/efi_var_common.c | 76 +++++++++++++++++++++++++++++++++ lib/efi_loader/efi_var_file.c | 64 --------------------------- 2 files changed, 76 insertions(+), 64 deletions(-) diff --git a/lib/efi_loader/efi_var_common.c b/lib/efi_loader/efi_var_common.c index 16b2c3d48828..07b9603d49f3 100644 --- a/lib/efi_loader/efi_var_common.c +++ b/lib/efi_loader/efi_var_common.c @@ -9,6 +9,7 @@ #include <efi_loader.h> #include <efi_variable.h> #include <stdlib.h> +#include <u-boot/crc.h> enum efi_secure_mode { EFI_MODE_SETUP, @@ -416,3 +417,78 @@ void *efi_get_var(const u16 *name, const efi_guid_t *vendor, efi_uintn_t *size) return buf; } + +/** + * efi_var_collect() - Copy EFI variables mstching attributes mask + * + * @bufp: buffer containing variable collection + * @lenp: buffer length + * @attr_mask: mask of matched attributes + * + * Return: Status code + */ +efi_status_t __maybe_unused efi_var_collect(struct efi_var_file **bufp, loff_t *lenp, + u32 check_attr_mask) +{ + size_t len = EFI_VAR_BUF_SIZE; + struct efi_var_file *buf; + struct efi_var_entry *var, *old_var; + size_t old_var_name_length = 2; + + *bufp = NULL; /* Avoid double free() */ + buf = calloc(1, len); + if (!buf) + return EFI_OUT_OF_RESOURCES; + var = buf->var; + old_var = var; + for (;;) { + efi_uintn_t data_length, var_name_length; + u8 *data; + efi_status_t ret; + + if ((uintptr_t)buf + len <= + (uintptr_t)var->name + old_var_name_length) + return EFI_BUFFER_TOO_SMALL; + + var_name_length = (uintptr_t)buf + len - (uintptr_t)var->name; + memcpy(var->name, old_var->name, old_var_name_length); + guidcpy(&var->guid, &old_var->guid); + ret = efi_get_next_variable_name_int( + &var_name_length, var->name, &var->guid); + if (ret == EFI_NOT_FOUND) + break; + if (ret != EFI_SUCCESS) { + free(buf); + return ret; + } + old_var_name_length = var_name_length; + old_var = var; + + data = (u8 *)var->name + old_var_name_length; + data_length = (uintptr_t)buf + len - (uintptr_t)data; + ret = efi_get_variable_int(var->name, &var->guid, + &var->attr, &data_length, data, + &var->time); + if (ret != EFI_SUCCESS) { + free(buf); + return ret; + } + if ((var->attr & check_attr_mask) == check_attr_mask) { + var->length = data_length; + var = (struct efi_var_entry *)ALIGN((uintptr_t)data + data_length, 8); + } + } + + buf->reserved = 0; + buf->magic = EFI_VAR_FILE_MAGIC; + len = (uintptr_t)var - (uintptr_t)buf; + buf->crc32 = crc32(0, (u8 *)buf->var, + len - sizeof(struct efi_var_file)); + buf->length = len; + *bufp = buf; + *lenp = len; + + return EFI_SUCCESS; +} + + diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c index 532b6b40eefe..413e1794e88c 100644 --- a/lib/efi_loader/efi_var_file.c +++ b/lib/efi_loader/efi_var_file.c @@ -52,70 +52,6 @@ static efi_status_t __maybe_unused efi_set_blk_dev_to_system_partition(void) return EFI_SUCCESS; } -efi_status_t __maybe_unused efi_var_collect(struct efi_var_file **bufp, loff_t *lenp, - u32 check_attr_mask) -{ - size_t len = EFI_VAR_BUF_SIZE; - struct efi_var_file *buf; - struct efi_var_entry *var, *old_var; - size_t old_var_name_length = 2; - - *bufp = NULL; /* Avoid double free() */ - buf = calloc(1, len); - if (!buf) - return EFI_OUT_OF_RESOURCES; - var = buf->var; - old_var = var; - for (;;) { - efi_uintn_t data_length, var_name_length; - u8 *data; - efi_status_t ret; - - if ((uintptr_t)buf + len <= - (uintptr_t)var->name + old_var_name_length) - return EFI_BUFFER_TOO_SMALL; - - var_name_length = (uintptr_t)buf + len - (uintptr_t)var->name; - memcpy(var->name, old_var->name, old_var_name_length); - guidcpy(&var->guid, &old_var->guid); - ret = efi_get_next_variable_name_int( - &var_name_length, var->name, &var->guid); - if (ret == EFI_NOT_FOUND) - break; - if (ret != EFI_SUCCESS) { - free(buf); - return ret; - } - old_var_name_length = var_name_length; - old_var = var; - - data = (u8 *)var->name + old_var_name_length; - data_length = (uintptr_t)buf + len - (uintptr_t)data; - ret = efi_get_variable_int(var->name, &var->guid, - &var->attr, &data_length, data, - &var->time); - if (ret != EFI_SUCCESS) { - free(buf); - return ret; - } - if ((var->attr & check_attr_mask) == check_attr_mask) { - var->length = data_length; - var = (struct efi_var_entry *)ALIGN((uintptr_t)data + data_length, 8); - } - } - - buf->reserved = 0; - buf->magic = EFI_VAR_FILE_MAGIC; - len = (uintptr_t)var - (uintptr_t)buf; - buf->crc32 = crc32(0, (u8 *)buf->var, - len - sizeof(struct efi_var_file)); - buf->length = len; - *bufp = buf; - *lenp = len; - - return EFI_SUCCESS; -} - /** * efi_var_to_file() - save non-volatile variables as file * -- 2.37.2

2 2