June 2023 - U-Boot

[PATCH] bootstd: Fix relative path use in extlinux bootmeth
by Jonas Karlman 14 Jun '23

14 Jun '23

Using relative path in a /boot/extlinux/extlinux.conf file fails to load linux kernel. Using a /boot/extlinux/extlinux.conf file: LABEL test LINUX ../linux/Image Result in following error: Retrieving file: ../linux/Image Skipping test for failure retrieving kernel Boot failed (err=-14) However, using sysboot cmd successfully load kernel using same file: sysboot mmc 1:1 any ${scriptaddr} /boot/extlinux/extlinux.conf Retrieving file: /boot/extlinux/../linux/Image Fix relative path using bootmeth extlinux by supplying bootfile path instead of subdir path in the call to pxe_setup_ctx, same as done in the sysboot command. Fixes: 31aefaf89a5b ("bootstd: Add an implementation of distro boot") Signed-off-by: Jonas Karlman <jonas(a)kwiboo.se> --- boot/bootmeth_extlinux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c index 24be0760229c..6b2b84003836 100644 --- a/boot/bootmeth_extlinux.c +++ b/boot/bootmeth_extlinux.c @@ -150,7 +150,7 @@ static int extlinux_boot(struct udevice *dev, struct bootflow *bflow) info.dev = dev; info.bflow = bflow; ret = pxe_setup_ctx(&ctx, &cmdtp, extlinux_getfile, &info, true, - bflow->subdir, false); + bflow->fname, false); if (ret) return log_msg_ret("ctx", -EINVAL); -- 2.40.1

3 2

[PATCH 0/2] *** minor fixes in DHCP6 ***
by seanedmond＠linux.microsoft.com 14 Jun '23

14 Jun '23

From: Sean Edmond <seanedmond(a)microsoft.com> Resolves 2 issues: - coverity CID 453851 and 436278 - Change DHCP6 VCI string from "U-boot" to "U-Boot" (this was found by more detailed testing on our end) Sean Edmond (2): net: ipv6: Fix CID 453851 and CID 436278 net: dhcp6: Fix VCI string cmd/net.c | 12 ++++++------ net/dhcpv6.c | 5 +++++ net/dhcpv6.h | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) -- 2.40.0

3 6

[PATCH] net: rtl8169: add depends on PCI
by Eugen Hristev 14 Jun '23

14 Jun '23

The rtl8169 driver uses calls to dm_pci_bus_to_phys, which are compiled under CONFIG_PCI. Without CONFIG_PCI, this happens: drivers/net/rtl8169.o: in function `rtl_recv_common': drivers/net/rtl8169.c:555: undefined reference to `dm_pci_bus_to_phys' It is only natural that this driver depends on CONFIG_PCI then. The device does not work connected in another way anyway, and the driver does not assume anything else at this moment. Signed-off-by: Eugen Hristev <eugen.hristev(a)collabora.com> --- drivers/net/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 09039a283eb5..39eee98ca79f 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -633,6 +633,7 @@ config RTL8139 config RTL8169 bool "Realtek 8169 series Ethernet controller driver" + depends on PCI help This driver supports Realtek 8169 series gigabit ethernet family of PCI/PCIe chipsets/adapters. -- 2.34.1

3 2

[PATCH] spl: ext: Use partition size for mount
by Mayuresh Chitale 14 Jun '23

14 Jun '23

Since commit 9905cae65e03 ("fs: ext4: check the minimal partition size to mount"), a valid size needs to be provided when mounting an ext filesystem. Fix the spl ext driver to use the parition size instead of 0 when mounting the filesystem. Signed-off-by: Mayuresh Chitale <mchitale(a)ventanamicro.com> --- common/spl/spl_ext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index f117c630bf..2bf3434439 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -28,7 +28,7 @@ int spl_load_image_ext(struct spl_image_info *spl_image, ext4fs_set_blk_dev(block_dev, &part_info); - err = ext4fs_mount(0); + err = ext4fs_mount(part_info.size); if (!err) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: ext4fs mount err - %d\n", __func__, err); @@ -82,7 +82,7 @@ int spl_load_image_ext_os(struct spl_image_info *spl_image, ext4fs_set_blk_dev(block_dev, &part_info); - err = ext4fs_mount(0); + err = ext4fs_mount(part_info.size); if (!err) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: ext4fs mount err - %d\n", __func__, err); -- 2.34.1

2 1

[PATCH] bootstd: Make BOOTSTD_FULL depend on BOOTSTD
by Simon Glass 14 Jun '23

