March 2022 - U-Boot

[PATCH v2 0/9] efi: Various tidy-ups and drop the default
by Simon Glass 28 Mar '22

28 Mar '22

It has come to light that EFI_LOADER adds an extraordinary amount of code to U-Boot. For example, with nokia_rx51 the size delta is about 90KB. About 170 boards explicitly disable the option, but is is clear that many more could, thus saving image size and boot time. The current situation is affecting U-Boot's image as a svelt bootloader. EFI_LOADER is required by EBBR, a new boot standard which aims to bring in UEFI protocols to U-Boot. But EBRR is not required for booting. U-Boot already provides support for FIT, the 'bootm' command and a suitable hand-off to Linux. EBRR has made the decision to create a parallel infrastructure, e.g. does not use FIT, nor U-Boot's signing infrastructure. EBBR should be truly optional, enabled only by boards that use it. Most don't use it but it is enabled anyway. The default boot path should be one that makes use of the existing U-Boot support. To try to retify this situation, this series adds a new Kconfig option for EBBR so that the naming is more explicit. Then EFI_LOADER is updated to depend on it. The final patch makes EBBR optional. For now, only sandbox enables EBBR. Other boards can be added as needed, presumably by distributions that require it. Another approach would be to add 'CONFIG_EBBR=y' to the .config before building, in the build system. That might be more friendly to U-Boot users. This series also fixes a minor issue noticed during testing. Changes in v2: - Update commit message - Update commit message to be clearer - Drop 'struct blk_desc' - Move all header inclusions to the top - Split out new patch to make EFI_LOADER depend on DM and OF_CONTROL - Note the approximate size of this feature in the help - Split out new patch to create an option for EBBR Simon Glass (9): configs: Resync with savedefconfig Makefile: Drop include/asm directory as well as symlink disk: Tidy up #ifdefs in part_efi Use LIB_UUID with ACPIGEN and FS_BTRFS Allow efi_loader header to be included always lib: Create a new Kconfig option for charset conversion Make EFI_LOADER depend on DM and OF_CONTROL Add an option for EBBR efi: Make EBBR optional Makefile | 2 +- common/Kconfig.boot | 16 ++ configs/am335x_igep003x_defconfig | 1 - configs/am335x_pdu001_defconfig | 1 - configs/am64x_evm_a53_defconfig | 31 ++- configs/apalis-imx8_defconfig | 1 - configs/apalis-imx8x_defconfig | 1 - configs/aristainetos2c_defconfig | 1 - configs/aristainetos2ccslb_defconfig | 1 - ...edev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 - configs/bcm7260_defconfig | 1 - configs/bcm7445_defconfig | 1 - configs/bcm963158_ram_defconfig | 1 - configs/bcm968580xref_ram_defconfig | 1 - configs/bitmain_antminer_s9_defconfig | 1 - configs/bk4r1_defconfig | 1 - configs/brppt1_mmc_defconfig | 1 - configs/brppt1_nand_defconfig | 1 - configs/brppt1_spi_defconfig | 1 - configs/brppt2_defconfig | 1 - configs/brsmarc1_defconfig | 1 - configs/brxre1_defconfig | 1 - configs/cgtqmx8_defconfig | 1 - configs/chromebook_coral_defconfig | 1 - configs/chromebook_link_defconfig | 1 - configs/colibri-imx8x_defconfig | 1 - configs/colibri_vf_defconfig | 1 - configs/controlcenterdc_defconfig | 1 - configs/crs305-1g-4s-bit_defconfig | 1 - configs/crs305-1g-4s_defconfig | 1 - configs/crs326-24g-2s-bit_defconfig | 1 - configs/crs326-24g-2s_defconfig | 1 - configs/crs328-4c-20s-4s-bit_defconfig | 1 - configs/crs328-4c-20s-4s_defconfig | 1 - configs/deneb_defconfig | 1 - configs/draco_defconfig | 2 +- configs/dragonboard820c_defconfig | 1 - configs/efi-x86_app_defconfig | 1 - configs/etamin_defconfig | 2 +- configs/evb-ast2600_defconfig | 1 - configs/evb-px30_defconfig | 1 - configs/evb-rk3308_defconfig | 1 - configs/evb-rk3568_defconfig | 2 +- configs/firefly-px30_defconfig | 1 - configs/ge_bx50v3_defconfig | 1 - configs/giedi_defconfig | 1 - configs/grpeach_defconfig | 1 - configs/imx8mm-cl-iot-gate_defconfig | 8 - configs/imx8qm_mek_defconfig | 1 - configs/imx8qm_rom7720_a1_4G_defconfig | 1 - configs/imx8qxp_mek_defconfig | 1 - configs/j7200_evm_r5_defconfig | 15 +- configs/j721e_evm_r5_defconfig | 13 +- configs/kontron_sl28_defconfig | 2 - configs/kp_imx53_defconfig | 1 - configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 1 - configs/ls1028aqds_tfa_defconfig | 1 - configs/ls1028aqds_tfa_lpuart_defconfig | 1 - configs/ls1028ardb_tfa_SECURE_BOOT_defconfig | 1 - configs/ls1028ardb_tfa_defconfig | 1 - configs/ls1043aqds_defconfig | 1 - configs/ls1043aqds_lpuart_defconfig | 1 - configs/ls1043aqds_nand_defconfig | 1 - configs/ls1043aqds_nor_ddr3_defconfig | 1 - configs/ls1043aqds_qspi_defconfig | 1 - configs/ls1043aqds_sdcard_ifc_defconfig | 1 - configs/ls1043aqds_sdcard_qspi_defconfig | 1 - configs/ls1043aqds_tfa_SECURE_BOOT_defconfig | 1 - configs/ls1043aqds_tfa_defconfig | 1 - configs/ls1043ardb_SECURE_BOOT_defconfig | 1 - configs/ls1043ardb_defconfig | 1 - configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 1 - configs/ls1043ardb_nand_defconfig | 1 - .../ls1043ardb_sdcard_SECURE_BOOT_defconfig | 1 - configs/ls1043ardb_sdcard_defconfig | 1 - configs/ls1043ardb_tfa_SECURE_BOOT_defconfig | 1 - configs/ls1043ardb_tfa_defconfig | 1 - configs/ls1046aqds_SECURE_BOOT_defconfig | 1 - configs/ls1046aqds_defconfig | 1 - configs/ls1046aqds_lpuart_defconfig | 1 - configs/ls1046aqds_nand_defconfig | 1 - configs/ls1046aqds_qspi_defconfig | 1 - configs/ls1046aqds_sdcard_ifc_defconfig | 1 - configs/ls1046aqds_sdcard_qspi_defconfig | 1 - configs/ls1046aqds_tfa_SECURE_BOOT_defconfig | 1 - configs/ls1046aqds_tfa_defconfig | 1 - configs/ls1046ardb_emmc_defconfig | 1 - configs/ls1046ardb_qspi_SECURE_BOOT_defconfig | 1 - configs/ls1046ardb_qspi_defconfig | 1 - configs/ls1046ardb_qspi_spl_defconfig | 1 - .../ls1046ardb_sdcard_SECURE_BOOT_defconfig | 1 - configs/ls1046ardb_sdcard_defconfig | 1 - configs/ls1046ardb_tfa_SECURE_BOOT_defconfig | 1 - configs/ls1046ardb_tfa_defconfig | 1 - configs/ls1088aqds_qspi_SECURE_BOOT_defconfig | 1 - configs/ls1088aqds_qspi_defconfig | 1 - configs/ls1088aqds_tfa_defconfig | 1 - configs/ls1088ardb_qspi_SECURE_BOOT_defconfig | 1 - configs/ls1088ardb_qspi_defconfig | 1 - configs/ls1088ardb_tfa_SECURE_BOOT_defconfig | 1 - configs/ls1088ardb_tfa_defconfig | 1 - configs/ls2080aqds_SECURE_BOOT_defconfig | 1 - configs/ls2080aqds_defconfig | 1 - configs/ls2080aqds_nand_defconfig | 1 - configs/ls2080aqds_qspi_defconfig | 1 - configs/ls2080aqds_sdcard_defconfig | 1 - configs/ls2080ardb_SECURE_BOOT_defconfig | 1 - configs/ls2080ardb_defconfig | 1 - configs/ls2080ardb_nand_defconfig | 1 - configs/ls2081ardb_defconfig | 1 - configs/ls2088aqds_tfa_defconfig | 1 - configs/ls2088ardb_qspi_SECURE_BOOT_defconfig | 1 - configs/ls2088ardb_qspi_defconfig | 1 - configs/ls2088ardb_tfa_SECURE_BOOT_defconfig | 1 - configs/ls2088ardb_tfa_defconfig | 1 - configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 - configs/lx2160aqds_tfa_defconfig | 1 - configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 - configs/lx2160ardb_tfa_defconfig | 1 - configs/lx2160ardb_tfa_stmm_defconfig | 4 - configs/lx2162aqds_tfa_SECURE_BOOT_defconfig | 1 - configs/lx2162aqds_tfa_defconfig | 1 - .../lx2162aqds_tfa_verified_boot_defconfig | 1 - configs/mt7623n_bpir2_defconfig | 1 - configs/mt7629_rfb_defconfig | 1 - configs/mt8183_pumpkin_defconfig | 1 - configs/mt8516_pumpkin_defconfig | 1 - configs/mvebu_puzzle-m801-88f8040_defconfig | 1 - configs/mx6memcal_defconfig | 1 - configs/octeontx2_95xx_defconfig | 1 - configs/octeontx2_96xx_defconfig | 1 - configs/octeontx_81xx_defconfig | 1 - configs/octeontx_83xx_defconfig | 1 - configs/omap4_sdp4430_defconfig | 1 - configs/opos6uldev_defconfig | 1 - configs/pcm052_defconfig | 1 - configs/phycore-am335x-r2-regor_defconfig | 1 - configs/phycore-am335x-r2-wega_defconfig | 1 - configs/pxm2_defconfig | 2 +- configs/qemu-riscv32_defconfig | 2 - configs/qemu-riscv32_smode_defconfig | 2 - configs/qemu-riscv64_defconfig | 2 - configs/qemu-riscv64_smode_defconfig | 2 - configs/qemu-x86_64_defconfig | 2 - configs/qemu-x86_defconfig | 2 - configs/qemu_arm64_defconfig | 2 - configs/qemu_arm_defconfig | 2 - configs/r8a779a0_falcon_defconfig | 3 +- configs/rastaban_defconfig | 2 +- configs/roc-cc-rk3308_defconfig | 1 - configs/rock-pi-n10-rk3399pro_defconfig | 1 - configs/rock-pi-n8-rk3288_defconfig | 1 - configs/rut_defconfig | 2 +- configs/sama5d27_wlsom1_ek_mmc_defconfig | 1 - .../sama5d27_wlsom1_ek_qspiflash_defconfig | 1 - configs/sama5d2_icp_mmc_defconfig | 1 - configs/sama7g5ek_mmc1_defconfig | 1 - configs/sama7g5ek_mmc_defconfig | 1 - configs/sandbox64_defconfig | 9 - configs/sandbox_defconfig | 9 - configs/sandbox_flattree_defconfig | 2 - configs/sandbox_noinst_defconfig | 2 - configs/sandbox_spl_defconfig | 2 - configs/sipeed_maix_bitm_defconfig | 1 - configs/sipeed_maix_smode_defconfig | 1 - configs/socfpga_de1_soc_defconfig | 1 - configs/somlabs_visionsom_6ull_defconfig | 1 - configs/stemmy_defconfig | 1 - configs/stm32mp15_basic_defconfig | 3 - configs/stm32mp15_trusted_defconfig | 3 - configs/tbs2910_defconfig | 1 - configs/thuban_defconfig | 2 +- configs/tools-only_defconfig | 1 - configs/vf610twr_defconfig | 1 - configs/vf610twr_nand_defconfig | 1 - configs/xenguest_arm64_defconfig | 1 - configs/xilinx_versal_mini_defconfig | 1 - configs/xilinx_versal_mini_emmc0_defconfig | 1 - configs/xilinx_versal_mini_emmc1_defconfig | 1 - configs/xilinx_versal_virt_defconfig | 2 - configs/xilinx_zynqmp_mini_defconfig | 1 - configs/xilinx_zynqmp_mini_emmc0_defconfig | 1 - configs/xilinx_zynqmp_mini_emmc1_defconfig | 1 - configs/xilinx_zynqmp_mini_nand_defconfig | 1 - .../xilinx_zynqmp_mini_nand_single_defconfig | 1 - configs/xilinx_zynqmp_mini_qspi_defconfig | 1 - configs/xilinx_zynqmp_r5_defconfig | 1 - configs/xilinx_zynqmp_virt_defconfig | 9 - configs/zynq_cse_nand_defconfig | 1 - configs/zynq_cse_nor_defconfig | 1 - configs/zynq_cse_qspi_defconfig | 1 - disk/part_efi.c | 11 +- drivers/core/Kconfig | 1 + fs/btrfs/Kconfig | 1 + include/efi_loader.h | 187 +++++++++--------- lib/Kconfig | 8 + lib/Makefile | 2 +- lib/efi_loader/Kconfig | 5 +- 198 files changed, 160 insertions(+), 378 deletions(-) -- 2.32.0.93.g670b81a890-goog

