January 2025 - U-Boot

[PATCH v1] arch: meson: sm: add retrieve SoC chipid
by Viacheslav Bocharov 17 Jan '25

17 Jan '25

From: Nikita Maslo <nam(a)jethome.ru> The Amlogic Meson SoC Secure Monitor implements a call to retrieve an unique SoC ID starting from the GX Family and all new families. But GX-family chips (e.g. GXB, GXL and newer) supports also 128-bit chip ID. 128-bit chip ID consists 32-bit SoC version and 96-bit OTP data. Add new subcommand "chipid" to Amlogic specific "sm" cmd to write the SoC chip ID to memory. Signed-off-by: Nikita Maslo <nam(a)jethome.ru> Co-developed-by: Viacheslav Bocharov <adeep(a)lexina.in> Signed-off-by: Viacheslav Bocharov <adeep(a)lexina.in> --- arch/arm/include/asm/arch-meson/sm.h | 12 ++++++++++- arch/arm/mach-meson/sm.c | 32 +++++++++++++++++++++++++++- cmd/meson/sm.c | 22 ++++++++++++++++++- 3 files changed, 63 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-meson/sm.h b/arch/arm/include/asm/arch-meson/sm.h index 4b1d564bc48..812c5ed020a 100644 --- a/arch/arm/include/asm/arch-meson/sm.h +++ b/arch/arm/include/asm/arch-meson/sm.h @@ -27,9 +27,10 @@ ssize_t meson_sm_read_efuse(uintptr_t offset, void *buffer, size_t size); ssize_t meson_sm_write_efuse(uintptr_t offset, void *buffer, size_t size); #define SM_SERIAL_SIZE 12 +#define SM_CHIP_ID_SIZE 16 /** - * meson_sm_get_serial - read chip unique id into buffer + * meson_sm_get_serial - read chip unique serial into buffer * * @buffer: pointer to buffer * @size: buffer size. @@ -37,6 +38,15 @@ ssize_t meson_sm_write_efuse(uintptr_t offset, void *buffer, size_t size); */ int meson_sm_get_serial(void *buffer, size_t size); +/** + * meson_sm_get_chip_id - read unique chip ID into buffer + * + * @buffer: pointer to buffer + * @size: buffer size. + * @return: zero on success or -errno on failure + */ +int meson_sm_get_chip_id(void *buffer, size_t size); + enum { REBOOT_REASON_COLD = 0, REBOOT_REASON_NORMAL = 1, diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c index 4d9f83d3b38..05d92f878d9 100644 --- a/arch/arm/mach-meson/sm.c +++ b/arch/arm/mach-meson/sm.c @@ -78,7 +78,6 @@ ssize_t meson_sm_write_efuse(uintptr_t offset, void *buffer, size_t size) #define SM_CHIP_ID_LENGTH 119 #define SM_CHIP_ID_OFFSET 4 -#define SM_CHIP_ID_SIZE 12 int meson_sm_get_serial(void *buffer, size_t size) { @@ -101,6 +100,37 @@ int meson_sm_get_serial(void *buffer, size_t size) return 0; } +int meson_sm_get_chip_id(void *buffer, size_t size) +{ + struct udevice *dev; + struct pt_regs regs = { 0 }; + u8 id_buffer[SM_CHIP_ID_LENGTH]; + int err; + + dev = meson_get_sm_device(); + if (IS_ERR(dev)) + return PTR_ERR(dev); + + regs.regs[1] = 2; + err = sm_call_read(dev, id_buffer, SM_CHIP_ID_LENGTH, + MESON_SMC_CMD_CHIP_ID_GET, &regs); + + if (err < 0) { + pr_err("Failed to read chipid (%d)\n", err); + return err; + } + + if (((u32 *)id_buffer)[0] != 2) { + pr_err("Failed to read chipid: invalid chipid call version\n"); + return -EINVAL; + } + + memcpy(buffer, id_buffer + SM_CHIP_ID_OFFSET, + size > SM_CHIP_ID_LENGTH ? SM_CHIP_ID_LENGTH : size); + + return 0; +} + #define AO_SEC_SD_CFG15 0xfc #define REBOOT_REASON_MASK GENMASK(15, 12) diff --git a/cmd/meson/sm.c b/cmd/meson/sm.c index b69f8123ee2..21bfa58e507 100644 --- a/cmd/meson/sm.c +++ b/cmd/meson/sm.c @@ -33,6 +33,24 @@ static int do_sm_serial(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_SUCCESS; } +static int do_sm_chip_id(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + ulong address; + int ret; + + if (argc < 2) + return CMD_RET_USAGE; + + address = simple_strtoul(argv[1], NULL, 0); + + ret = meson_sm_get_chip_id((void *)address, SM_CHIP_ID_SIZE); + if (ret) + return CMD_RET_FAILURE; + + return CMD_RET_SUCCESS; +} + #define MAX_REBOOT_REASONS 14 static const char *reboot_reasons[MAX_REBOOT_REASONS] = { @@ -154,6 +172,7 @@ free_buffer: static struct cmd_tbl cmd_sm_sub[] = { U_BOOT_CMD_MKENT(serial, 2, 1, do_sm_serial, "", ""), + U_BOOT_CMD_MKENT(chipid, 2, 1, do_sm_chip_id, "", ""), U_BOOT_CMD_MKENT(reboot_reason, 1, 1, do_sm_reboot_reason, "", ""), U_BOOT_CMD_MKENT(efuseread, 4, 1, do_efuse_read, "", ""), U_BOOT_CMD_MKENT(efusewrite, 4, 0, do_efuse_write, "", ""), @@ -183,7 +202,8 @@ static int do_sm(struct cmd_tbl *cmdtp, int flag, int argc, U_BOOT_CMD( sm, 5, 0, do_sm, "Secure Monitor Control", - "serial <address> - read chip unique id to memory address\n" + "serial <address> - read chip unique serial to memory address\n" + "sm chipid <address> - read unique chip id to memory address\n" "sm reboot_reason [name] - get reboot reason and store to environment\n" "sm efuseread <offset> <size> <address> - read efuse to memory address\n" "sm efusewrite <offset> <size> <address> - write into efuse from memory address\n" -- 2.48.1

