February 2021 - U-Boot

[PATCH] net: use a more deterministic approach to get the active ethernet device
by Michael Walle 14 Jun '21

14 Jun '21

If the environment variable "ethact" is not set, the first device in the uclass is returned. This depends on the probing order of the ethernet devices. Moreover it is not not configurable at all. Try to return the ethernet device with sequence id 0 first which then can be configured by the aliases in a device tree. Fall back to the old mechanism in case of an error. Signed-off-by: Michael Walle <michael(a)walle.cc> --- net/eth-uclass.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 34ca731d1e..0b4260dc5b 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -69,8 +69,11 @@ void eth_set_current_to_next(void) /* * Typically this will simply return the active device. * In the case where the most recent active device was unset, this will attempt - * to return the first device. If that device doesn't exist or fails to probe, - * this function will return NULL. + * to return the device with sequence id 0 (which can be configured by the + * device tree). If this fails, fall back to just getting the first device. + * The latter is non-deterministic and depends on the order of the probing. + * If that device doesn't exist or fails to probe, this function will return + * NULL. */ struct udevice *eth_get_dev(void) { @@ -80,9 +83,13 @@ struct udevice *eth_get_dev(void) if (!uc_priv) return NULL; - if (!uc_priv->current) - eth_errno = uclass_first_device(UCLASS_ETH, - &uc_priv->current); + if (!uc_priv->current) { + eth_errno = uclass_get_device_by_seq(UCLASS_ETH, 0, + &uc_priv->current); + if (eth_errno) + eth_errno = uclass_first_device(UCLASS_ETH, + &uc_priv->current); + } return uc_priv->current; } -- 2.20.1

2 3

imx8qxp mek: Booting mainline kernel with mainline U-Boot
by Fabio Estevam 12 Jun '21

12 Jun '21

Hi Peng, Have you managed to boot a mainline kernel with mainline U-Boot on a imx8qxp mek? Here is what I get: U-Boot SPL 2020.01-00369-ge80a8b0222-dirty (Jan 13 2020 - 12:30:21 -0300) Normal Boot WDT: Not found! Trying to boot from MMC2_2 Load image from MMC/SD 0x46800 U-Boot 2020.01-00369-ge80a8b0222-dirty (Jan 13 2020 - 12:30:21 -0300) CPU: NXP i.MX8QXP RevB A35 at 1200 MHz at 32C Model: Freescale i.MX8QXP MEK Board: iMX8QXP MEK Build: SCFW 550f3079, SECO-FW d7523fe8, ATF 70fa7bc Boot: SD1 DRAM: 3 GiB Failed to enable ipg clk MMC: FSL_SDHC: 0, FSL_SDHC: 1 Loading Environment from MMC... OK In: serial@5a060000 Out: serial@5a060000 Err: serial@5a060000 Net: Failed to enable ipg clk Warning: ethernet@5b040000 (eth0) using random MAC address - e2:9c:db:94:fc:d5 eth0: ethernet@5b040000 Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc1 is current device 26221056 bytes read in 1134 ms (22.1 MiB/s) Booting from mmc ... 13953 bytes read in 14 ms (972.7 KiB/s) ## Flattened Device Tree blob at 83000000 Booting using the fdt blob at 0x83000000 Using Device Tree in place at 0000000083000000, end 0000000083006680 Starting kernel ... [It hangs here] Booting a NXP kernel also did not work. Any ideas? Regards, Fabio Estevam

8 17

[PATCH] arm: bootm: wrong lmb region reservation when PRAM is used
by Aleksandar Gerasimovski 07 Jun '21

07 Jun '21