14 Jun '23

Move BOOTSTD_FULL down in the file so that it can be enabled only when BOOTSTD is enabled. This prevents a build error if BOOTSTD is disabled but BOOTSTD_FULL is enabled. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- boot/Kconfig | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index 5f491625c82..47952bbba23 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -371,19 +371,6 @@ config BOOTSTD U-Boot) - bootflow - a description of how to boot (owned by the distro) -config BOOTSTD_FULL - bool "Enhanced features for standard boot" - default y if SANDBOX - help - This enables various useful features for standard boot, which are not - essential for operation: - - - bootdev, bootmeth commands - - extra features in the bootflow command - - support for selecting the ordering of bootmeths ("bootmeth order") - - support for selecting the ordering of bootdevs using the devicetree - as well as the "boot_targets" environment variable - config SPL_BOOTSTD bool "Standard boot support in VPL" depends on SPL && SPL_DM && SPL_OF_CONTROL && SPL_BLK @@ -406,6 +393,19 @@ config VPL_BOOTSTD if BOOTSTD +config BOOTSTD_FULL + bool "Enhanced features for standard boot" + default y if SANDBOX + help + This enables various useful features for standard boot, which are not + essential for operation: + + - bootdev, bootmeth commands + - extra features in the bootflow command + - support for selecting the ordering of bootmeths ("bootmeth order") + - support for selecting the ordering of bootdevs using the devicetree + as well as the "boot_targets" environment variable + config BOOTSTD_DEFAULTS bool "Select some common defaults for standard boot" depends on BOOTSTD -- 2.39.2.637.g21b0678d19-goog

3 2

[PATCH v2 0/5] rockchip: Fix eMMC performance regression
by Jonas Karlman 14 Jun '23

14 Jun '23

The eMMC performance on RK3399 was reduced sigificant by the commit 2cc6cde647e2 ("mmc: rockchip_sdhci: Limit number of blocks read in a single command"). That workaround should only have been applied to RK3568 and RK3588. This series fixes that and also help boost eMMC performance on two RK3399 boards even more by enabling use of SDMA. There is also an extra commit to help build a u-boot-rockchip-spi.bin image that can be used for SPI flash boot on RockPro64. Changes in v2: - Rebase on top of defconfig and spi v2 series - Collect r-b and t-b tags Jonas Karlman (5): mmc: rockchip_sdhci: Skip blocks read workaround on RK3399 mmc: rockchip_sdhci: Disable DMA mode using a device tree property rockchip: rockpro64: Use SDMA to boost eMMC performance rockchip: rock-pi-4: Use SDMA to boost eMMC performance rockchip: rockpro64: Build u-boot-rockchip-spi.bin arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 5 +++++ arch/arm/dts/rk3399-u-boot.dtsi | 1 + arch/arm/dts/rk3588s-u-boot.dtsi | 1 + configs/rock-pi-4-rk3399_defconfig | 2 ++ configs/rock5b-rk3588_defconfig | 1 - configs/rockpro64-rk3399_defconfig | 5 +++++ drivers/mmc/rockchip_sdhci.c | 12 +++++++++++- 8 files changed, 31 insertions(+), 2 deletions(-) -- 2.40.1

2 17

[PATCH v2 0/3] rcar: Select the correct device tree
by Detlev Casanova 14 Jun '23

14 Jun '23

The R-Car Starter Kit Premier(H3e WS3.0) uses the r8a779m1-ulcb.dtb. As u-boot can detect the board id and revision, let's use this to set the correct device tree for that board when using pxe. Changes since v1: * Also expose the board revision in sysinfo * Set the dtb depending on board revision * Move RCar board IDs definitions to sys_proto.h * fix checkpatch.pl warnings Detlev Casanova (3): renesas: rcar3: Expose the board id in sysinfo renesas: rcar3: Expose the board revision in sysinfo renesas: rcar3: Load the correct device tree .../arm/mach-rmobile/include/mach/sys_proto.h | 21 +++++ board/renesas/ulcb/ulcb.c | 59 ++++++++++++ configs/rcar3_ulcb_defconfig | 1 + drivers/sysinfo/rcar3.c | 90 +++++++++++-------- 4 files changed, 133 insertions(+), 38 deletions(-) -- 2.39.3

2 10

[PATCH v2] efi_selftests: fix controllers repeated selftesting
by Ilias Apalodimas 14 Jun '23

14 Jun '23