1 0

[PATCH 0/3] fdt_support: improve board_fdt_chosen_bootargs() for flexibility
by Dmitry Rokosov 17 Jan '25

17 Jan '25

This series consists of three patches. The first patch modifies the function documentation style in the include/fdt_support.h file to comply with kernel-doc requirements. The second patch modifies the board_fdt_chosen_bootargs() function to return a const char* type. This change clarifies to the caller that the returned string should neither be freed nor modified. It aligns with the existing fdt_setprop() function, which already utilizes a const char* parameter. This promotes consistency within the codebase and enhances code safety by preventing unintended modifications to the returned string. The third patch addresses the need for flexibility in providing kernel command line arguments (bootargs) for different kernel images within the same U-Boot environment. It introduces a read-only (RO) fdt_property argument to the board_fdt_chosen_bootargs() function, allowing access to the original chosen/bootargs data. This is crucial for scenarios where different kernel versions require distinct console setups (e.g., ttyS0 for vendor kernels and ttyAML0 for upstream kernels). By enabling board developers to either merge or replace the original bootargs, this patch enhances the configurability of U-Boot for various kernel images without relying on outdated configurations like CMDLINE_EXTEND. CI/CD results: https://github.com/u-boot/u-boot/pull/716/checks Signed-off-by: Dmitry Rokosov <ddrokosov(a)salutedevices.com> --- Dmitry Rokosov (3): include/fdt_support: fix docstyle to comply with kernel-doc requirements fdt_support: board_fdt_chosen_bootargs() should return const char* common: fdt: hand over original fdt bootargs into board chosen handler boot/fdt_support.c | 7 +- include/fdt_support.h | 173 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 107 insertions(+), 73 deletions(-) --- base-commit: 69bd83568c57813cd23bc2d100c066a17e7e349d change-id: 20241219-board_fdt_chosen_bootargs_improvements-7646b2029ba7 Best regards, -- Dmitry Rokosov <ddrokosov(a)salutedevices.com>

5 12

[U-Boot][PATCH v2 0/3] Improve fpga cmd usage information
by Ibai Erkiaga 17 Jan '25

17 Jan '25

Current usage information is not read friendly specially when all the options are selected. This series fix some of the issues in the info, aligment and overlapping issues, excess of verbosity on the loads... Additionally Xilinx exclusive command dependencies are included to remove text stating Xilinx Only The output looks like this now: fpga - loadable FPGA image support Usage: fpga info [dev] List known device information fpga dump <dev> <address> <size> Load device to memory buffer fpga load <dev> <address> <size> Load device from memory buffer fpga loadb <dev> <address> <size> Load device from bitstream buffer fpga loadp <dev> <address> <size> Load device from memory buffer with partial bitstream fpga loadbp <dev> <address> <size> Load device from bitstream buffer with partial bitstream fpga loadfs <dev> <address> <size> <blocksize> <interface> [<dev[:part]>] <filename> Load device from filesystem (FAT by default) fpga loadmk <dev> <address> Load device generated with mkimage NOTE: loadmk operating on FIT must include subimage unit name in the form of addr:<subimg_uname> fpga loads <dev> <address> <size> <authflag> <encflag> [Userkey address] Load device from memory buffer with secure bistream (authenticated/encrypted/both) -authflag: 0 for OCM, 1 for DDR, 2 for no authentication (specifies where to perform authentication) -encflag: 0 for device key, 1 for user key, 2 for no encryption -Userkey address: address where user key is stored NOTE: secure bitstream has to be created using Xilinx bootgen tool Changes in v2: - Tabs replaced by spaces - fpga command added on each option similar to other commands like sf - Dependencies to Xilinx only commands added in Kconfig Ibai Erkiaga (3): fpga: fix alignment on fpga cmd usage info fpga: improve loads usage information fpga: xilinx exclusive commands info cmd/Kconfig | 32 +++++++++++++++++++------------ cmd/fpga.c | 55 +++++++++++++++++++++-------------------------------- 2 files changed, 42 insertions(+), 45 deletions(-) -- 2.42.0.325.g3a06386e31

2 4

[PATCH 1/1] efi_loader: use LOGC_EFI consistently
by Heinrich Schuchardt 17 Jan '25

17 Jan '25