This is a draft patch to describe the problem and to initiate a discussion for solution. PRAM usage is not taken into account when reserving lmb for ARM architecture, this means that predefined PRAM region is reserved by the u-boot and cannot be used by the u-boot users. In our case this bug leads to non functional ramfs boot, as the PRAM and ram rootfs address ranges are getting reserved by the u-boot. It is obvious that here PRAM region is ignored, but my question is is this clear to everyone and expected? Taking board_f.c as reference, when calculating relocation address PRAM area is taken into account so I would expect that to be case here. Here the intention is to reserve unused space at the end of the effective RAM but PRAM is not part of that. Possible solution would be to introduce something like get_effective_memsize here e.g powerpc/lib/bootm.c but then also NR_DRAM_BANKS has to be considered? Signed-off-by: Aleksandar Gerasimovski <aleksandar.gerasimovski(a)hitachi-powergrids.com> --- arch/arm/lib/bootm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 11af9e2..4b06d25 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -54,7 +54,7 @@ static ulong get_sp(void) void arch_lmb_reserve(struct lmb *lmb) { - ulong sp, bank_end; + ulong sp, bank_end, pram = 0; int bank; /* @@ -69,6 +69,11 @@ void arch_lmb_reserve(struct lmb *lmb) sp = get_sp(); debug("## Current stack ends at 0x%08lx ", sp); +#ifdef CONFIG_PRAM + pram = env_get_ulong("pram", 10, CONFIG_PRAM); + pram = pram << 10; /* size is in kB */ +#endif + /* adjust sp by 4K to be safe */ sp -= 4096; for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) { @@ -76,8 +81,9 @@ void arch_lmb_reserve(struct lmb *lmb) sp < gd->bd->bi_dram[bank].start) continue; /* Watch out for RAM at end of address space! */ + /* @todo: pram obviously wrong if NR_DRAM_BANKS > 1 */ bank_end = gd->bd->bi_dram[bank].start + - gd->bd->bi_dram[bank].size - 1; + gd->bd->bi_dram[bank].size - pram - 1; if (sp > bank_end) continue; if (bank_end > gd->ram_top) -- 1.8.3.1

3 4

[PATCH 2/4] pinephone_defconfig: reduce boot delay
by Nicolas Boulenguez 03 Jun '21

03 Jun '21

From: Arnaud Ferraris <arnaud.ferraris(a)collabora.com> On a cellular phone, the vast majority of users can be expected to have no serial console connected and prefer a short boot. --- configs/pinephone_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/pinephone_defconfig b/configs/pinephone_defconfig index 9967cddab9..9b51a7a100 100644 --- a/configs/pinephone_defconfig +++ b/configs/pinephone_defconfig @@ -10,4 +10,5 @@ CONFIG_PINEPHONE_DT_SELECTION=y CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pinephone-1.2" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_BOOTDELAY=0 CONFIG_OF_LIST="sun50i-a64-pinephone-1.1 sun50i-a64-pinephone-1.2" -- 2.20.1

7 19

[PATCH 1/2] cmd: pinmux: update result of do_status
by Patrick Delaunay 18 May '21

18 May '21

Update the result of do_status and alway returns a CMD_RET_ value (-ENOSYS was a possible result of show_pinmux). This patch also adds pincontrol name in error messages (dev->name) and treats correctly the status sub command when pin-controller device is not selected. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- cmd/pinmux.c | 44 +++++++++++++++++++----------------- test/py/tests/test_pinmux.py | 4 ++-- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/cmd/pinmux.c b/cmd/pinmux.c index 9942b15419..af04c95a46 100644 --- a/cmd/pinmux.c +++ b/cmd/pinmux.c @@ -41,7 +41,7 @@ static int do_dev(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_SUCCESS; } -static int show_pinmux(struct udevice *dev) +static void show_pinmux(struct udevice *dev) { char pin_name[PINNAME_SIZE]; char pin_mux[PINMUX_SIZE]; @@ -51,54 +51,56 @@ static int show_pinmux(struct udevice *dev) pins_count = pinctrl_get_pins_count(dev); - if (pins_count == -ENOSYS) { - printf("Ops get_pins_count not supported\n"); - return pins_count; + if (pins_count < 0) { + printf("Ops get_pins_count not supported by %s\n", dev->name); + return; } for (i = 0; i < pins_count; i++) { ret = pinctrl_get_pin_name(dev, i, pin_name, PINNAME_SIZE); - if (ret == -ENOSYS) { - printf("Ops get_pin_name not supported\n"); - return ret; + if (ret) { + printf("Ops get_pin_name error (%d) by %s\n", + ret, dev->name); + return; } ret = pinctrl_get_pin_muxing(dev, i, pin_mux, PINMUX_SIZE); if (ret) { - printf("Ops get_pin_muxing error (%d)\n", ret); - return ret; + printf("Ops get_pin_muxing error (%d) by %s in %s\n", + ret, pin_name, dev->name); + return; } printf("%-*s: %-*s\n", PINNAME_SIZE, pin_name, PINMUX_SIZE, pin_mux); } - - return 0; } static int do_status(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct udevice *dev; - int ret = CMD_RET_USAGE; - if (currdev && (argc < 2 || strcmp(argv[1], "-a"))) - return show_pinmux(currdev); + if (argc < 2) { + if (!currdev) { + printf("pin-controller device not selected\n"); + return CMD_RET_FAILURE; + } + show_pinmux(currdev); + return CMD_RET_SUCCESS; + } - if (argc < 2 || strcmp(argv[1], "-a")) - return ret; + if (strcmp(argv[1], "-a")) + return CMD_RET_USAGE; uclass_foreach_dev_probe(UCLASS_PINCTRL, dev) { /* insert a separator between each pin-controller display */ printf("--------------------------\n"); printf("%s:\n", dev->name); - ret = show_pinmux(dev); - if (ret < 0) - printf("Can't display pin muxing for %s\n", - dev->name); + show_pinmux(dev); } - return ret; + return CMD_RET_SUCCESS; } static int do_list(struct cmd_tbl *cmdtp, int flag, int argc, diff --git a/test/py/tests/test_pinmux.py b/test/py/tests/test_pinmux.py index 0cbbae000c..b3ae2ab024 100644 --- a/test/py/tests/test_pinmux.py +++ b/test/py/tests/test_pinmux.py @@ -13,9 +13,9 @@ def test_pinmux_usage_1(u_boot_console): @pytest.mark.buildconfigspec('cmd_pinmux') def test_pinmux_usage_2(u_boot_console): """Test that 'pinmux status' executed without previous "pinmux dev" - command displays pinmux usage.""" + command displays error message.""" output = u_boot_console.run_command('pinmux status') - assert 'Usage:' in output + assert 'pin-controller device not selected' in output @pytest.mark.buildconfigspec('cmd_pinmux') @pytest.mark.boardspec('sandbox') -- 2.17.1

4 9

[PATCH v2 00/28] fs/squashfs: fix memory leaks and introduce exists() function
by Richard Genoud 17 May '21

17 May '21

This patch series fix several memory leaks, some use of dangling pointers (leading to cpu freeze) and finally introduce the exists() function for squashfs. This function enable testing the existence of a file, which is mandatory for using the distro_bootcmd Those fixes have been cut into several patches to be easier to review Changes since v1: - patch 5: *dir = *file = NULL; is split in 2 lines - For consistency, sqfs_frag_lookup is modified to use a single "goto out" ( cf https://lists.denx.de/pipermail/u-boot/2020-October/429645.html ) - more memory leak fixes in sqfs_get_abs_path, sqfs_read and sqfs_probe - a missing error check typo in sqfs_get_abs_path - some missing reseting ctxt.sblk to NULL to prevent double free - reset cur_dev/cur_part_info to NULL when they are freed - return value of sqfs_decompressor_init() wasn't used - use "len" in sqfs_read to prevent writing beyond buffer - prevent reading with an offset since it doesn't work - prevent reading fragmented files since it doesn't work Richard Genoud (28): fs/squashfs: fix board hang-up when calling .exists() fs/squashfs: sqfs_opendir: fix some memory leaks and dangling pointers fs/squashfs: sqfs_opendir: simplify error handling fs/squashfs: sqfs_closedir: fix memory leak fs/squashfs: sqfs_split_path: fix memory leak and dangling pointers fs/squashfs: sqfs_read_directory_table: fix memory leak fs/squashfs: sqfs_search_dir: fix dangling pointer fs/squashfs: sqfs_search_dir: fix memory leaks fs/squashfs: sqfs_read_inode_table: fix dangling pointer fs/squashfs: sqfs_concat_tokens: check if malloc succeeds fs/squashfs: sqfs_size: fix dangling pointer dirs->entry fs/squashfs: sqfs_size: remove useless sqfs_closedir() fs/squashfs: sqfs_read: fix dangling pointer dirs->entry fs/squashfs: sqfs_read: remove useless sqfs_closedir() fs/squashfs: sqfs_read: fix memory leak fs/squashfs: sqfs_read: fix another memory leak fs/squashfs: sqfs_frag_lookup: simplify error handling fs/squashfs: sqfs_get_abs_path: fix error check fs/squashfs: sqfs_get_abs_path: fix possible memory leak on error fs/squashfs: sqfs_read: fix memory leak on finfo.blk_sizes fs/squashfs: sqfs_probe: fix possible memory leak on error fs/squashfs: sqfs_close/sqfs_read_sblk: set ctxt.sblk to NULL after free fs/squashfs: sqfs_probe: reset cur_dev/cur_part_info to NULL on error fs/squashfs: sqfs_probe: use sqfs_decompressor_init() return value fs/squashfs: sqfs_read: don't write beyond buffer size fs/squashfs: sqfs_read: remove buggy offset functionality fs/squashfs: sqfs_read: fragmented files are not supported fs/squashfs: implement exists() function fs/fs.c | 7 + fs/squashfs/sqfs.c | 399 +++++++++++++++++++++++++++++++-------------- include/squashfs.h | 1 + 3 files changed, 286 insertions(+), 121 deletions(-)

4 81

[PATCH v2 1/4] test: Include /sbin to the PATH when creating ext4 disk image
by Andy Shevchenko 17 May '21

17 May '21

On some distributions the mkfs.ext4 is under /sbin and /sbin is not set for mere users. Include /sbin to the PATH when creating ext4 disk image, so that users won't get a scary traceback from Python. Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- v2: used '/sbin' as is (Simon) test/py/tests/test_env.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py index 940279651da0..9bed2f48d77e 100644 --- a/test/py/tests/test_env.py +++ b/test/py/tests/test_env.py @@ -414,6 +414,8 @@ def mk_env_ext4(state_test_env): if os.path.exists(persistent): c.log.action('Disk image file ' + persistent + ' already exists') else: + # Some distributions do not add /sbin to the default PATH, where mkfs.ext4 lives + os.environ["PATH"] += os.pathsep + '/sbin' try: u_boot_utils.run_and_log(c, 'dd if=/dev/zero of=%s bs=1M count=16' % persistent) u_boot_utils.run_and_log(c, 'mkfs.ext4 %s' % persistent) -- 2.30.0

5 20

[PATCH v4 0/9] Various minor fixes
by Simon Glass 15 May '21

15 May '21

This series collects a few minor fixes and improvements that have been hanging around in a branch for a while. Changes in v4: - Indicate that hd does not show the offset correctly - Add an xxd + sed example too - Fix 'existing' typo Changes in v3: - Show phase only for IH_OS_U_BOOT, drop the last debug() - Add new patch to describe the md command - Add this to the docs for the md command - Add comments as to why we have os_malloc() and os_realloc() Changes in v2: - Drop the file instead of fixing it up - Add new patch to add os_realloc() - Drop unnecessary check before calling os_free() - Update the comment for os_free() - Also free the RAM buffer - Convert the rest of the allocations in os.c, etc. Simon Glass (9): spl: Drop duplicate 'Jumping to U-Boot' message binman: Indicate how to make binman verbose doc: describe the md command doc: Add a note about producing 'md.b' output using hexdump s5p4418_nanopi2: Drop dead code sandbox: Add os_realloc() sandbox: Avoid using malloc() for system state sandbox: Write out bloblist when exiting bootm: Fix duplicate debugging in bootm_process_cmdline() Makefile | 1 + arch/arm/mach-nexell/Makefile | 1 - arch/arm/mach-nexell/cmd_boot_linux.c | 144 -------------------------- arch/sandbox/cpu/os.c | 72 ++++++++++--- arch/sandbox/cpu/spl.c | 10 +- arch/sandbox/cpu/start.c | 12 ++- arch/sandbox/cpu/state.c | 23 ++-- common/bootm.c | 2 +- common/spl/spl.c | 3 +- doc/Makefile | 1 - doc/usage/index.rst | 1 + doc/usage/md.rst | 106 +++++++++++++++++++ include/os.h | 15 ++- tools/binman/README | 4 +- 14 files changed, 214 insertions(+), 181 deletions(-) delete mode 100644 arch/arm/mach-nexell/cmd_boot_linux.c create mode 100644 doc/usage/md.rst -- 2.30.0.478.g8a0d178c01-goog

3 19

[PATCH] efi_loader: consider no-map property of reserved memory
by Heinrich Schuchardt 15 May '21

15 May '21

If a reserved memory node in the device tree has the property no-map, remove it from the UEFI memory map provided by GetMemoryMap(). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/bootefi.c | 34 ++++++++++++++++++++++++++++------ include/efi.h | 3 +++ lib/efi_loader/efi_memory.c | 7 +++++-- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 40d5ef2b3a..f173105251 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -135,12 +135,29 @@ done: return ret; } -static void efi_reserve_memory(u64 addr, u64 size) +/** + * efi_reserve_memory() - add reserved memory to memory map + * + * @addr: start address of the reserved memory range + * @size: size of the reserved memory range + * @nomap: indicates that the memory range shall be hidden from the memory + * map + */ +static void efi_reserve_memory(u64 addr, u64 size, bool nomap) { + int type; + efi_uintn_t ret; + /* Convert from sandbox address space. */ addr = (uintptr_t)map_sysmem(addr, 0); - if (efi_add_memory_map(addr, size, - EFI_RESERVED_MEMORY_TYPE) != EFI_SUCCESS) + + if (nomap) + type = EFI_NO_MAP_MEMORY; + else + type = EFI_RESERVED_MEMORY_TYPE; + + ret = efi_add_memory_map(addr, size, type); + if (ret != EFI_SUCCESS) log_err("Reserved memory mapping failed addr %llx size %llx\n", addr, size); } @@ -166,7 +183,7 @@ static void efi_carve_out_dt_rsv(void *fdt) for (i = 0; i < nr_rsv; i++) { if (fdt_get_mem_rsv(fdt, i, &addr, &size) != 0) continue; - efi_reserve_memory(addr, size); + efi_reserve_memory(addr, size, false); } /* process reserved-memory */ @@ -186,8 +203,13 @@ static void efi_carve_out_dt_rsv(void *fdt) * a size instead of a reg property. */ if (fdt_addr != FDT_ADDR_T_NONE && - fdtdec_get_is_enabled(fdt, subnode)) - efi_reserve_memory(fdt_addr, fdt_size); + fdtdec_get_is_enabled(fdt, subnode)) { + bool nomap; + + nomap = !!fdt_getprop(fdt, subnode, "no-map", + NULL); + efi_reserve_memory(fdt_addr, fdt_size, nomap); + } subnode = fdt_next_subnode(fdt, subnode); } } diff --git a/include/efi.h b/include/efi.h index f986aad877..50190021ef 100644 --- a/include/efi.h +++ b/include/efi.h @@ -181,6 +181,9 @@ enum efi_mem_type { EFI_MAX_MEMORY_TYPE, EFI_TABLE_END, /* For efi_build_mem_table() */ + + /* Memory that shall not be mapped */ + EFI_NO_MAP_MEMORY, }; /* Attribute values */ diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 7be756e370..d156b9533c 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -251,7 +251,7 @@ static efi_status_t efi_add_memory_map_pg(u64 start, u64 pages, EFI_PRINT("%s: 0x%llx 0x%llx %d %s\n", __func__, start, pages, memory_type, overlap_only_ram ? "yes" : "no"); - if (memory_type >= EFI_MAX_MEMORY_TYPE) + if (memory_type >= EFI_MAX_MEMORY_TYPE && memory_type != EFI_NO_MAP_MEMORY) return EFI_INVALID_PARAMETER; if (!pages) @@ -327,7 +327,10 @@ static efi_status_t efi_add_memory_map_pg(u64 start, u64 pages, } /* Add our new map */ - list_add_tail(&newlist->link, &efi_mem); + if (memory_type == EFI_NO_MAP_MEMORY) + free(newlist); + else + list_add_tail(&newlist->link, &efi_mem); /* And make sure memory is listed in descending order */ efi_mem_sort(); -- 2.28.0

3 9

[PATCH 0/3] Improvements to FIT hashing
by Joel Stanley 14 May '21

14 May '21

Here are some small changes to the FIT hashing code in order to use more code from common/, which in turns allows hw implementations of SHA. This was motivated by a need to reduce the SPL size for the Aspeed platforms by using the hardware engine. I have a driver for the Aspeed SoC that I will submit. Joel Stanley (3): hw_sha: Fix coding style errors fit: Use hash.c to call SHA code hash: Allow for SHA512 hardware implementations common/hash.c | 24 ++++++++++++++++++++++-- common/image-fit.c | 34 ++++++++-------------------------- include/hw_sha.h | 38 ++++++++++++++++++++++++++++++++------ lib/Kconfig | 15 +++++++-------- 4 files changed, 69 insertions(+), 42 deletions(-) -- 2.30.0

6 18