January 2025 - U-Boot

[PATCH] rockchip: rk3399: nanopi-r4s: Support v1.8 SD cards in SPL
by Justin Klaassen 26 Jan '25

26 Jan '25

The NanoPi R4S supports UHS-I (up to SDR104) SD cards, however using any of these 1.8v modes results in a boot failure in SPL upon soft reboot. On the R4S the SD card power cannot be cycled, so upon reboot the SD card continues to operate at 1.8v but the GPIO is configured by default at the 3.3v level. This change enables the RK8XX regulators and Rockchip IO-domain drivers in SPL, which reads the voltage level of the "vcc_sdio" regulator and configures the GPIO for the appropriate level on boot. This allows the MMC subsystem to operate successfully at the 1.8v level in SPL. Signed-off-by: Justin Klaassen <justin(a)tidylabs.net> --- arch/arm/dts/rk3399-nanopi4-u-boot.dtsi | 9 +++++++++ configs/nanopi-r4s-rk3399_defconfig | 7 +++++++ drivers/misc/Kconfig | 8 ++++++++ drivers/misc/rockchip-io-domain.c | 7 ++++++- drivers/power/regulator/Kconfig | 9 +++++++++ drivers/power/regulator/rk8xx.c | 2 +- 6 files changed, 40 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi index 75736124996..146b62c2e7a 100644 --- a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi +++ b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi @@ -23,4 +23,13 @@ &vcc_sdio { regulator-init-microvolt = <3000000>; + bootph-pre-ram; +}; + +&io_domains { + bootph-pre-ram; +}; + +&i2c0_xfer { + bootph-pre-ram; }; diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig index a6dafe3d9eb..905de05026f 100644 --- a/configs/nanopi-r4s-rk3399_defconfig +++ b/configs/nanopi-r4s-rk3399_defconfig @@ -8,6 +8,7 @@ CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-nanopi-r4s" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3399=y +CONFIG_SPL_DRIVERS_MISC=y CONFIG_TARGET_EVB_RK3399=y CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_DEBUG_UART_BASE=0xFF1A0000 @@ -18,6 +19,8 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x40000 CONFIG_SPL_PAD_TO=0x7f8000 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +CONFIG_SPL_I2C=y +CONFIG_SPL_POWER=y CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_TPL=y CONFIG_CMD_BOOTZ=y @@ -33,6 +36,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_ROCKCHIP_IODOMAIN=y +CONFIG_SPL_ROCKCHIP_IODOMAIN=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y @@ -45,8 +49,11 @@ CONFIG_GMAC_ROCKCHIP=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_TYPEC=y CONFIG_PMIC_RK8XX=y +CONFIG_SPL_PMIC_RK8XX=y +CONFIG_SPL_DM_REGULATOR=y CONFIG_SPL_DM_REGULATOR_FIXED=y CONFIG_REGULATOR_RK8XX=y +CONFIG_SPL_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM_ROCKCHIP_LPDDR4=y CONFIG_BAUDRATE=1500000 diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index da84b35e804..ad935b81ae1 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -110,6 +110,14 @@ config ROCKCHIP_IODOMAIN for the IO-domain setting of the SoC to match the voltage supplied by the regulators. +config SPL_ROCKCHIP_IODOMAIN + bool "Rockchip IO-domain driver support in SPL" + depends on SPL_MISC && ARCH_ROCKCHIP + help + Enable support for IO-domains in Rockchip SoCs in SPL. It is necessary + for the IO-domain setting of the SoC to match the voltage supplied + by the regulators. + config SIFIVE_OTP bool "SiFive eMemory OTP driver" depends on MISC diff --git a/drivers/misc/rockchip-io-domain.c b/drivers/misc/rockchip-io-domain.c index 025b6049a9f..d24d0781b08 100644 --- a/drivers/misc/rockchip-io-domain.c +++ b/drivers/misc/rockchip-io-domain.c @@ -5,6 +5,8 @@ * Ported from linux drivers/soc/rockchip/io-domain.c */ +#define LOG_CATEGORY UCLASS_NOP + #include <dm.h> #include <dm/device_compat.h> #include <regmap.h> @@ -344,8 +346,10 @@ static int rockchip_iodomain_probe(struct udevice *dev) continue; ret = device_get_supply_regulator(dev, supply_name, &reg); - if (ret) + if (ret) { + log_debug("%s: Missing regulator for %s\n", __func__, supply_name); continue; + } ret = regulator_autoset(reg); if (ret && ret != -EALREADY && ret != -EMEDIUMTYPE && @@ -353,6 +357,7 @@ static int rockchip_iodomain_probe(struct udevice *dev) continue; uV = regulator_get_value(reg); + log_debug("%s: %s = %dV\n", __func__, supply_name, uV); if (uV <= 0) continue; diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig index 958f337c7e7..d873ca06a47 100644 --- a/drivers/power/regulator/Kconfig +++ b/drivers/power/regulator/Kconfig @@ -241,6 +241,15 @@ config REGULATOR_RK8XX by the PMIC device. This driver is controlled by a device tree node which includes voltage limits. +config SPL_REGULATOR_RK8XX + bool "Enable driver for RK8XX regulators in SPL" + depends on SPL_DM_REGULATOR && SPL_PMIC_RK8XX + ---help--- + Enable support for the regulator functions of the RK8XX PMIC in SPL. The + driver implements get/set api for the various BUCKS and LDOs supported + by the PMIC device. This driver is controlled by a device tree node + which includes voltage limits. + config DM_REGULATOR_S2MPS11 bool "Enable driver for S2MPS11 regulator" depends on DM_REGULATOR && PMIC_S2MPS11 diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c index 368675ebb9f..35615e96b1c 100644 --- a/drivers/power/regulator/rk8xx.c +++ b/drivers/power/regulator/rk8xx.c @@ -16,7 +16,7 @@ #include <power/pmic.h> #include <power/regulator.h> -#ifndef CONFIG_XPL_BUILD +#if CONFIG_IS_ENABLED(REGULATOR_RK8XX) #define ENABLE_DRIVER #endif -- 2.45.3