The log category should be LOGC_EFI all over the EFI sub-system. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_driver/efi_block_device.c | 2 ++ lib/efi_driver/efi_uclass.c | 2 ++ lib/efi_loader/efi_acpi.c | 2 ++ lib/efi_loader/efi_boottime.c | 2 ++ lib/efi_loader/efi_conformance.c | 2 ++ lib/efi_loader/efi_device_path_to_text.c | 2 ++ lib/efi_loader/efi_device_path_utilities.c | 2 ++ lib/efi_loader/efi_dt_fixup.c | 2 ++ lib/efi_loader/efi_esrt.c | 2 ++ lib/efi_loader/efi_fdt.c | 2 ++ lib/efi_loader/efi_file.c | 2 ++ lib/efi_loader/efi_firmware.c | 2 ++ lib/efi_loader/efi_gop.c | 2 ++ lib/efi_loader/efi_helper.c | 1 + lib/efi_loader/efi_hii.c | 2 ++ lib/efi_loader/efi_hii_config.c | 2 ++ lib/efi_loader/efi_http.c | 2 ++ lib/efi_loader/efi_ipconfig.c | 2 ++ lib/efi_loader/efi_load_initrd.c | 1 + lib/efi_loader/efi_net.c | 2 ++ lib/efi_loader/efi_riscv.c | 1 + lib/efi_loader/efi_root_node.c | 2 ++ lib/efi_loader/efi_runtime.c | 2 ++ lib/efi_loader/efi_signature.c | 2 ++ lib/efi_loader/efi_string.c | 2 ++ lib/efi_loader/efi_tcg2.c | 1 + lib/efi_loader/efi_unicode_collation.c | 2 ++ lib/efi_loader/efi_var_common.c | 2 ++ lib/efi_loader/efi_var_mem.c | 2 ++ lib/efi_loader/efi_variable_tee.c | 2 ++ lib/efi_loader/efi_watchdog.c | 2 ++ 31 files changed, 58 insertions(+) diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index 19a5ee24794..d3c668dc183 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -28,6 +28,8 @@ * iPXE uses the simple file protocol to load Grub or the Linux Kernel. */ +#define LOG_CATEGORY LOGC_EFI + #include <blk.h> #include <dm.h> #include <efi_driver.h> diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c index e1e28df20b2..495be53cb77 100644 --- a/lib/efi_driver/efi_uclass.c +++ b/lib/efi_driver/efi_uclass.c @@ -17,6 +17,8 @@ * controllers. */ +#define LOG_CATEGORY LOGC_EFI + #include <dm.h> #include <efi_driver.h> #include <log.h> diff --git a/lib/efi_loader/efi_acpi.c b/lib/efi_loader/efi_acpi.c index 67bd7f8ca24..c1cc6e7b311 100644 --- a/lib/efi_loader/efi_acpi.c +++ b/lib/efi_loader/efi_acpi.c @@ -5,6 +5,8 @@ * Copyright (C) 2018, Bin Meng <bmeng.cn(a)gmail.com> */ +#define LOG_CATEGORY LOGC_EFI + #include <efi_loader.h> #include <log.h> #include <mapmem.h> diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index ccbaad2b549..9f51db90f33 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -5,6 +5,8 @@ * Copyright (c) 2016 Alexander Graf */ +#define LOG_CATEGORY LOGC_EFI + #include <bootm.h> #include <div64.h> #include <dm/device.h> diff --git a/lib/efi_loader/efi_conformance.c b/lib/efi_loader/efi_conformance.c index 167067e26cd..2bae93a94bd 100644 --- a/lib/efi_loader/efi_conformance.c +++ b/lib/efi_loader/efi_conformance.c @@ -5,6 +5,8 @@ * Copyright (C) 2022 Arm Ltd. */ +#define LOG_CATEGORY LOGC_EFI + #include <efi_loader.h> #include <log.h> #include <efi_api.h> diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c index 481a9712d9d..f6889cb7399 100644 --- a/lib/efi_loader/efi_device_path_to_text.c +++ b/lib/efi_loader/efi_device_path_to_text.c @@ -5,6 +5,8 @@ * Copyright (c) 2017 Heinrich Schuchardt */ +#define LOG_CATEGORY LOGC_EFI + #include <blk.h> #include <efi_loader.h> #include <malloc.h> diff --git a/lib/efi_loader/efi_device_path_utilities.c b/lib/efi_loader/efi_device_path_utilities.c index ac250bbfcc9..552c5bb1f05 100644 --- a/lib/efi_loader/efi_device_path_utilities.c +++ b/lib/efi_loader/efi_device_path_utilities.c @@ -5,6 +5,8 @@ * Copyright (c) 2017 Leif Lindholm */ +#define LOG_CATEGORY LOGC_EFI + #include <efi_loader.h> const efi_guid_t efi_guid_device_path_utilities_protocol = diff --git a/lib/efi_loader/efi_dt_fixup.c b/lib/efi_loader/efi_dt_fixup.c index 0dac94b0c6c..26928cfc454 100644 --- a/lib/efi_loader/efi_dt_fixup.c +++ b/lib/efi_loader/efi_dt_fixup.c @@ -5,6 +5,8 @@ * Copyright (c) 2020 Heinrich Schuchardt */ +#define LOG_CATEGORY LOGC_EFI + #include <efi_dt_fixup.h> #include <efi_loader.h> #include <efi_rng.h> diff --git a/lib/efi_loader/efi_esrt.c b/lib/efi_loader/efi_esrt.c index 443bd999ce1..e235c8fe91c 100644 --- a/lib/efi_loader/efi_esrt.c +++ b/lib/efi_loader/efi_esrt.c @@ -5,6 +5,8 @@ * Copyright (C) 2021 Arm Ltd. */ +#define LOG_CATEGORY LOGC_EFI + #include <efi_loader.h> #include <log.h> #include <efi_api.h> diff --git a/lib/efi_loader/efi_fdt.c b/lib/efi_loader/efi_fdt.c index f882622fdad..1ba6641d821 100644 --- a/lib/efi_loader/efi_fdt.c +++ b/lib/efi_loader/efi_fdt.c @@ -6,6 +6,8 @@ * Written by Simon Glass <sjg(a)chromium.org> */ +#define LOG_CATEGORY LOGC_EFI + #include <efi_loader.h> #include <env.h> #include <errno.h> diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index 95b3c890ee9..201fa5f8f3c 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -5,6 +5,8 @@ * Copyright (c) 2017 Rob Clark */ +#define LOG_CATEGORY LOGC_EFI + #include <charset.h> #include <efi_loader.h> #include <log.h> diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c index 112775daf4c..5a754c9cd03 100644 --- a/lib/efi_loader/efi_firmware.c +++ b/lib/efi_loader/efi_firmware.c @@ -6,6 +6,8 @@ * Author: AKASHI Takahiro */ +#define LOG_CATEGORY LOGC_EFI + #include <charset.h> #include <dfu.h> #include <efi_loader.h> diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c index 41e12fa7246..4593975be5a 100644 --- a/lib/efi_loader/efi_gop.c +++ b/lib/efi_loader/efi_gop.c @@ -5,6 +5,8 @@ * Copyright (c) 2016 Alexander Graf */ +#define LOG_CATEGORY LOGC_EFI + #include <dm.h> #include <efi_loader.h> #include <log.h> diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c index bf96f61d3d0..04b2efc4a3b 100644 --- a/lib/efi_loader/efi_helper.c +++ b/lib/efi_loader/efi_helper.c @@ -4,6 +4,7 @@ */ #define LOG_CATEGORY LOGC_EFI + #include <bootm.h> #include <env.h> #include <image.h> diff --git a/lib/efi_loader/efi_hii.c b/lib/efi_loader/efi_hii.c index 74e402df1b8..44235970a7c 100644 --- a/lib/efi_loader/efi_hii.c +++ b/lib/efi_loader/efi_hii.c @@ -6,6 +6,8 @@ * Copyright (c) 2018 AKASHI Takahiro, Linaro Limited */ +#define LOG_CATEGORY LOGC_EFI + #include <efi_loader.h> #include <malloc.h> #include <asm/unaligned.h> diff --git a/lib/efi_loader/efi_hii_config.c b/lib/efi_loader/efi_hii_config.c index 54a72d573be..521481a86d8 100644 --- a/lib/efi_loader/efi_hii_config.c +++ b/lib/efi_loader/efi_hii_config.c @@ -6,6 +6,8 @@ * Copyright (c) 2018 AKASHI Takahiro, Linaro Limited */ +#define LOG_CATEGORY LOGC_EFI + #include <efi_loader.h> const efi_guid_t efi_guid_hii_config_routing_protocol diff --git a/lib/efi_loader/efi_http.c b/lib/efi_loader/efi_http.c index 694e1993418..88816256b03 100644 --- a/lib/efi_loader/efi_http.c +++ b/lib/efi_loader/efi_http.c @@ -7,6 +7,8 @@ * IP4_CONFIG2_PROTOCOL */ +#define LOG_CATEGORY LOGC_EFI + #include <charset.h> #include <efi_loader.h> #include <image.h> diff --git a/lib/efi_loader/efi_ipconfig.c b/lib/efi_loader/efi_ipconfig.c index 0b247a4c028..f1c092daafd 100644 --- a/lib/efi_loader/efi_ipconfig.c +++ b/lib/efi_loader/efi_ipconfig.c @@ -4,6 +4,8 @@ * */ +#define LOG_CATEGORY LOGC_EFI + #include <efi_loader.h> #include <image.h> #include <malloc.h> diff --git a/lib/efi_loader/efi_load_initrd.c b/lib/efi_loader/efi_load_initrd.c index 23508431c83..fb8cc7bcbe3 100644 --- a/lib/efi_loader/efi_load_initrd.c +++ b/lib/efi_loader/efi_load_initrd.c @@ -4,6 +4,7 @@ */ #define LOG_CATEGORY LOGC_EFI + #include <efi_loader.h> #include <efi_load_initrd.h> #include <efi_variable.h> diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c index 67593ef50c0..ce9272fa240 100644 --- a/lib/efi_loader/efi_net.c +++ b/lib/efi_loader/efi_net.c @@ -15,6 +15,8 @@ * Reset(): EfiSimpleNetworkInitialized -> EfiSimpleNetworkInitialized */ +#define LOG_CATEGORY LOGC_EFI + #include <efi_loader.h> #include <dm.h> #include <linux/sizes.h> diff --git a/lib/efi_loader/efi_riscv.c b/lib/efi_loader/efi_riscv.c index 4d398c5be34..6f2ccf4f7e6 100644 --- a/lib/efi_loader/efi_riscv.c +++ b/lib/efi_loader/efi_riscv.c @@ -7,6 +7,7 @@ */ #define LOG_CATEGORY LOGC_EFI + #include <efi_loader.h> #include <efi_variable.h> #include <log.h> diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c index 426f77cb2ad..e5246f65df2 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -5,6 +5,8 @@ * Copyright (c) 2018 Heinrich Schuchardt */ +#define LOG_CATEGORY LOGC_EFI + #include <malloc.h> #include <efi_dt_fixup.h> #include <efi_loader.h> diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index 05369c47b01..35eb6a77766 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -5,6 +5,8 @@ * Copyright (c) 2016 Alexander Graf */ +#define LOG_CATEGORY LOGC_EFI + #include <command.h> #include <cpu_func.h> #include <dm.h> diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c index 184eac8cddb..93a4f257016 100644 --- a/lib/efi_loader/efi_signature.c +++ b/lib/efi_loader/efi_signature.c @@ -4,6 +4,8 @@ * Copyright (c) 2019 Linaro Limited, Author: AKASHI Takahiro */ +#define LOG_CATEGORY LOGC_EFI + #include <charset.h> #include <efi_loader.h> #include <efi_variable.h> diff --git a/lib/efi_loader/efi_string.c b/lib/efi_loader/efi_string.c index 413e329b600..50d1daf33a9 100644 --- a/lib/efi_loader/efi_string.c +++ b/lib/efi_loader/efi_string.c @@ -5,6 +5,8 @@ * Copyright (c) 2020 AKASHI Takahiro, Linaro Limited */ +#define LOG_CATEGORY LOGC_EFI + #include <charset.h> #include <efi_loader.h> #include <malloc.h> diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index a15c73162ee..c697b53441a 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -8,6 +8,7 @@ */ #define LOG_CATEGORY LOGC_EFI + #include <dm.h> #include <efi_loader.h> #include <efi_variable.h> diff --git a/lib/efi_loader/efi_unicode_collation.c b/lib/efi_loader/efi_unicode_collation.c index d48700a352b..df2a988ee39 100644 --- a/lib/efi_loader/efi_unicode_collation.c +++ b/lib/efi_loader/efi_unicode_collation.c @@ -5,6 +5,8 @@ * Copyright (c) 2018 Heinrich Schuchardt <xypron.glpk(a)gmx.de> */ +#define LOG_CATEGORY LOGC_EFI + #include <charset.h> #include <cp1250.h> #include <cp437.h> diff --git a/lib/efi_loader/efi_var_common.c b/lib/efi_loader/efi_var_common.c index ea8d2a4cf98..4b34a58b4cf 100644 --- a/lib/efi_loader/efi_var_common.c +++ b/lib/efi_loader/efi_var_common.c @@ -5,6 +5,8 @@ * Copyright (c) 2020 Linaro Limited, Author: AKASHI Takahiro */ +#define LOG_CATEGORY LOGC_EFI + #include <efi_loader.h> #include <efi_variable.h> #include <stdlib.h> diff --git a/lib/efi_loader/efi_var_mem.c b/lib/efi_loader/efi_var_mem.c index 139e16aad7c..b265d95dd6b 100644 --- a/lib/efi_loader/efi_var_mem.c +++ b/lib/efi_loader/efi_var_mem.c @@ -5,6 +5,8 @@ * Copyright (c) 2020, Heinrich Schuchardt */ +#define LOG_CATEGORY LOGC_EFI + #include <efi_loader.h> #include <efi_variable.h> #include <u-boot/crc.h> diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c index 8b6b0a39086..0d090d051dd 100644 --- a/lib/efi_loader/efi_variable_tee.c +++ b/lib/efi_loader/efi_variable_tee.c @@ -10,6 +10,8 @@ * Abdellatif El Khlifi <abdellatif.elkhlifi(a)arm.com> */ +#define LOG_CATEGORY LOGC_EFI + #if CONFIG_IS_ENABLED(ARM_FFA_TRANSPORT) #include <arm_ffa.h> #endif diff --git a/lib/efi_loader/efi_watchdog.c b/lib/efi_loader/efi_watchdog.c index f5fb9117717..c21d8086074 100644 --- a/lib/efi_loader/efi_watchdog.c +++ b/lib/efi_loader/efi_watchdog.c @@ -5,6 +5,8 @@ * Copyright (c) 2017 Heinrich Schuchardt */ +#define LOG_CATEGORY LOGC_EFI + #include <efi_loader.h> /* Conversion factor from seconds to multiples of 100ns */ -- 2.47.1