4 35

[PATCH v2] imx8m: Use a sane SYS_MALLOC_F_LEN default
by Fabio Estevam 28 Mar '22

28 Mar '22

From: Fabio Estevam <festevam(a)denx.de> When adding new features to imx8m boards, such as DM clock support, the malloc area can be exhausted. To avoid such issue, provide a reasonable default for the SYS_MALLOC_F_LEN size. Suggested-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- Changes since v1: - Add the imx8m default inside the main Kconfig - Heinrich Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig index 9dd9ec7f6dfb..060e327e30c6 100644 --- a/Kconfig +++ b/Kconfig @@ -232,10 +232,11 @@ config SYS_MALLOC_F_LEN depends on SYS_MALLOC_F default 0x1000 if AM33XX default 0x4000 if SANDBOX - default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \ + default 0x2000 if (ARCH_IMX8 || ARCH_MX7 || \ ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5 || \ ARCH_LS1012A || ARCH_LS1021A || ARCH_LS1043A || \ ARCH_LS1046A || ARCH_QEMU || ARCH_SUNXI || ARCH_OWL) + default 0x10000 if ARCH_IMX8M default 0x400 help Before relocation, memory is very limited on many platforms. Still, -- 2.25.1

4 6

[PATCH] spi: rockchip_sfc: Add missing include for dm/device_compat.h
by Chris Morgan 28 Mar '22