2 2

[PATCH 0/4] test: A few quality-of-life improvements
by Simon Glass 26 Jan '25

26 Jan '25

This little series includes a few patches to make it easier to work with the Python tests, by shortening identifiers and renaming the 'console' fixture to reflect its role as the top-level fixture. It also adds a command to fix testing on samus_tpl This series is based on the previous 'test' series[1] [1] https://patchwork.ozlabs.org/project/uboot/list/?series=441124 Simon Glass (4): test/py: Shorten u_boot_console test: Drop u_boot_ prefix on test files test/py: Show info about module-loading test: Make net tests depend on CONFIG_CMD_NET doc/develop/py_testing.rst | 16 +- doc/develop/tests_writing.rst | 12 +- test/py/conftest.py | 89 +++--- ...u_boot_console_base.py => console_base.py} | 8 +- ...onsole_exec_attach.py => console_board.py} | 6 +- ..._console_sandbox.py => console_sandbox.py} | 8 +- test/py/{u_boot_spawn.py => spawn.py} | 0 test/py/tests/fit_util.py | 12 +- test/py/tests/test_000_version.py | 8 +- test/py/tests/test_android/test_ab.py | 48 +-- test/py/tests/test_android/test_abootimg.py | 92 +++--- test/py/tests/test_android/test_avb.py | 50 ++-- test/py/tests/test_bind.py | 72 ++--- test/py/tests/test_bootmenu.py | 46 +-- test/py/tests/test_bootstage.py | 18 +- test/py/tests/test_button.py | 16 +- test/py/tests/test_cat/test_cat.py | 6 +- test/py/tests/test_dfu.py | 54 ++-- test/py/tests/test_dm.py | 28 +- .../test_efi_bootmgr/test_efi_bootmgr.py | 34 +-- .../tests/test_efi_capsule/capsule_common.py | 60 ++-- .../test_capsule_firmware_fit.py | 100 +++---- .../test_capsule_firmware_raw.py | 126 ++++---- .../test_capsule_firmware_signed_fit.py | 104 +++---- .../test_capsule_firmware_signed_raw.py | 104 +++---- test/py/tests/test_efi_fit.py | 6 +- test/py/tests/test_efi_loader.py | 84 +++--- .../py/tests/test_efi_secboot/test_authvar.py | 120 ++++---- test/py/tests/test_efi_secboot/test_signed.py | 148 ++++----- .../test_efi_secboot/test_signed_intca.py | 46 +-- .../tests/test_efi_secboot/test_unsigned.py | 42 +-- test/py/tests/test_efi_selftest.py | 180 +++++------ .../py/tests/test_eficonfig/test_eficonfig.py | 106 +++---- test/py/tests/test_env.py | 78 ++--- test/py/tests/test_event_dump.py | 6 +- test/py/tests/test_extension.py | 32 +- test/py/tests/test_fit.py | 6 +- test/py/tests/test_fit_auto_signed.py | 6 +- test/py/tests/test_fit_ecdsa.py | 6 +- test/py/tests/test_fit_hashes.py | 6 +- test/py/tests/test_fpga.py | 280 +++++++++--------- test/py/tests/test_fs/conftest.py | 2 +- test/py/tests/test_fs/test_basic.py | 104 +++---- test/py/tests/test_fs/test_erofs.py | 76 ++--- test/py/tests/test_fs/test_ext.py | 124 ++++---- test/py/tests/test_fs/test_fs_cmd.py | 4 +- test/py/tests/test_fs/test_fs_fat.py | 6 +- test/py/tests/test_fs/test_mkdir.py | 48 +-- .../test_fs/test_squashfs/test_sqfs_load.py | 54 ++-- .../test_fs/test_squashfs/test_sqfs_ls.py | 64 ++-- test/py/tests/test_fs/test_symlink.py | 46 +-- test/py/tests/test_fs/test_unlink.py | 50 ++-- test/py/tests/test_gpio.py | 106 +++---- test/py/tests/test_gpt.py | 178 +++++------ test/py/tests/test_handoff.py | 4 +- test/py/tests/test_help.py | 18 +- test/py/tests/test_i2c.py | 44 +-- test/py/tests/test_kconfig.py | 10 +- test/py/tests/test_log.py | 10 +- test/py/tests/test_lsblk.py | 4 +- test/py/tests/test_md.py | 22 +- test/py/tests/test_mdio.py | 32 +- test/py/tests/test_memtest.py | 26 +- test/py/tests/test_mii.py | 50 ++-- test/py/tests/test_mmc.py | 148 ++++----- test/py/tests/test_mmc_rd.py | 54 ++-- test/py/tests/test_mmc_wr.py | 20 +- test/py/tests/test_net.py | 142 ++++----- test/py/tests/test_net_boot.py | 144 ++++----- test/py/tests/test_of_migrate.py | 14 +- test/py/tests/test_ofplatdata.py | 6 +- test/py/tests/test_optee_rpmb.py | 10 +- test/py/tests/test_part.py | 4 +- test/py/tests/test_pinmux.py | 32 +- test/py/tests/test_pstore.py | 48 +-- test/py/tests/test_qfw.py | 8 +- test/py/tests/test_reset.py | 24 +- test/py/tests/test_sandbox_exit.py | 28 +- test/py/tests/test_sandbox_opts.py | 10 +- test/py/tests/test_saveenv.py | 70 ++--- test/py/tests/test_scp03.py | 8 +- test/py/tests/test_scsi.py | 48 +-- test/py/tests/test_semihosting/test_hostfs.py | 14 +- test/py/tests/test_sf.py | 66 ++--- test/py/tests/test_shell_basics.py | 30 +- test/py/tests/test_sleep.py | 26 +- test/py/tests/test_smbios.py | 12 +- test/py/tests/test_source.py | 6 +- test/py/tests/test_spi.py | 242 +++++++-------- test/py/tests/test_spl.py | 12 +- test/py/tests/test_stackprotector.py | 8 +- test/py/tests/test_tpm2.py | 190 ++++++------ test/py/tests/test_trace.py | 6 +- test/py/tests/test_ums.py | 48 +-- test/py/tests/test_unknown_cmd.py | 6 +- test/py/tests/test_upl.py | 6 +- test/py/tests/test_usb.py | 206 ++++++------- test/py/tests/test_ut.py | 128 ++++---- test/py/tests/test_vbe.py | 4 +- test/py/tests/test_vbe_vpl.py | 14 +- test/py/tests/test_vboot.py | 12 +- test/py/tests/test_vpl.py | 8 +- test/py/tests/test_xxd/test_xxd.py | 6 +- test/py/tests/test_zynq_secure.py | 96 +++--- test/py/tests/test_zynqmp_rpu.py | 106 +++---- test/py/tests/test_zynqmp_secure.py | 42 +-- test/py/{u_boot_utils.py => utils.py} | 44 +-- 107 files changed, 2758 insertions(+), 2749 deletions(-) rename test/py/{u_boot_console_base.py => console_base.py} (99%) rename test/py/{u_boot_console_exec_attach.py => console_board.py} (95%) rename test/py/{u_boot_console_sandbox.py => console_sandbox.py} (93%) rename test/py/{u_boot_spawn.py => spawn.py} (100%) rename test/py/{u_boot_utils.py => utils.py} (89%) -- 2.43.0