2 1

[PATCH v2 0/5] efi_loader: Fix section alignment on EFI binaries
by Heinrich Schuchardt 17 Jan '25

17 Jan '25

When creating EFI binaries, the alignment of the text section isn't correctly factored in. As a result trying to load signed EFI binaries throws an error with: efi_image_region_add() efi_image_region_add: new region already part of another Image not authenticated Except for the fixing each linker script individually carve out a linker script include for ARM and RISC-V. Correct SizeOfCode and SizeOfInitializedData. v2: Correct SizeOfCode and SizeOfInitializedData. Heinrich Schuchardt (3): scripts/Makefile.lib: add -L option to LD command for EFI binaries efi_loader: use INCLUDE in EFI linker scripts efi_loader: use include in ARM EFI linker script Heinrich Schuchardt (4): scripts/Makefile.lib: add -L option to LD command for EFI binaries efi_loader: use INCLUDE in EFI linker scripts efi_loader: correct SizeOfCode, SizeOfInitializedData efi_loader: use include in ARM EFI linker script Ilias Apalodimas (1): efi_loader: Fix section alignment on EFI binaries arch/arm/lib/crt0_aarch64_efi.S | 2 +- arch/arm/lib/crt0_arm_efi.S | 13 +++--- arch/arm/lib/elf_aarch64_efi.lds | 68 +-------------------------- arch/arm/lib/elf_arm_efi.lds | 71 +--------------------------- arch/riscv/lib/crt0_riscv_efi.S | 4 +- arch/riscv/lib/elf_riscv32_efi.lds | 68 +-------------------------- arch/riscv/lib/elf_riscv64_efi.lds | 68 +-------------------------- lib/efi_loader/elf_efi.ldsi | 74 ++++++++++++++++++++++++++++++ scripts/Makefile.lib | 4 +- 9 files changed, 90 insertions(+), 282 deletions(-) create mode 100644 lib/efi_loader/elf_efi.ldsi -- 2.47.1