Running the controller selftest more than one times fails with => setenv efi_selftest 'controllers' && bootefi selftest Testing EFI API implementation Selected test: 'controllers' Setting up 'controllers' Setting up 'controllers' succeeded Executing 'controllers' Executing 'controllers' succeeded Summary: 0 failures => bootefi selftest Testing EFI API implementation Selected test: 'controllers' Setting up 'controllers' lib/efi_selftest/efi_selftest_controllers.c(280): ERROR: InstallProtocolInterface failed lib/efi_selftest/efi_selftest.c(89): ERROR: Setting up 'controllers' failed Summary: 1 failures There are multiple reason for this. We don't uninstall the binding interface from the controller handle and we don't reset the handle pointers either. So let's uninstall all the protocols properly and reset the handles to NULL on setup(). While at it add a forgotten check when uninstalling protocols from the handle_controller and make sure the number of child controllers is 0 Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- Changes since v1: - Move the binding protocol removal to .teardown() - return EFI_ST_FAILURE if the last count_child_controllers() fails lib/efi_selftest/efi_selftest_controllers.c | 26 ++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/lib/efi_selftest/efi_selftest_controllers.c b/lib/efi_selftest/efi_selftest_controllers.c index d2bbd1c4f65b..79bc86fb0c3a 100644 --- a/lib/efi_selftest/efi_selftest_controllers.c +++ b/lib/efi_selftest/efi_selftest_controllers.c @@ -271,6 +271,8 @@ static int setup(const efi_handle_t img_handle, efi_status_t ret; boottime = systable->boottime; + handle_controller = NULL; + handle_driver = NULL; /* Create controller handle */ ret = boottime->install_protocol_interface( @@ -402,14 +404,36 @@ static int execute(void) /* Check number of child controllers */ ret = count_child_controllers(handle_controller, &guid_controller, &count); - if (ret == EFI_SUCCESS) + if (ret == EFI_SUCCESS || count != 0) { efi_st_error("Uninstall failed\n"); + return EFI_ST_FAILURE; + } + + return EFI_ST_SUCCESS; } + /* + * Tear down unit test. + * + */ +static int teardown(void) +{ + efi_status_t ret; + /* Uninstall binding protocol */ + ret = boottime->uninstall_protocol_interface(handle_driver, + &guid_driver_binding_protocol, + &binding_interface); + if (ret != EFI_SUCCESS) + efi_st_error("Failed to uninstall protocols\n"); + + return ret; +} + EFI_UNIT_TEST(controllers) = { .name = "controllers", .phase = EFI_EXECUTE_BEFORE_BOOTTIME_EXIT, .setup = setup, .execute = execute, + .teardown = teardown, }; -- 2.39.2

2 1

[PATCH 1/2] configs: phycore-imx8mp_defconfig: Enable LTO
by Teresa Remmet 14 Jun '23

14 Jun '23

Enable LTO for binary size reduction. Signed-off-by: Teresa Remmet <t.remmet(a)phytec.de> --- configs/phycore-imx8mp_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index 3d076204ad03..7bf404be860b 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -21,6 +21,7 @@ CONFIG_SPL_STACK=0x960000 CONFIG_SPL=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_SYS_LOAD_ADDR=0x40480000 +CONFIG_LTO=y CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y -- 2.34.1

1 1

[PATCH 2/4] mmc: hi6220_dw_mmc: add compatible for HC2910 support
by Yang Xiwen 14 Jun '23

14 Jun '23

It adds compatible "hisilicon,hi3798mv200-dw-mshc" for HC2910 SoC Hi3798MV200 to probe this mmc driver. Signed-off-by: Yang Xiwen <forbidden405(a)outlook.com> --- drivers/mmc/hi6220_dw_mmc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mmc/hi6220_dw_mmc.c b/drivers/mmc/hi6220_dw_mmc.c index 2cec5b9ae3..71962cd47e 100644 --- a/drivers/mmc/hi6220_dw_mmc.c +++ b/drivers/mmc/hi6220_dw_mmc.c @@ -100,6 +100,8 @@ static const struct udevice_id hi6220_dwmmc_ids[] = { .data = (ulong)&hi6220_mmc_data }, { .compatible = "hisilicon,hi3798cv200-dw-mshc", .data = (ulong)&hi6220_mmc_data }, + { .compatible = "hisilicon,hi3798mv200-dw-mshc", + .data = (ulong)&hi6220_mmc_data }, { .compatible = "hisilicon,hi3660-dw-mshc", .data = (ulong)&hi3660_mmc_data }, { } -- 2.39.1

2 1