2 22

[PATCH v3] led: add function naming option from linux
by Heiko Schocher 26 Jan '25

26 Jan '25

in linux we have the option to create the name of a led optionally through the following properties: - function - color - function-enumerator This patch adds support for parsing this properties if there is no label property. To be as close as possible to linux import the following files from it: include/dt-bindings/leds/common.h include/linux/uapi/linux/uleds.h base commit was: commit: b8f52214c61a ("Merge tag 'audit-pr-20241205' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit") The led name is created in led_post_bind() and we need some storage place for it. Currently this patch prevents to use malloc() instead it stores the name in new member : char name[LED_MAX_NAME_SIZE]; of struct led_uc_plat. While at it append led tests for the new feature. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- as we introduce a new element in struct led_uc_priv, may we should add this functionality through a new Kconfig option? (Which also would make this optional and save some bytes for boards who do not need this...) Azure build: https://dev.azure.com/hs0298/hs/_build/results?buildId=165&view=results Changes in v3: - work in comment from Tom: remove new file include/dt-bindings/leds/common.h in this patch as it is already in dts/upstream/include/dt-bindings/leds/common.h and so the checkpatch warnings from this file are gone! Thanks! Good catch! remove file include/linux/uapi/linux/uleds.h and as we only need one define from it, add this define in include/led.h Changes in v2: - remove unused name variable in function led_get_label() - rebased patch to current HEAD 82d262ae162 ("Merge patch series "MediaTek MT7629 OF_UPSTREAM migration (v2)"") arch/sandbox/dts/test.dts | 37 ++++++++++++- doc/device-tree-bindings/leds/common.txt | 28 ++++++++++ drivers/led/led-uclass.c | 70 ++++++++++++++++++++++-- include/led.h | 6 ++ test/dm/led.c | 22 +++++++- test/dm/ofnode.c | 2 +- 6 files changed, 158 insertions(+), 7 deletions(-) diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index ae52b375ccb..b8f3012873e 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -13,6 +13,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/sandbox-gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/pinctrl/sandbox-pinmux.h> #include <dt-bindings/mux/mux.h> @@ -820,7 +821,7 @@ gpio-controller; #gpio-cells = <1>; gpio-bank-name = "a"; - sandbox,gpio-count = <20>; + sandbox,gpio-count = <25>; hog_input_active_low { gpio-hog; input; @@ -1010,6 +1011,40 @@ /* label intentionally omitted */ default-state = "off"; }; + + led-20 { + gpios = <&gpio_a 20 0>; + /* label intentionally omitted */ + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_RED>; + function-enumerator = <20>; + }; + + led-21 { + gpios = <&gpio_a 21 0>; + /* label intentionally omitted */ + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_GREEN>; + }; + + led-22 { + gpios = <&gpio_a 22 0>; + /* label intentionally omitted */ + function = LED_FUNCTION_STATUS; + }; + + led-23 { + gpios = <&gpio_a 23 0>; + /* label intentionally omitted */ + color = <LED_COLOR_ID_GREEN>; + }; + + led-24 { + gpios = <&gpio_a 24 0>; + label = "sandbox:function"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_GREEN>; + }; }; wdt-gpio-toggle { diff --git a/doc/device-tree-bindings/leds/common.txt b/doc/device-tree-bindings/leds/common.txt index 2d88816dd55..10b2cd84113 100644 --- a/doc/device-tree-bindings/leds/common.txt +++ b/doc/device-tree-bindings/leds/common.txt @@ -4,6 +4,21 @@ Optional properties for child nodes: - label : The label for this LED. If omitted, the label is taken from the node name (excluding the unit address). +- function: + LED function. Use one of the LED_FUNCTION_* prefixed definitions + from the header include/dt-bindings/leds/common.h. If there is no + matching LED_FUNCTION available, add a new one. + +- color: + Color of the LED. Use one of the LED_COLOR_ID_* prefixed definitions from + the header include/dt-bindings/leds/common.h. If there is no matching + LED_COLOR_ID available, add a new one. + +- function-enumerator: + optional + Integer to be used when more than one instance of the same function is + needed, differing only with an ordinal number. + - linux,default-trigger : This parameter, if present, is a string defining the trigger assigned to the LED. Current triggers are: "backlight" - LED will act as a back-light, controlled by the framebuffer @@ -21,3 +36,16 @@ system-status { linux,default-trigger = "heartbeat"; ... }; + +led-0 { + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_RED>; + function-enumerator = <20>; + ... +}; + +led-1 { + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_YELLOW>; + ... +}; diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c index 760750568c0..27ef890ed0a 100644 --- a/drivers/led/led-uclass.c +++ b/drivers/led/led-uclass.c @@ -13,6 +13,25 @@ #include <dm/lists.h> #include <dm/root.h> #include <dm/uclass-internal.h> +#include <dt-bindings/leds/common.h> + +static const char * const led_colors[LED_COLOR_ID_MAX] = { + [LED_COLOR_ID_WHITE] = "white", + [LED_COLOR_ID_RED] = "red", + [LED_COLOR_ID_GREEN] = "green", + [LED_COLOR_ID_BLUE] = "blue", + [LED_COLOR_ID_AMBER] = "amber", + [LED_COLOR_ID_VIOLET] = "violet", + [LED_COLOR_ID_YELLOW] = "yellow", + [LED_COLOR_ID_IR] = "ir", + [LED_COLOR_ID_MULTI] = "multicolor", + [LED_COLOR_ID_RGB] = "rgb", + [LED_COLOR_ID_PURPLE] = "purple", + [LED_COLOR_ID_ORANGE] = "orange", + [LED_COLOR_ID_PINK] = "pink", + [LED_COLOR_ID_CYAN] = "cyan", + [LED_COLOR_ID_LIME] = "lime", +}; int led_bind_generic(struct udevice *parent, const char *driver_name) { @@ -232,11 +251,54 @@ int led_activity_blink(void) #endif #endif -static const char *led_get_label(ofnode node) +static const char *led_get_function_name(struct udevice *dev) +{ + struct led_uc_plat *uc_plat; + const char *func; + u32 color; + u32 enumerator; + int ret; + int cp; + + if (!dev) + return NULL; + + uc_plat = dev_get_uclass_plat(dev); + if (!uc_plat) + return NULL; + + if (uc_plat->label) + return uc_plat->label; + + /* Now try to detect function label name */ + func = dev_read_string(dev, "function"); + cp = dev_read_u32(dev, "color", &color); + if (cp == 0 || func) { + ret = dev_read_u32(dev, "function-enumerator", &enumerator); + if (!ret) { + snprintf(uc_plat->name, LED_MAX_NAME_SIZE, + "%s:%s-%d", + cp ? "" : led_colors[color], + func ? func : "", enumerator); + } else { + snprintf(uc_plat->name, LED_MAX_NAME_SIZE, + "%s:%s", + cp ? "" : led_colors[color], + func ? func : ""); + } + uc_plat->label = uc_plat->name; + } + + return uc_plat->label; +} + +static const char *led_get_label(struct udevice *dev, ofnode node) { const char *label; label = ofnode_read_string(node, "label"); + if (!label) + label = led_get_function_name(dev); if (!label && !ofnode_read_string(node, "compatible")) label = ofnode_get_name(node); @@ -249,7 +311,7 @@ static int led_post_bind(struct udevice *dev) const char *default_state; if (!uc_plat->label) - uc_plat->label = led_get_label(dev_ofnode(dev)); + uc_plat->label = led_get_label(dev, dev_ofnode(dev)); uc_plat->default_state = LEDST_COUNT; @@ -314,14 +376,14 @@ static int led_init(struct uclass *uc) #ifdef CONFIG_LED_BOOT ret = ofnode_options_get_by_phandle("boot-led", &led_node); if (!ret) - priv->boot_led_label = led_get_label(led_node); + priv->boot_led_label = led_get_label(NULL, led_node); priv->boot_led_period = ofnode_options_read_int("boot-led-period-ms", 250); #endif #ifdef CONFIG_LED_ACTIVITY ret = ofnode_options_get_by_phandle("activity-led", &led_node); if (!ret) - priv->activity_led_label = led_get_label(led_node); + priv->activity_led_label = led_get_label(NULL, led_node); priv->activity_led_period = ofnode_options_read_int("activity-led-period-ms", 250); #endif diff --git a/include/led.h b/include/led.h index 64247cd3a70..a67db7af38d 100644 --- a/include/led.h +++ b/include/led.h @@ -53,6 +53,11 @@ struct udevice; +/* + * value imported from linux:include/linux/uapi/linux/uleds.h + */ +#define LED_MAX_NAME_SIZE 64 + enum led_state_t { LEDST_OFF = 0, LEDST_ON = 1, @@ -86,6 +91,7 @@ struct led_sw_blink { struct led_uc_plat { const char *label; enum led_state_t default_state; + char name[LED_MAX_NAME_SIZE]; #ifdef CONFIG_LED_SW_BLINK struct led_sw_blink *sw_blink; #endif diff --git a/test/dm/led.c b/test/dm/led.c index e5b86326c3a..36652c2833a 100644 --- a/test/dm/led.c +++ b/test/dm/led.c @@ -20,7 +20,12 @@ static int dm_test_led_base(struct unit_test_state *uts) ut_assertok(uclass_get_device(UCLASS_LED, 1, &dev)); ut_assertok(uclass_get_device(UCLASS_LED, 2, &dev)); ut_assertok(uclass_get_device(UCLASS_LED, 3, &dev)); - ut_asserteq(-ENODEV, uclass_get_device(UCLASS_LED, 4, &dev)); + ut_assertok(uclass_get_device(UCLASS_LED, 4, &dev)); + ut_assertok(uclass_get_device(UCLASS_LED, 5, &dev)); + ut_assertok(uclass_get_device(UCLASS_LED, 6, &dev)); + ut_assertok(uclass_get_device(UCLASS_LED, 7, &dev)); + ut_assertok(uclass_get_device(UCLASS_LED, 8, &dev)); + ut_asserteq(-ENODEV, uclass_get_device(UCLASS_LED, 9, &dev)); return 0; } @@ -110,6 +115,21 @@ static int dm_test_led_label(struct unit_test_state *uts) ut_asserteq(-ENODEV, led_get_by_label("sandbox:blue", &dev)); + /* Test if function, color and function-enumerator naming works */ + ut_assertok(led_get_by_label("red:status-20", &dev)); + + /* Test if function, color naming works */ + ut_assertok(led_get_by_label("green:status", &dev)); + + /* Test if function, without color naming works */ + ut_assertok(led_get_by_label(":status", &dev)); + + /* Test if color without function naming works */ + ut_assertok(led_get_by_label("green:", &dev)); + + /* Test if function, color naming is ignored if label is found */ + ut_assertok(led_get_by_label("sandbox:function", &dev)); + return 0; } DM_TEST(dm_test_led_label, UTF_SCAN_PDATA | UTF_SCAN_FDT); diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index f16b643fa3f..72f4e80f637 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -1580,7 +1580,7 @@ static int dm_test_ofnode_delete(struct unit_test_state *uts) ut_assert(!ofnode_valid(node)); ut_assert(!ofnode_valid(ofnode_path("/leds/default_on"))); - ut_asserteq(2, ofnode_get_child_count(ofnode_path("/leds"))); + ut_asserteq(7, ofnode_get_child_count(ofnode_path("/leds"))); return 0; } -- 2.20.1