2 7

[PATCH 0/7] board: samsung: e850-96: Enable Standard Boot
by Sam Protsenko 17 Jan '25

17 Jan '25

Make all necessary configuration and environment changes to enable Standard Boot on E850-96 board. Also rework LDFW firmware loading code to look for LDFW binary on EFI System Partition instead of dedicated 'ldfw' partition. Pending "[RFC PATCH 1/1] efi_loader: Call efi_init_early() even earlier" patch is needed to make EFI functional on E850-96, but this series does not depend on it and can be applied independently. [1] https://lists.denx.de/pipermail/u-boot/2025-January/577194.html Sam Protsenko (7): configs: e850-96: Enable options for updated env configs: e850-96: Enable U-Boot environment on eMMC configs: e850-96: Enable more EFI features configs: e850-96: Enable Standard Boot board: samsung: e850-96: Load LDFW from EFI partition board: samsung: e850-96: Report LDFW loading failures board: samsung: e850-96: Provide bootstd default env board/samsung/e850-96/e850-96.c | 7 ++++- board/samsung/e850-96/e850-96.env | 37 ++++++++----------------- board/samsung/e850-96/fw.c | 45 ++++++++++++++++++++++++++----- configs/e850-96_defconfig | 23 +++++++++++++--- 4 files changed, 75 insertions(+), 37 deletions(-) -- 2.39.5