28 Mar '22

From: Chris Morgan <macromorgan(a)hotmail.com> Add missing include for dm/device_compat.h. Without this include the SFC driver fails to compile because dev_err and dev_dbg are not defined. Signed-off-by: Chris Morgan <macromorgan(a)hotmail.com> --- drivers/spi/rockchip_sfc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/spi/rockchip_sfc.c b/drivers/spi/rockchip_sfc.c index e098addddc..851a648298 100644 --- a/drivers/spi/rockchip_sfc.c +++ b/drivers/spi/rockchip_sfc.c @@ -12,6 +12,7 @@ #include <bouncebuf.h> #include <clk.h> #include <dm.h> +#include <dm/device_compat.h> #include <linux/bitops.h> #include <linux/delay.h> #include <linux/iopoll.h> -- 2.25.1

2 1

[PATCH] rockchip: clk: add clocks to px30_clk_enable
by Chris Morgan 28 Mar '22

28 Mar '22

From: Chris Morgan <macromorgan(a)hotmail.com> Add the HCLK_OTG, HCLK_SFC, and SCLK_SFC clocks to px30_clk_enable. Without this change U-Boot reports an error of "Enable clock-controller@ff2b0000 failed" on boot when using the SFC or USB in U-Boot. Signed-off-by: Chris Morgan <macromorgan(a)hotmail.com> --- drivers/clk/rockchip/clk_px30.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c index ea874e3f4b..5d467447a1 100644 --- a/drivers/clk/rockchip/clk_px30.c +++ b/drivers/clk/rockchip/clk_px30.c @@ -1403,10 +1403,13 @@ static int px30_clk_enable(struct clk *clk) { switch (clk->id) { case HCLK_HOST: + case HCLK_OTG: + case HCLK_SFC: case SCLK_GMAC: case SCLK_GMAC_RX_TX: case SCLK_MAC_REF: case SCLK_MAC_REFOUT: + case SCLK_SFC: case ACLK_GMAC: case PCLK_GMAC: case SCLK_GMAC_RMII: -- 2.25.1

2 1

Pull request for efi-2022-04-rc5-2
by Heinrich Schuchardt 28 Mar '22

28 Mar '22

The following changes since commit 28c2ebef372b4c9bb18bed8373e0d9e65a09b42b: Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi (2022-03-25 21:20:29 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2022-04-rc5-2 for you to fetch changes up to ccc41fcfaf33356f7789c8bd50551a9e37507f2d: cmd: efidebug: simplify do_efi_boot_add() (2022-03-26 07:46:21 +0100) Gitlab CI showed no problem: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/11459 ---------------------------------------------------------------- Pull request for efi-2022-04-rc5-2 Documentation: * man-page for the wdt command UEFI: * Unit test for boot manager ---------------------------------------------------------------- Heinrich Schuchardt (6): doc: man-page for the wdt command efi_loader: typo devie-path efi_loader: nocolor command line attr for initrddump.efi efi_loader: initrddump: drain input before prompt test: test UEFI boot manager cmd: efidebug: simplify do_efi_boot_add() cmd/efidebug.c | 5 +- doc/usage/index.rst | 1 + doc/usage/wdt.rst | 77 ++++++++++++++++++ lib/efi_loader/efi_device_path.c | 2 +- lib/efi_loader/initrddump.c | 91 ++++++++++++++++++---- test/py/tests/test_efi_bootmgr/conftest.py | 42 ++++++++++ test/py/tests/test_efi_bootmgr/test_efi_bootmgr.py | 32 ++++++++ 7 files changed, 233 insertions(+), 17 deletions(-) create mode 100644 doc/usage/wdt.rst create mode 100644 test/py/tests/test_efi_bootmgr/conftest.py create mode 100644 test/py/tests/test_efi_bootmgr/test_efi_bootmgr.py

2 1

Promlem with booting on a cora-z7-10
by Sarmad Ahmad 28 Mar '22

28 Mar '22

Hello I try to boot a Cora-Z7-10 with u-boot but without success I followed the instructions from here https://u-boot.readthedocs.io/en/latest/board/xilinx/zynq.html built u-boot as follows export ARCH=arm export CROSS_COMPILE=/usr/bin/arm-linux-gnueabihf- make mrproper make xilinx_zynq_virt_defconfig make after that i copied the files to the sd card but nothing happens spl/boot.bin -> 121.3 kB u-boot.img -> 1.2 MB The output of u-boot without extension arm-linux-gnueabihf-redelf -l u-boot: Elf-Datei-Typ ist EXEC (ausführbare Datei) Entry point 0x4000000 There are 2 program headers, starting at offset 52 Programm-Header: Typ Offset VirtAdr PhysAdr DateiGr SpeiGr Flg Ausr. LOAD 0x010000 0x04000000 0x04000000 0xeb0f0 0xeb0f0 RWE 0x10000 GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RWE 0x10 Abbildung von Sektion nach Segment: Segmentsektionen... 00 .text .efi_runtime .text_rest .rodata .hash .data .got.plt .u_boot_list .efi_runtime_rel .rel.dyn .bss 01 The output of u-boot without extension arm-linux-gnueabihf-redelf -h u-boot: ELF-Header: Magic: 7f 45 4c 46 01 01 01 00 00 00 00 00 00 00 00 00 Klasse: ELF32 Daten: 2er-Komplement, Little-Endian Version: 1 (aktuell) OS/ABI: UNIX - System V ABI-Version: 0 Typ: EXEC (ausführbare Datei) Maschine: ARM Version: 0x1 Einstiegspunktadresse: 0x4000000 Beginn der Programm-Header: 52 (Bytes in Datei) Beginn der Sektions-header: 8254932 (Bytes in Datei) Flags: 0x5000200, Version5 EABI, soft-float ABI Size of this header: 52 (bytes) Size of program headers: 32 (bytes) Number of program headers: 2 Size of section headers: 40 (bytes) Number of section headers: 27 Section header string table index: 26 Thank you for your help Sarmad Translated with www.DeepL.com/Translator (free version)

2 1

[PATCH 0/8] imx8mm: Add serial download support
by Fabio Estevam 28 Mar '22

28 Mar '22

This series brings USB gadget support for i.MX8MM and allows the usage of the Serial Download Protocol, which is a convenient way for loading U-Boot via the 'uuu' tool and and flashing the eMMC via the U-Boot 'ums' command. Tested on imx8mm-evk and imx7s-warp. Fabio Estevam (4): usb: ehci-mx6: Allow building SDP for imx8mm imx8mm_evk: Add an entry for USB boot imx8mm_evk: Add Serial Download Protocol support doc: imx8mm_evk: Add instructions for eMMC boot Frieder Schrempf (2): imx8mm: Fix USB reg addresses for i.MX8MM clock_imx8mm: Add enable_usboh3_clk() for i.MX8MM Tim Harvey (2): usb: ehci-mx6: move mode set/detect to probe usb: ehci-mx6: add IMX8MM and IMX8MN OTG support arch/arm/include/asm/arch-imx8m/clock.h | 1 + arch/arm/include/asm/arch-imx8m/imx-regs.h | 11 ++++ arch/arm/mach-imx/imx8m/clock_imx8mm.c | 16 ++++++ board/freescale/imx8mm_evk/spl.c | 2 + configs/imx8mm_evk_defconfig | 19 +++++++ doc/board/freescale/imx8mm_evk.rst | 42 +++++++++++++-- drivers/usb/host/ehci-mx6.c | 62 ++++++++++------------ 7 files changed, 114 insertions(+), 39 deletions(-) -- 2.25.1

8 24

[PATCH 1/1] ubifs: Fix journal replay wrt. xattr nodes
by Ville Baillie 28 Mar '22

28 Mar '22

backport 1cb51a15b576ee325d527726afff40947218fd5e from Linux --- fs/ubifs/tnc.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index e8b8f16838..3303711477 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -50,6 +50,11 @@ enum { NOT_ON_MEDIA = 3, }; +static int fallible_read_node(struct ubifs_info *c, const union ubifs_key *key, + struct ubifs_zbranch *zbr, void *node); +static int try_read_node(const struct ubifs_info *c, void *buf, int type, + int len, int lnum, int offs); + /** * insert_old_idx - record an index node obsoleted since the last commit start. * @c: UBIFS file-system description object @@ -402,7 +407,19 @@ static int tnc_read_node_nm(struct ubifs_info *c, struct ubifs_zbranch *zbr, return 0; } - err = ubifs_tnc_read_node(c, zbr, node); + if (c->replaying) { + err = fallible_read_node(c, &zbr->key, zbr, node); + /* + * When the node was not found, return -ENOENT, 0 otherwise. + * Negative return codes stay as-is. + */ + if (err == 0) + err = -ENOENT; + else if (err == 1) + err = 0; + } else { + err = ubifs_tnc_read_node(c, zbr, node); + } if (err) return err; @@ -2770,7 +2787,11 @@ struct ubifs_dent_node *ubifs_tnc_next_ent(struct ubifs_info *c, if (nm->name) { if (err) { /* Handle collisions */ - err = resolve_collision(c, key, &znode, &n, nm); + if (c->replaying) + err = fallible_resolve_collision(c, key, &znode, &n, + nm, 0); + else + err = resolve_collision(c, key, &znode, &n, nm); dbg_tnc("rc returned %d, znode %p, n %d", err, znode, n); if (unlikely(err < 0)) -- 2.17.1

1 0

[PATCH v2 0/6] efi: capsule: Image GUID usage cleanup
by Sughosh Ganu 28 Mar '22

28 Mar '22

This series is cleaning up the usage of the image GUIDs that are used in capsule update and the EFI System Resource Table(ESRT). Currently, there are two instances of the Firmware Management Protocol(FMP), one defined for updating the FIT images, and the other for updating raw images. The FMP code defines two GUID values, one for all FIT images, and one for raw images. Depending on the FMP instance used on a platform, the platform needs to use the corresponding image GUID value for all images on the platform, and also across platforms. A few issues are being fixed through the patch series. One, that an image for a different platform can be flashed on another platform if both the platforms are using the same FMP instance. So, for e.g. a capsule generated for the Socionext DeveloperBox platform can be flashed on the ZynqMP platform, since both the platforms use the CONFIG_EFI_CAPSULE_FIRMWARE_RAW instance of the FMP. This can be corrected if each firmware image that can be updated through the capsule update mechanism has it's own unique image GUID. The second issue that this patch series fixes is the value of FwClass in the ESRT. With the current logic, all firmware image entries in the ESRT display the same GUID value -- either the FIT GUID or the raw GUID. This is not in compliance with the UEFI specification, as the specification requires all entries to have unique GUID values. The third issue being fixed is the population of the EFI_FIRMWARE_IMAGE_DESCRIPTOR array. The current code uses the dfu framework for populating the image descriptor array. However, there might be other images that are not to be updated through the capsule update mechanism also registered with the dfu framework. As a result of this, the ESRT will show up entries of images that are not to be targeted by the capsule update mechanism. These issues are being fixed by defining a structure, efi_fw_images. A platform can then define image related information like the image GUID and image name. Every platform that uses capsule update mechanism needs to define fw_images array. This array will then be used to populate the image descriptor array, and also in determining if a particular capsule's payload can be used for updating an image on the platform. Changes since V1: * Make changes for the xilinx boards as suggested by Michal Simek. * Add a GUID for the sandbox FIT image. * Split the capsule update test cases into two scripts, one for raw images and one for FIT images. * Add the capsule update test case for FIT images on sandbox64 and sandbox_flattree variants. * Add capsule update support on sandbox_flattree variant for enabling FIT capsule update testing as part of the python tests The first patch of this series adds the fw_images array in all platforms which are using UEFI capsule updates The second patch of the series changes the logic for populating the image descriptor array, using the information from the fw_images array defined by the platform. The third patch of the series removes the test cases using the --raw and --fit parameters, removes test case for FIT images, and refactors the test scripts, one for raw images, and one for FIT images. The FIT test case is enabled on sandbox_flattree variant. The fourth patch of the series makes corresponding changes in the capsule update related documentation. The fifth patch of the series removes the now unused FIT and raw image GUID values from the FMP module. The sixth patch of the series removes the --raw and --fit command line parameters in the mkeficapsule utility. Sughosh Ganu (6): capsule: Add Image GUIDs for platforms using capsule updates capsule: FMP: Populate the image descriptor array from platform data test: capsule: Modify the capsule tests to use GUID values for sandbox doc: uefi: Update the capsule update related documentation FMP: Remove GUIDs for FIT and raw images mkeficapsule: Remove raw and FIT GUID types .../imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 19 ++ .../imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c | 18 ++ board/emulation/qemu-arm/qemu-arm.c | 20 ++ board/kontron/pitx_imx8m/pitx_imx8m.c | 15 +- board/kontron/sl-mx8mm/sl-mx8mm.c | 14 ++ board/kontron/sl28/sl28.c | 14 ++ board/sandbox/sandbox.c | 25 +++ board/socionext/developerbox/developerbox.c | 23 +++ board/xilinx/common/board.c | 18 ++ configs/sandbox64_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/sandbox_flattree_defconfig | 5 + doc/develop/uefi/uefi.rst | 10 +- include/configs/imx8mm-cl-iot-gate.h | 10 + include/configs/imx8mp_rsb3720.h | 10 + include/configs/kontron-sl-mx8mm.h | 6 + include/configs/kontron_pitx_imx8m.h | 6 + include/configs/kontron_sl28.h | 6 + include/configs/qemu-arm.h | 10 + include/configs/sandbox.h | 14 ++ include/configs/synquacer.h | 14 ++ include/configs/xilinx_versal.h | 10 + include/configs/xilinx_zynqmp.h | 10 + include/configs/zynq-common.h | 10 + include/efi_api.h | 8 - include/efi_loader.h | 18 ++ lib/efi_loader/efi_firmware.c | 95 +++------ test/py/tests/test_efi_capsule/conftest.py | 21 +- .../test_capsule_firmware_fit.py | 186 ++++++++++++++++++ ...rmware.py => test_capsule_firmware_raw.py} | 169 ++++++---------- tools/eficapsule.h | 8 - tools/mkeficapsule.c | 26 +-- 32 files changed, 589 insertions(+), 231 deletions(-) create mode 100644 test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py rename test/py/tests/test_efi_capsule/{test_capsule_firmware.py => test_capsule_firmware_raw.py} (76%) -- 2.25.1

3 9

Issue with CI/CD
by Patrice CHOTARD 28 Mar '22

28 Mar '22

Hi all Since this morning, Testsuites "htmldocs" is failing (see log below) which is blocking all others tests ("test.py" and "World build") $ make htmldocs HOSTCC scripts/basic/fixdep SPHINX htmldocs --> file:///builds/u-boot/custodians/u-boot-stm/doc/output PARSE include/linker_lists.h Traceback (most recent call last): File "/tmp/venvhtml/bin/sphinx-build", line 5, in <module> from sphinx.cmd.build import main File "/tmp/venvhtml/lib/python3.8/site-packages/sphinx/cmd/build.py", line 25, in <module> from sphinx.application import Sphinx File "/tmp/venvhtml/lib/python3.8/site-packages/sphinx/application.py", line 43, in <module> from sphinx.registry import SphinxComponentRegistry File "/tmp/venvhtml/lib/python3.8/site-packages/sphinx/registry.py", line 24, in <module> from sphinx.builders import Builder File "/tmp/venvhtml/lib/python3.8/site-packages/sphinx/builders/__init__.py", line 26, in <module> from sphinx.util import import_object, logging, progress_message, rst, status_iterator File "/tmp/venvhtml/lib/python3.8/site-packages/sphinx/util/rst.py", line 21, in <module> from jinja2 import Environment, environmentfilter ImportError: cannot import name 'environmentfilter' from 'jinja2' (/tmp/venvhtml/lib/python3.8/site-packages/jinja2/__init__.py) make[1]: *** [doc/Makefile:68: htmldocs] Error 1 make: *** [Makefile:2391: htmldocs] Error 2 Cleaning up project directory and file based variables 00:03 ERROR: Job failed: exit code 1 For information, last friday, it was working. The only difference was regarding jinja2 package: On friday, i noticed that Jinja2-3.1.1-py3-none-any.whl was used. "Collecting Jinja2>=2.3 Downloading Jinja2-3.1.1-py3-none-any.whl (132 kB)" But today, it's a different version : "Collecting Jinja2>=2.3 Downloading Jinja2-3.1.1-py3-none-any.whl (132 kB)" Patrice

2 2