2 3

[PATCH v2 0/1] gitlab: Fixes to get StarFive VisionFive2 into the sjg lab
by Simon Glass 26 Jan '25

26 Jan '25

This board fought valiantly against attempts to add it to my lab. After several hours of debugging, I found problems in the Labgrid integration (not included here), test.py and buildman This series fixes these and the board now seems to be reliable enough. Note that the board fails test_dm_compat Link: https://github.com/labgrid-project/labgrid/pull/1411 Changes in v2: - Rename the board to vf2 - Add a comment about what the board is Simon Glass (1): gitlab: Add a StarFive VisionFive2 to the sjg lab .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.34.1

3 4

[PATCH 0/5] gitlab: Fixes to get StarFive VisionFive2 into the sjg lab
by Simon Glass 26 Jan '25

26 Jan '25

This board fought valiantly against attempts to add it to my lab. After several hours of debugging, I found problems in the Labgrid integration (not included here), test.py and buildman This series fixes these and the board now seems to be reliable enough. Note that the board fails test_dm_compat Link: https://github.com/labgrid-project/labgrid/pull/1411 Simon Glass (5): test/py: Provide the correct U_BOOT_SOURCE_DIR to getrole test/py: Handle u-boot-test-getrole failure buildman: Drop unused OUTPUT_FILE constant buildman: Record an error if a toolchain is missing gitlab: Add a StarFive VisionFive2 to the sjg lab .gitlab-ci.yml | 5 +++++ test/py/conftest.py | 9 +++++++-- tools/buildman/boards.py | 1 - tools/buildman/builderthread.py | 8 ++++++-- 4 files changed, 18 insertions(+), 5 deletions(-) -- 2.34.1