2 8

[PATCH v3 0/6] imx8(m): add optee node to binman FIT image
by Yannic Moog 17 Jan '25

17 Jan '25

There have been attempts to get op-tee node integrated upstream in the past [1][2]. The challenge is on how to handle the load and entry addresses where the op-tee image should be loaded to. Different SoC families and architectures have different RAM base addresses. Further the final addresses can vary from board to board (e.g. depending on populated RAM size). This approach follows the TI k3 kconfig solution. To be able to define a sensible default for the new config option, put it in the imx8m kconfig. For other imx families, the RAM start addresses are different and thus finding a common sensible default is not possible. I do not have a working Nano and quad board so I was not able to test them. I included usage for PHYTEC boards for examples (with documentation). [1] https://patchwork.ozlabs.org/project/uboot/patch/20230622173006.3921891-1-t… [2] https://patchwork.ozlabs.org/project/uboot/patch/ZeHDVr-Bzm935-5N@mecka.net/ --- Changes in v3: - use OPTEE_LOAD_ADDR defaults as defined in upstream tf-a - add imx8mq (untested) - move common PHYTEC imx8mm optee build doc into include file Changes in v2 (from RFC): - Use kconfig instead of trying pure dt approach. - Add load addresses in defconfigs instead of <board>-u-boot dts. --- Yannic Moog (6): arm: imx8m: add OP-TEE node phycore-imx8mp_defconfig: add optee load address imx8mm-phygate-tauri-l_defconfig: add optee load address phycore-imx8mm_defconfig: add optee load address doc: phytec: imx8mp: add OP-TEE documentation doc: phytec: imx8mm: add OP-TEE documentation arch/arm/dts/imx8mm-u-boot.dtsi | 17 ++++++++++++++++- arch/arm/dts/imx8mn-u-boot.dtsi | 17 ++++++++++++++++- arch/arm/dts/imx8mp-u-boot.dtsi | 17 ++++++++++++++++- arch/arm/dts/imx8mq-u-boot.dtsi | 17 ++++++++++++++++- arch/arm/mach-imx/imx8m/Kconfig | 11 +++++++++++ board/phytec/phycore_imx8mm/MAINTAINERS | 1 + configs/imx8mm-phygate-tauri-l_defconfig | 1 + configs/phycore-imx8mm_defconfig | 1 + configs/phycore-imx8mp_defconfig | 1 + doc/board/phytec/imx8mm-optee-build.rsti | 14 ++++++++++++++ doc/board/phytec/imx8mm-phygate-tauri-l.rst | 9 ++++++++- doc/board/phytec/phycore-imx8mm.rst | 8 +++++++- doc/board/phytec/phycore-imx8mp.rst | 20 +++++++++++++++++++- 13 files changed, 127 insertions(+), 7 deletions(-) --- base-commit: 6016960ceb9d3fda591cda94df3841748fb65596 change-id: 20240903-phytec_imx8m_optee-8674ef012a36 Best regards, -- Yannic Moog <y.moog(a)phytec.de>

4 12

[PATCH 0/3] log: enable filtering on functions
by Heinrich Schuchardt 17 Jan '25

17 Jan '25

Up to now we could only use log level, category, and file for filtering. In the UEFI sub-system event handling functions which are called at a very high frequency are in the same files as other functions of interest. Filtering on file level is too coarse for generating useful debug output. Allow filtering on a list of functions and add unit tests. (Resending as mail did not reach the U-Boot list.) Heinrich Schuchardt (3): log: make log_has_file() static log: enable filtering on functions test/log: test function filters cmd/log.c | 42 ++++++++++++----------- common/log.c | 33 ++++++++++++++---- include/log.h | 17 ++-------- test/log/log_filter.c | 1 - test/log/log_test.c | 78 +++++++++++++++++++++++++++++++++---------- 5 files changed, 112 insertions(+), 59 deletions(-) -- 2.47.1

1 4

[PATCH] imx8m: Guard binman nodes with CONFIG_OPTEE
by Fabio Estevam 17 Jan '25

17 Jan '25

From: Fabio Estevam <festevam(a)denx.de> Guard binman nodes with CONFIG_OPTEE to fix the following error when building without optee support: BINMAN .binman_stamp Image 'image' has faked external blobs and is non-functional: tee.bin Image 'image' is missing optional external blobs but is still functional: tee-os /binman/section/fit/images/tee/tee-os (tee.bin): See the documentation for your board. You may need to build Open Portable Trusted Execution Environment (OP-TEE) and build with TEE=/path/to/tee.bin Some images are invalid make: *** [Makefile:1135: .binman_stamp] Error 103 Reported-by: Tim Harvey <tharvey(a)gateworks.com> Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- arch/arm/dts/imx8mm-u-boot.dtsi | 2 ++ arch/arm/dts/imx8mn-u-boot.dtsi | 2 ++ arch/arm/dts/imx8mp-u-boot.dtsi | 2 ++ arch/arm/dts/imx8mq-u-boot.dtsi | 2 ++ 4 files changed, 8 insertions(+) diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi index ecc2319279ea..f1cc3fd2532b 100644 --- a/arch/arm/dts/imx8mm-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-u-boot.dtsi @@ -164,6 +164,7 @@ }; #endif +#ifdef CONFIG_OPTEE tee: tee { description = "OP-TEE"; type = "tee"; @@ -178,6 +179,7 @@ optional; }; }; +#endif binman_fip: fip { arch = "arm64"; diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi index 4a4498b36b01..08a81ddc9cb2 100644 --- a/arch/arm/dts/imx8mn-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-u-boot.dtsi @@ -240,6 +240,7 @@ }; #endif +#ifdef CONFIG_OPTEE tee: tee { description = "OP-TEE"; type = "tee"; @@ -254,6 +255,7 @@ optional; }; }; +#endif binman_fip: fip { arch = "arm64"; diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi index 9ede98a11e42..55be8e4f7cb0 100644 --- a/arch/arm/dts/imx8mp-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -185,6 +185,7 @@ }; #endif +#ifdef CONFIG_OPTEE tee: tee { description = "OP-TEE"; type = "tee"; @@ -199,6 +200,7 @@ optional; }; }; +#endif @fdt-SEQ { description = "NAME"; diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi index 93e2ef27f7ce..cdeacbac108b 100644 --- a/arch/arm/dts/imx8mq-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-u-boot.dtsi @@ -144,6 +144,7 @@ }; #endif +#ifdef CONFIG_OPTEE tee: tee { description = "OP-TEE"; type = "tee"; @@ -158,6 +159,7 @@ optional; }; }; +#endif fdt { compression = "none"; -- 2.34.1

3 2

[PATCH v1] riscv: dts: starfive: split out visionfive2 target specific configuration
by E Shattow 16 Jan '25

16 Jan '25