4 9

[PATCH 1/2] binman: Rename Entry.end_4gb
by Simon Glass 26 Jan '25

26 Jan '25

The property is named end_at_4gb so name the variable the same, to avoid confusion. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- tools/binman/entry.py | 2 +- tools/binman/etype/section.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 68f8d62bba9..e506b552a8d 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -722,7 +722,7 @@ class Entry(object): is_elf = self.GetDefaultFilename() == self.elf_fname symbols_base = self.symbols_base - if symbols_base is None and self.GetImage()._end_4gb: + if symbols_base is None and self.GetImage()._end_at_4gb: symbols_base = 0 elf.LookupAndWriteSymbols(self.elf_fname, self, section.GetImage(), diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index f4f48c00e87..020fd57d704 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -165,7 +165,7 @@ class Entry_section(Entry): self._pad_byte = 0 self._sort = False self._skip_at_start = None - self._end_4gb = False + self._end_at_4gb = False self._ignore_missing = False self._filename = None self.align_default = 0 @@ -187,9 +187,9 @@ class Entry_section(Entry): super().ReadNode() self._pad_byte = fdt_util.GetInt(self._node, 'pad-byte', 0) self._sort = fdt_util.GetBool(self._node, 'sort-by-offset') - self._end_4gb = fdt_util.GetBool(self._node, 'end-at-4gb') + self._end_at_4gb = fdt_util.GetBool(self._node, 'end-at-4gb') self._skip_at_start = fdt_util.GetInt(self._node, 'skip-at-start') - if self._end_4gb: + if self._end_at_4gb: if not self.size: self.Raise("Section size must be provided when using end-at-4gb") if self._skip_at_start is not None: -- 2.43.0

1 1

[PATCH] test/py: Add a report show test durations
by Simon Glass 26 Jan '25

26 Jan '25

Execution time varies widely with the existing tests. Provides a summary of the time taken for each test, along with a histogram. Example: Duration : Number of tests ======== : ======================================== <1ms : 1 <8ms : 1 <20ms : # 20 <30ms : ######## 127 <50ms : ######################################## 582 <75ms : ####### 102 <100ms : ## 39 <200ms : ##### 86 <300ms : # 29 <500ms : ## 42 <750ms : # 16 <1.0s : # 15 <2.0s : # 23 <3.0s : 13 <5.0s : 9 <7.5s : 1 <10.0s : 6 <20.0s : 12 Signed-off-by: Simon Glass <sjg(a)chromium.org> --- test/py/conftest.py | 77 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/test/py/conftest.py b/test/py/conftest.py index 3bd333bfd24..a245f32dc8a 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -25,6 +25,7 @@ import re from _pytest.runner import runtestprotocol import subprocess import sys +import time from u_boot_spawn import BootFail, Timeout, Unexpected, handle_exception # Globals: The HTML log file, and the connection to the U-Boot console. @@ -516,6 +517,12 @@ tests_skipped = [] tests_warning = [] tests_passed = [] +# Duration of each test: +# key (string): test name +# value (float): duration in ms +test_durations = {} + + def pytest_itemcollected(item): """pytest hook: Called once for each test found during collection. @@ -531,6 +538,67 @@ def pytest_itemcollected(item): tests_not_run.append(item.name) + +def show_timings(): + """Write timings for each test, along with a histogram""" + + def get_time_delta(msecs): + """Convert milliseconds into a user-friendly string""" + if msecs >= 1000: + return f'{msecs / 1000:.1f}s' + else: + return f'{msecs:.0f}ms' + + def show_bar(key, value): + """Show a single bar (line) of the histogram + + Args: + key (str): Key to write on the left + value (int): Value to display, i.e. the relative length of the bar + """ + if value: + bar_length = int((value / max_count) * max_bar_length) + print(f"{key:>8} : {'#' * bar_length} {value}", file=buf) + + # Create the buckets we will use + bucket = {} + for power in range(5): + for i in [1, 2, 3, 4, 5, 7.5]: + bucket[i * 10 ** power] = 0 + max_dur = max(bucket.keys()) + + # Collect counts for each bucket; if outside the range, add to too_long + # Also show a sorted list of test timings from longest to shortest + too_long = 0 + with log.section('Timing Report', 'timing_report'): + for name, dur in sorted(test_durations.items(), key=lambda kv: kv[1], + reverse=True): + log.info(f'{get_time_delta(dur):>8} {name}') + greater = [k for k in bucket.keys() if dur <= k] + if greater: + bucket[min(greater)] += 1 + else: + too_long += 1 + + # Set the maximum length of a histogram bar, in characters + max_bar_length = 40 + + # Show a a summary with histogram + buf = io.StringIO() + with log.section('Timing Summary', 'timing_summary'): + print('Duration : Number of tests', file=buf) + print(f'{"=" * 8} : {"=" * max_bar_length}', file=buf) + max_count = max(bucket.values()) + for dur, count in bucket.items(): + if count: + label = get_time_delta(dur) + show_bar(f'<{label}', count) + if too_long: + show_bar(f'>{get_time_delta(max_dur)}', too_long) + log.info(buf.getvalue()) + print(buf.getvalue(), end='') + + def cleanup(): """Clean up all global state. @@ -580,6 +648,7 @@ def cleanup(): for test in tests_not_run: anchor = anchors.get(test, None) log.status_fail('... ' + test, anchor) + show_timings() log.close() atexit.register(cleanup) @@ -713,7 +782,9 @@ def pytest_runtest_protocol(item, nextitem): log.get_and_reset_warning() ihook = item.ihook ihook.pytest_runtest_logstart(nodeid=item.nodeid, location=item.location) + start = time.monotonic() reports = runtestprotocol(item, nextitem=nextitem) + duration = round((time.monotonic() - start) * 1000, 1) ihook.pytest_runtest_logfinish(nodeid=item.nodeid, location=item.location) was_warning = log.get_and_reset_warning() @@ -726,6 +797,7 @@ def pytest_runtest_protocol(item, nextitem): start_test_section(item) failure_cleanup = False + record_duration = True if not was_warning: test_list = tests_passed msg = 'OK' @@ -756,6 +828,11 @@ def pytest_runtest_protocol(item, nextitem): test_list = tests_skipped msg = 'SKIPPED:\n' + str(report.longrepr) msg_log = log.status_skipped + record_duration = False + + msg += f' {duration} ms' + if record_duration: + test_durations[item.name] = duration if failure_cleanup: console.drain_console() -- 2.43.0

2 9

[PATCH 0/3] qcom: MSM8916 sysreset support
by Sam Day 25 Jan '25

25 Jan '25

Most MSM8916 devices shipped without PSCI support in their TZ firmware. Instead, they use PSHOLD. These patches enable both PSCI and PSHOLD sysreset drivers in qcom_defconfig. Caleb had already submitted ([1]) a patch to do the switch to PSCI sysreset driver as part of the UEFI capsule update series, but it seems that the sysreset patch didn't make it upstream. It's worth noting that sysreset still won't work if booting with a control DT from upstream, as the msm8916.dtsi there includes a /psci node. As far as I'm aware, only the db410c ever received a firmware update with any PSCI support, so I intend to send a patch to kernel to remove the default /psci node for msm8916 devices, assuming I get the green light ([2]). I've tested in a local tree that includes a u-boot specific tweak to remove the /psci node, and confirmed that qcom_defconfig can reset both an msm8916 device and an sdm845 one. [1]: https://lore.kernel.org/all/20240527-b4-qcom-capsule-updates-v2-6-47583d7ad… [2]: https://github.com/msm8916-mainline/linux/issues/388 Signed-off-by: Sam Day <me(a)samcday.com> --- Sam Day (3): mach-snapdragon: use PSCI sysreset driver sysreset: qcom-pshold: remove ARCH_IPQ40XX dependency qcom_defconfig: enable SYSRESET_QCOM_PSHOLD arch/arm/mach-snapdragon/board.c | 5 ----- configs/qcom_defconfig | 3 +++ drivers/sysreset/Kconfig | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) --- base-commit: 8162f35a108441b8d7a44ac9266c1a64dbf79fd5 change-id: 20250121-msm8916-sysreset-580d9a65a759 Best regards, -- Sam Day <me(a)samcday.com>

1 3

[PATCH v3 00/19] bootstd: Support recording images
by Simon Glass 25 Jan '25

25 Jan '25

This series provides a way to keep track of the images used in bootstd, including the type of each image. At present this is sort-of handled by struct bootflow but in quite an ad-hoc way. The structure has become quite large and is hard to query. Future work will be able to reduce its size. Ultimately the 'bootflow info' command may change to also show images as a list, but that is left for later, as this series is already fairly long. So for now, just introduce the concept and adjust bootstd to use it, with a simple command to list the images. This series includes various alist enhancements, to make use of this new data structure a little easier. Changes in v3: - Add a helper in bootflow - Add a new patch supporting ad-hoc bootflows - Add new patch to export bootdev_get_from_blk() - Add new patch to record loaded files in an ad-hoc bootflow - Update bootstd_add_bootflow() to return the element number - Use the helper function Changes in v2: - Add an image type extension in bootflow.h - Change the tag to bootmeth_efi - Drop patches already applied - Drop patches which add new image types - Update to use a new image-type enum in bootflow.h - Use the word 'feature' instead of 'hack' Simon Glass (19): bootstd: Move bootflow-adding to bootstd bootstd: Move bootflow-clearing to bootstd bootstd: Add a function to get bootstd only if available bootstd: Drop the bootdev-specific list of bootflows bootstd: Move the bootflow list into an alist bootstd: Maintain a list of images bootstd: Update bootmeth_alloc_file() to record images boot: pxe: Drop the duplicate comment on get_pxe_file() bootmeth_efi: Simplify reading files by using the common function bootmeth: Update the read_file() method to include a type bootmeth_efi: Check the filename-allocation in the network path boot: Update extlinux pxe_getfile_func() to include type boot: Update pxe bootmeth to record images Update bootmeth_alloc_other() to record images bootstd: Update cros bootmeth to record images bootstd: Add a simple command to list images bootstd: Export bootdev_get_from_blk() bootstd: Add the concept of an ad-hoc bootflow fs: Record loaded files in an ad-hoc bootflow boot/bootdev-uclass.c | 78 ++++++------------- boot/bootflow.c | 77 +++++++++++++++---- boot/bootmeth-uclass.c | 29 +++++-- boot/bootmeth_android.c | 3 +- boot/bootmeth_cros.c | 17 ++++- boot/bootmeth_efi.c | 16 ++-- boot/bootmeth_efi_mgr.c | 3 +- boot/bootmeth_extlinux.c | 7 +- boot/bootmeth_pxe.c | 10 ++- boot/bootmeth_qfw.c | 3 +- boot/bootmeth_sandbox.c | 3 +- boot/bootmeth_script.c | 7 +- boot/bootstd-uclass.c | 104 +++++++++++++++++++++++-- boot/pxe_utils.c | 36 ++++----- boot/vbe_simple.c | 5 +- cmd/Kconfig | 9 +++ cmd/Makefile | 1 + cmd/bootdev.c | 2 +- cmd/bootflow.c | 11 +-- cmd/bootstd.c | 65 ++++++++++++++++ cmd/pxe.c | 2 +- cmd/sysboot.c | 6 +- doc/develop/bootstd/overview.rst | 24 +++++- doc/usage/cmd/bootstd.rst | 79 +++++++++++++++++++ doc/usage/index.rst | 1 + fs/fs.c | 15 ++++ include/bootdev.h | 36 +++------ include/bootflow.h | 88 ++++++++++++++++++--- include/bootmeth.h | 22 ++++-- include/bootstd.h | 69 ++++++++++++++++- include/pxe_utils.h | 14 +++- test/boot/bootflow.c | 126 +++++++++++++++++++++++++++++++ test/py/tests/test_ut.py | 3 +- 33 files changed, 788 insertions(+), 183 deletions(-) create mode 100644 cmd/bootstd.c create mode 100644 doc/usage/cmd/bootstd.rst -- 2.34.1

4 40

[PATCH 0/6] Re-configurate TPM when active hash algorithms dismatch
by Raymond Mao 25 Jan '25

25 Jan '25

This patch set implements PCR allocate command to handle the algorithm dismatches among TPM device, eventlog from previous boot stage and what U-Boot supports. It re-configurates TPM device if any active algorithms are not supported by U-Boot or does not exist in the eventlog passed in. To re-configurate, a PCR allocate command will be sent with new algorithm configurations, followed by a shutdown command and a hardware reset to activate those new configurations. If any of the algorithms from the eventlog does not supported by U-Boot or TPM device does not support all U-Boot algorithms, exit with error. This new feature is under control by a new introduced kconfig TPM_PCR_ALLOCATE. Raymond Mao (6): tpm: add TPM2_Shutdown command tmp: add TPM2_PCR_Allocate command tpm: add wrapper and helper APIs for PCR allocate tpm: add PCR allocate into the eventlog handling tpm: PCR allocate during PCR extend to disable the unsupported algorithms board: qemu-arm: select TPM_PCR_ALLOCATE cmd/tpm-v2.c | 108 ++++++++++++++- configs/qemu_arm64_defconfig | 1 + include/tpm-v2.h | 52 ++++++- lib/Kconfig | 12 ++ lib/tpm-v2.c | 259 ++++++++++++++++++++++++++++++++++- lib/tpm_api.c | 4 +- lib/tpm_tcg2.c | 52 +++---- 7 files changed, 442 insertions(+), 46 deletions(-) -- 2.25.1

3 17