Split out StarFive VisionFive2 multi-board target specific configuration into starfive-visionfive2-binman.dtsi in preparation for removal of jh7110-u-boot and jh7110-common-u-boot in part or whole as sent upstream. Signed-off-by: E Shattow <e(a)freeshell.de> --- arch/riscv/dts/jh7110-common-u-boot.dtsi | 95 ---------------- arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi | 1 + .../dts/jh7110-pine64-star64-u-boot.dtsi | 1 + ...10-starfive-visionfive-2-v1.2a-u-boot.dtsi | 1 + ...10-starfive-visionfive-2-v1.3b-u-boot.dtsi | 1 + .../dts/starfive-visionfive2-binman.dtsi | 102 ++++++++++++++++++ 6 files changed, 106 insertions(+), 95 deletions(-) create mode 100644 arch/riscv/dts/starfive-visionfive2-binman.dtsi diff --git a/arch/riscv/dts/jh7110-common-u-boot.dtsi b/arch/riscv/dts/jh7110-common-u-boot.dtsi index 7871294e90d..6d85b2d91a7 100644 --- a/arch/riscv/dts/jh7110-common-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-common-u-boot.dtsi @@ -3,7 +3,6 @@ * Copyright (C) 2023 StarFive Technology Co., Ltd. */ -#include "binman.dtsi" #include "jh7110-u-boot.dtsi" / { aliases { @@ -19,11 +18,6 @@ bootph-pre-ram; }; - config { - bootph-pre-ram; - u-boot,spl-payload-offset = <0x100000>; - }; - memory@40000000 { bootph-pre-ram; }; @@ -104,92 +98,3 @@ pagesize = <16>; }; }; - -&binman { - itb { - fit { - images { - fdt-jh7110-milkv-mars { - description = "jh7110-milkv-mars"; - load = <0x40400000>; - compression = "none"; - - blob-ext { - filename = "dts/upstream/src/riscv/starfive/jh7110-milkv-mars.dtb"; - }; - }; - - fdt-jh7110-pine64-star64 { - description = "jh7110-pine64-star64"; - load = <0x40400000>; - compression = "none"; - - blob-ext { - filename = "dts/upstream/src/riscv/starfive/jh7110-pine64-star64.dtb"; - }; - }; - - fdt-jh7110-starfive-visionfive-2-v1.2a { - description = "jh7110-starfive-visionfive-2-v1.2a"; - load = <0x40400000>; - compression = "none"; - - blob-ext { - filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.2a.dtb"; - }; - }; - - fdt-jh7110-starfive-visionfive-2-v1.3b { - description = "jh7110-starfive-visionfive-2-v1.3b"; - load = <0x40400000>; - compression = "none"; - - blob-ext { - filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb"; - }; - }; - }; - - configurations { - conf-jh7110-milkv-mars { - description = "jh7110-milkv-mars"; - firmware = "opensbi"; - loadables = "uboot"; - fdt = "fdt-jh7110-milkv-mars"; - }; - - conf-jh7110-pine64-star64 { - description = "jh7110-pine64-star64"; - firmware = "opensbi"; - loadables = "uboot"; - fdt = "fdt-jh7110-pine64-star64"; - }; - - conf-jh7110-starfive-visionfive-2-v1.2a { - description = "jh7110-starfive-visionfive-2-v1.2a"; - firmware = "opensbi"; - loadables = "uboot"; - fdt = "fdt-jh7110-starfive-visionfive-2-v1.2a"; - }; - - conf-jh7110-starfive-visionfive-2-v1.3b { - description = "jh7110-starfive-visionfive-2-v1.3b"; - firmware = "opensbi"; - loadables = "uboot"; - fdt = "fdt-jh7110-starfive-visionfive-2-v1.3b"; - }; - }; - }; - }; - - spl-img { - filename = "spl/u-boot-spl.bin.normal.out"; - - mkimage { - args = "-T sfspl"; - - u-boot-spl { - }; - }; - }; -}; diff --git a/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi b/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi index 9df1e5db553..ab882d07f6f 100644 --- a/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-milkv-mars-u-boot.dtsi @@ -4,3 +4,4 @@ */ #include "jh7110-common-u-boot.dtsi" +#include "starfive-visionfive2-binman.dtsi" diff --git a/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi b/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi index 9df1e5db553..ab882d07f6f 100644 --- a/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-pine64-star64-u-boot.dtsi @@ -4,3 +4,4 @@ */ #include "jh7110-common-u-boot.dtsi" +#include "starfive-visionfive2-binman.dtsi" diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi index 9df1e5db553..ab882d07f6f 100644 --- a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi @@ -4,3 +4,4 @@ */ #include "jh7110-common-u-boot.dtsi" +#include "starfive-visionfive2-binman.dtsi" diff --git a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi index e6bc6630dcd..874074174ff 100644 --- a/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi +++ b/arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi @@ -4,3 +4,4 @@ */ #include "jh7110-common-u-boot.dtsi" +#include "starfive-visionfive2-binman.dtsi" diff --git a/arch/riscv/dts/starfive-visionfive2-binman.dtsi b/arch/riscv/dts/starfive-visionfive2-binman.dtsi new file mode 100644 index 00000000000..4cce001e80d --- /dev/null +++ b/arch/riscv/dts/starfive-visionfive2-binman.dtsi @@ -0,0 +1,102 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2023 StarFive Technology Co., Ltd. + */ + +#include "binman.dtsi" + +/ { + config { + bootph-pre-ram; + u-boot,spl-payload-offset = <0x100000>; + }; +}; + +&binman { + itb { + fit { + images { + fdt-jh7110-milkv-mars { + description = "jh7110-milkv-mars"; + load = <0x40400000>; + compression = "none"; + + blob-ext { + filename = "dts/upstream/src/riscv/starfive/jh7110-milkv-mars.dtb"; + }; + }; + + fdt-jh7110-pine64-star64 { + description = "jh7110-pine64-star64"; + load = <0x40400000>; + compression = "none"; + + blob-ext { + filename = "dts/upstream/src/riscv/starfive/jh7110-pine64-star64.dtb"; + }; + }; + + fdt-jh7110-starfive-visionfive-2-v1.2a { + description = "jh7110-starfive-visionfive-2-v1.2a"; + load = <0x40400000>; + compression = "none"; + + blob-ext { + filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.2a.dtb"; + }; + }; + + fdt-jh7110-starfive-visionfive-2-v1.3b { + description = "jh7110-starfive-visionfive-2-v1.3b"; + load = <0x40400000>; + compression = "none"; + + blob-ext { + filename = "dts/upstream/src/riscv/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb"; + }; + }; + }; + + configurations { + conf-jh7110-milkv-mars { + description = "jh7110-milkv-mars"; + firmware = "opensbi"; + loadables = "uboot"; + fdt = "fdt-jh7110-milkv-mars"; + }; + + conf-jh7110-pine64-star64 { + description = "jh7110-pine64-star64"; + firmware = "opensbi"; + loadables = "uboot"; + fdt = "fdt-jh7110-pine64-star64"; + }; + + conf-jh7110-starfive-visionfive-2-v1.2a { + description = "jh7110-starfive-visionfive-2-v1.2a"; + firmware = "opensbi"; + loadables = "uboot"; + fdt = "fdt-jh7110-starfive-visionfive-2-v1.2a"; + }; + + conf-jh7110-starfive-visionfive-2-v1.3b { + description = "jh7110-starfive-visionfive-2-v1.3b"; + firmware = "opensbi"; + loadables = "uboot"; + fdt = "fdt-jh7110-starfive-visionfive-2-v1.3b"; + }; + }; + }; + }; + + spl-img { + filename = "spl/u-boot-spl.bin.normal.out"; + + mkimage { + args = "-T sfspl"; + + u-boot-spl { + }; + }; + }; +}; base-commit: 43cae09eabf398ede30fd4ed1664e2ee6c447d34 -- 2.45.2

3 2