- U-Boot - denx.biz

[PATCH 0/5] rockchip: ROCKCHIP_COMMON_STACK_ADDR improvements
by Jonas Karlman 27 Jan '25

27 Jan '25

Use of the Kconfig symbol ROCKCHIP_COMMON_STACK_ADDR is currently not working well when a SoC needs to use a custom tpl.c and the default values are only working when DRAM base address is 0x0. This series changes to not imply TPL_ROCKCHIP_COMMON_BOARD and instead let each SoC symbol decide. It also adds default values for the two other used DRAM base addresses, 0x60000000 and 0x40000000. Finally, it also moves imply of ROCKCHIP_EXTERNAL_TPL under each SoC symbol. Jonas Karlman (5): rockchip: Move imply TPL_ROCKCHIP_COMMON_BOARD under SoC Kconfig symbol rockchip: Improve ARMv7 support for ROCKCHIP_COMMON_STACK_ADDR rockchip: Move imply ROCKCHIP_COMMON_STACK_ADDR under SoC Kconfig symbol rockchip: Move imply ROCKCHIP_EXTERNAL_TPL under SoC Kconfig symbol rockchip: Add RK3576 support for ROCKCHIP_COMMON_STACK_ADDR arch/arm/mach-rockchip/Kconfig | 67 ++++++++++++++++++++------- arch/arm/mach-rockchip/px30/Kconfig | 3 -- arch/arm/mach-rockchip/rk3308/Kconfig | 3 -- arch/arm/mach-rockchip/rk3328/Kconfig | 3 -- arch/arm/mach-rockchip/rk3399/Kconfig | 3 -- arch/arm/mach-rockchip/rk3568/Kconfig | 3 -- arch/arm/mach-rockchip/rk3588/Kconfig | 3 -- 7 files changed, 50 insertions(+), 35 deletions(-) -- 2.48.1

2 6

[GIT PULL] Please pull u-boot-imx-master-20250127
by Fabio Estevam 27 Jan '25

27 Jan '25

Hi Tom, Please pull from u-boot-imx/master, thanks. The following changes since commit 8162f35a108441b8d7a44ac9266c1a64dbf79fd5: Merge patch series "test: Improvements to ut command and test-suite running" (2025-01-24 14:35:37 -0600) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-master-20250127 for you to fetch changes up to 219b0488200633cda74ecc04cda2eb84443ab88d: net: fsl_enetc: Enable optional ENETREF clock on i.MX95 (2025-01-27 00:27:54 -0300) u-boot-imx-master-20250127 -------------------------- CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/24366 - Refactor the imx pinctrl driver. - Enable optional ENETREF clock on i.MX95 - Remove optional from tee-os entry on the i.MX8M u-boot devicetrees. ---------------------------------------------------------------- Marek Vasut (11): pinctrl: imx: Push imx_pinctrl_ops into drivers and staticize pinctrl: imx: Rename imx_pinctrl_ops to match drivers pinctrl: imx: Drop .remove callback for SCU variant pinctrl: imx: Inline struct imx_pinctrl_soc_info access into probe pinctrl: imx: Split imx_pinctrl_probe() into common and mmio parts pinctrl: imx: Rename imx_pinctrl_remove() to imx_pinctrl_remove_mmio() pinctrl: imx: Split imx_pinctrl_set_state() into common and mmio parts pinctrl: imx: Split imx_pinctrl_set_state_scu() from imx_pinctrl_set_state_mmio() pinctrl: imx: Fold imx_pinctrl_set_state_scu() from pinctrl-imx8.c pinctrl: imx: Split MMIO accessors into pinctrl-imx-mmio.c net: fsl_enetc: Enable optional ENETREF clock on i.MX95 Yannic Moog (1): arm: dts: imx8m*-u-boot: remove optional from tee-os entry arch/arm/dts/imx8mm-u-boot.dtsi | 1 - arch/arm/dts/imx8mn-u-boot.dtsi | 1 - arch/arm/dts/imx8mp-u-boot.dtsi | 1 - arch/arm/dts/imx8mq-u-boot.dtsi | 1 - drivers/net/fsl_enetc.c | 23 +++- drivers/pinctrl/nxp/Kconfig | 22 ++-- drivers/pinctrl/nxp/Makefile | 2 +- drivers/pinctrl/nxp/pinctrl-imx-mmio.c | 228 +++++++++++++++++++++++++++++++++ drivers/pinctrl/nxp/pinctrl-imx.c | 222 ++------------------------------ drivers/pinctrl/nxp/pinctrl-imx.h | 20 +-- drivers/pinctrl/nxp/pinctrl-imx5.c | 18 +-- drivers/pinctrl/nxp/pinctrl-imx6.c | 18 +-- drivers/pinctrl/nxp/pinctrl-imx7.c | 18 +-- drivers/pinctrl/nxp/pinctrl-imx7ulp.c | 18 +-- drivers/pinctrl/nxp/pinctrl-imx8.c | 86 +++++++++++-- drivers/pinctrl/nxp/pinctrl-imx8m.c | 18 +-- drivers/pinctrl/nxp/pinctrl-imx8ulp.c | 18 +-- drivers/pinctrl/nxp/pinctrl-imx93.c | 18 +-- drivers/pinctrl/nxp/pinctrl-imxrt.c | 18 +-- drivers/pinctrl/nxp/pinctrl-scu.c | 70 ---------- drivers/pinctrl/nxp/pinctrl-vf610.c | 18 +-- 21 files changed, 418 insertions(+), 421 deletions(-) create mode 100644 drivers/pinctrl/nxp/pinctrl-imx-mmio.c delete mode 100644 drivers/pinctrl/nxp/pinctrl-scu.c

2 1

[PATCH] test/cmd/wget.c: Fix loadaddr rewrite
by Marek Vasut 27 Jan '25

27 Jan '25

The $loadaddr variable is a hexadecimal value, not a string, it must be assigned using env_set_hex(). This may break follow up tests, like the dm_test_cmd_hash_md5 in CI. To avoid any interference with other tests, set $wgetaddr variable which is specific to this test and use it in the test. Fixes: 20f641987f83 ("test/cmd/wget.c: move net_test_wget() to the cmd test suite") Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Jerome Forissier <jerome.forissier(a)linaro.org> Cc: Mikhail Kshevetskiy <mikhail.kshevetskiy(a)iopsys.eu> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: Yasuharu Shibata <yasuharu.shibata(a)gmail.com> Cc: u-boot(a)lists.denx.de --- test/cmd/wget.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/test/cmd/wget.c b/test/cmd/wget.c index b020d20ad70..445750660c2 100644 --- a/test/cmd/wget.c +++ b/test/cmd/wget.c @@ -217,28 +217,26 @@ static int net_test_wget(struct unit_test_state *uts) { char *prev_ethact = env_get("ethact"); char *prev_ethrotate = env_get("ethrotate"); - char *prev_loadaddr = env_get("loadaddr"); sandbox_eth_set_tx_handler(0, sb_http_handler); sandbox_eth_set_priv(0, uts); env_set("ethact", "eth@10002000"); env_set("ethrotate", "no"); - env_set("loadaddr", "0x20000"); - ut_assertok(run_command("wget ${loadaddr} 1.1.2.2:/index.html", 0)); + env_set("wgetaddr", "0x20000"); + ut_assertok(run_command("wget ${wgetaddr} 1.1.2.2:/index.html", 0)); ut_assert_nextline_empty(); ut_assert_nextline("Packets received 5, Transfer Successful"); ut_assert_nextline("Bytes transferred = 29 (1d hex)"); sandbox_eth_set_tx_handler(0, NULL); - run_command("md5sum ${loadaddr} ${filesize}", 0); + run_command("md5sum ${wgetaddr} ${filesize}", 0); ut_assert_nextline("md5 for 00020000 ... 0002001c ==> 847d5e7320a27462e90bc1ed75eb8cd8"); ut_assert_console_end(); env_set("ethact", prev_ethact); env_set("ethrotate", prev_ethrotate); - env_set("loadaddr", prev_loadaddr); return 0; } -- 2.45.2

4 3

[PATCH] mach-snapdragon: handle platforms without PSCI support
by Sam Day 27 Jan '25

27 Jan '25

Most MSM8916 devices shipped without PSCI support. The history is quite nuanced (a good overview can be found in [1]), but the end result is that the upstream DTs for this SoC pretend that PSCI exists, and it's expected that the bootloader handles the case where it doesn't. This is codified by the de-facto bootloader for MSM8916 devices, lk2nd [2]. So we handle it here by deleting the /psci node if we detect the absence of PSCI. We need to do this early to ensure sysreset works correctly, since the PSCI firmware driver is PRE_RELOC and binds the PSCI sysreset driver. Additionally, show_psci_version is updated to check that PSCI exists. Currently this banner outputs "PSCI: 65535.65535" on devices without PSCI support, which isn't very useful :) [1]: https://github.com/msm8916-mainline/linux/issues/388 [2]: https://github.com/msm8916-mainline/lk2nd/blob/8183ea2/lk2nd/smp/spin-table… Signed-off-by: Sam Day <me(a)samcday.com> --- arch/arm/mach-snapdragon/board.c | 43 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-snapdragon/board.c b/arch/arm/mach-snapdragon/board.c index e87551784b8d7afb4186533d43b8bddacba9faec..75b9cf1a8a1b3383665eb2d4e6725efe59718de0 100644 --- a/arch/arm/mach-snapdragon/board.c +++ b/arch/arm/mach-snapdragon/board.c @@ -162,11 +162,42 @@ static void show_psci_version(void) arm_smccc_smc(ARM_PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0, 0, 0, 0, 0, &res); + /* Some older SoCs like MSM8916 don't always support PSCI */ + if ((int)res.a0 == PSCI_RET_NOT_SUPPORTED) + return; + debug("PSCI: v%ld.%ld\n", PSCI_VERSION_MAJOR(res.a0), PSCI_VERSION_MINOR(res.a0)); } +/** + * Most MSM8916 devices in the wild shipped without PSCI support, but the + * upstream DTs pretend that PSCI exists. If that situation is detected here, + * the /psci node is deleted. This is done very early to ensure the PSCI + * firmware driver doesn't bind (which then binds a sysreset driver that won't + * work). + */ +static void qcom_psci_fixup(void *fdt) +{ + int offset, ret; + struct arm_smccc_res res; + + arm_smccc_smc(ARM_PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0, 0, 0, 0, 0, &res); + + if ((int)res.a0 != PSCI_RET_NOT_SUPPORTED) + return; + + offset = fdt_path_offset(fdt, "/psci"); + if (offset < 0) + return; + + debug("Found /psci DT node on device with no PSCI. Deleting.\n"); + ret = fdt_del_node(fdt, offset); + if (ret) + log_err("Failed to delete /psci node: %d\n", ret); +} + /* We support booting U-Boot with an internal DT when running as a first-stage bootloader * or for supporting quirky devices where it's easier to leave the downstream DT in place * to improve ABL compatibility. Otherwise, we use the DT provided by ABL. @@ -212,12 +243,16 @@ int board_fdt_blob_setup(void **fdtp) if (internal_valid) { debug("Using built in FDT\n"); - return -EEXIST; + ret = -EEXIST; + } else { + debug("Using external FDT\n"); + *fdtp = external_fdt; + ret = 0; } - debug("Using external FDT\n"); - *fdtp = external_fdt; - return 0; + qcom_psci_fixup(*fdtp); + + return ret; } void reset_cpu(void) --- base-commit: 2eed5a1ff36217372e19f7513bd07077fc76718a change-id: 20250127-qcom-handle-absent-psci-6e8e8af7bcd7 prerequisite-change-id: 20250120-qcom-parse-memory-updates-96ffe248cdf1:v3 prerequisite-patch-id: 65448b5a93120d2117c1361035afc9bd911d005f Best regards, -- Sam Day <me(a)samcday.com>

2 3

[PATCH v1] board: starfive: Update the maintainer file for VisionFive 2 board
by Hal Feng 27 Jan '25

27 Jan '25

Update maintainers for StarFive VisionFive 2 board and add the missing drivers to the file list. Signed-off-by: Hal Feng <hal.feng(a)starfivetech.com> --- board/starfive/visionfive2/MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/board/starfive/visionfive2/MAINTAINERS b/board/starfive/visionfive2/MAINTAINERS index d7f638f9b41..14fe8368548 100644 --- a/board/starfive/visionfive2/MAINTAINERS +++ b/board/starfive/visionfive2/MAINTAINERS @@ -1,8 +1,16 @@ STARFIVE JH7110 VISIONFIVE2 BOARD M: Minda Chen <minda.chen(a)starfivetech.com> +M: Hal Feng <hal.feng(a)starfivetech.com> S: Maintained +F: arch/riscv/cpu/jh7110/ +F: arch/riscv/dts/jh7110* F: arch/riscv/include/asm/arch-jh7110/ F: board/starfive/visionfive2/ +F: doc/board/starfive/visionfive2.rst F: include/configs/starfive-visionfive2.h F: configs/starfive_visionfive2_defconfig +F: drivers/clk/starfive/clk-jh7110* F: drivers/pci/pcie_starfive_jh7110.c +F: drivers/pinctrl/starfive/pinctrl-jh7110* +F: drivers/ram/starfive/ +F: drivers/reset/reset-jh7110.c base-commit: d8a7100d658eb201fa0e955667fdff298db31945 -- 2.43.2

2 1

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

27 Jan '25

Execution time varies widely with the existing tests. Provides a way to produce a summary of the time taken for each test, along with a histogram. This is enabled with the --timing flag. Enable it for sandbox in CI. 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> --- Changes in v3: - Name the var TEST_PY_EXTRA so we can use it to pass any args to test.py Changes in v2: - Only show the report if the --timing flag is provided - Use --timing flag to show the report in CI for just the sandbox tests .azure-pipelines.yml | 3 +- .gitlab-ci.yml | 3 +- doc/develop/py_testing.rst | 33 +++++++++++++++ test/py/conftest.py | 87 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 124 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index df3f82074af..2bc2ca55b9a 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -295,7 +295,7 @@ stages: export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:\${PATH} export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci # "\${var:+"-k \$var"}" expands to "" if \$var is empty, "-k \$var" if not - ./test/py/test.py -ra -o cache_dir="\$UBOOT_TRAVIS_BUILD_DIR"/.pytest_cache --bd \${TEST_PY_BD} \${TEST_PY_ID} \${TEST_PY_TEST_SPEC:+"-k \${TEST_PY_TEST_SPEC}"} --build-dir "\$UBOOT_TRAVIS_BUILD_DIR" --report-dir "\$UBOOT_TRAVIS_BUILD_DIR" --junitxml=\$(System.DefaultWorkingDirectory)/results.xml + ./test/py/test.py -ra -o cache_dir="\$UBOOT_TRAVIS_BUILD_DIR"/.pytest_cache --bd \${TEST_PY_BD} \${TEST_PY_ID} \${TEST_PY_EXTRA} \${TEST_PY_TEST_SPEC:+"-k \${TEST_PY_TEST_SPEC}"} --build-dir "\$UBOOT_TRAVIS_BUILD_DIR" --report-dir "\$UBOOT_TRAVIS_BUILD_DIR" --junitxml=\$(System.DefaultWorkingDirectory)/results.xml # the below corresponds to .gitlab-ci.yml "after_script" rm -rf /tmp/uboot-test-hooks /tmp/venv EOF @@ -318,6 +318,7 @@ stages: matrix: sandbox: TEST_PY_BD: "sandbox" + TEST_PY_EXTRA: "--timing" sandbox_asan: TEST_PY_BD: "sandbox" OVERRIDE: "-a ASAN" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88a078c83dc..07e8edae585 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,7 +89,7 @@ stages: # "${var:+"-k $var"}" expands to "" if $var is empty, "-k $var" if not - export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH}; export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci; - ./test/py/test.py -ra --bd ${TEST_PY_BD} ${TEST_PY_ID} + ./test/py/test.py -ra --bd ${TEST_PY_BD} ${TEST_PY_ID} ${TEST_PY_EXTRA} ${TEST_PY_TEST_SPEC:+"-k ${TEST_PY_TEST_SPEC}"} --build-dir "$UBOOT_TRAVIS_BUILD_DIR" --junitxml=/tmp/${TEST_PY_BD}/results.xml @@ -273,6 +273,7 @@ Check packing of Python tools: sandbox test.py: variables: TEST_PY_BD: "sandbox" + TEST_PY_EXTRA: "--timing" <<: *buildman_and_testpy_dfn sandbox with clang test.py: diff --git a/doc/develop/py_testing.rst b/doc/develop/py_testing.rst index 6ff78103409..b50473039be 100644 --- a/doc/develop/py_testing.rst +++ b/doc/develop/py_testing.rst @@ -246,6 +246,39 @@ Command-line options sets the directory used to store persistent test data. This is test data that may be re-used across test runs, such as file-system images. +--timing + shows a histogram of test duration, at the end of the run. The columns are: + + Duration + the duration-bucket that this test was in + + Total + total time of all tests in this bucket + + Number of tests + graph showing the number of tests in this bucket, with the actual number + shown at the end + + Example:: + + Duration : Total | Number of tests + ======== : ======= |======================================== + <20ms : 418ms |## 23 + <30ms : 9.1s |######################################## 347 + <40ms : 10.0s |################################# 294 + <50ms : 3.1s |####### 69 + <75ms : 2.6s |#### 43 + <100ms : 1.7s |## 19 + <200ms : 3.0s |## 22 + <300ms : 1.7s | 7 + <400ms : 675ms | 2 + <500ms : 2.2s | 5 + <750ms : 8.3s |# 13 + <1.0s : 1.6s | 2 + <2.0s : 9.4s | 7 + <3.0s : 2.4s | 1 + <7.5s : 6.1s | 1 + `pytest` also implements a number of its own command-line options. Commonly used options are mentioned below. Please see `pytest` documentation for complete details. Execute `py.test --version` for a brief summary. Note that U-Boot's diff --git a/test/py/conftest.py b/test/py/conftest.py index 3bd333bfd24..31043a697e2 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. @@ -91,6 +92,9 @@ def pytest_addoption(parser): parser.addoption('--role', help='U-Boot board role (for Labgrid-sjg)') parser.addoption('--use-running-system', default=False, action='store_true', help="Assume that U-Boot is ready and don't wait for a prompt") + parser.addoption('--timing', default=False, action='store_true', + help='Show info on test timing') + def run_build(config, source_dir, build_dir, board_type, log): """run_build: Build U-Boot @@ -322,6 +326,7 @@ def pytest_configure(config): ubconfig.use_running_system = config.getoption('use_running_system') ubconfig.dtb = build_dir + '/arch/sandbox/dts/test.dtb' ubconfig.connection_ok = True + ubconfig.timing = config.getoption('timing') env_vars = ( 'board_type', @@ -516,6 +521,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 +542,73 @@ 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, msecs, 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} : {get_time_delta(msecs):>7} |{'#' * bar_length} {value}", file=buf) + + # Create the buckets we will use, each has a count and a total time + bucket = {} + for power in range(5): + for i in [1, 2, 3, 4, 5, 7.5]: + bucket[i * 10 ** power] = {'count': 0, 'msecs': 0.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 + too_long_msecs = 0.0 + max_count = 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: + buck = bucket[min(greater)] + buck['count'] += 1 + max_count = max(max_count, buck['count']) + buck['msecs'] += dur + else: + too_long += 1 + too_long_msecs += dur + + # 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 : Total | Number of tests', file=buf) + print(f'{"=" * 8} : {"=" * 7} |{"=" * max_bar_length}', file=buf) + for dur, buck in bucket.items(): + if buck['count']: + label = get_time_delta(dur) + show_bar(f'<{label}', buck['msecs'], buck['count']) + if too_long: + show_bar(f'>{get_time_delta(max_dur)}', too_long_msecs, too_long) + log.info(buf.getvalue()) + if ubconfig.timing: + print(buf.getvalue(), end='') + + def cleanup(): """Clean up all global state. @@ -580,6 +658,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 +792,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 +807,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 +838,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 1

[PATCH 00/19] vbe: Series part G
by Simon Glass 27 Jan '25

27 Jan '25

This includes the VBE ABrec (A/B/recovery) implementation as well as a number of patches needed to make it work: - marking some code as used by SPL_RELOC - selection of images from a FIT based on the boot phase - removal of unwanted hash code which increases code-size too much - a few Kconfig-related additions for VPL Note: The goal for the next series (part H) is to enable VBE on rk3399-generic, i.e. able to boot on multiple rk3399-based boards with only the TPL phase being different for each board. Simon Glass (19): mbedtls: Add SHA symbols for VPL sandbox: Update sandbox_vpl to select sha1 and sha256 mmc: Allow controlling DM_MMC for VPL builds lib: Allow crc16 code to be dropped spl: Adjust debugging and xPL symbols spl: Avoid including hash algorithms which are not wanted spl: Support selecting images based on phase in simple FIT vbe: Support selecting images based on phase in FIT spl: Allow spl_load() to be controlled in any xPL phase spl: Provide a way to mark code needed for relocation lib: Mark crc8 as relocation code lib: Mark lz4 as relocation code lib: Mark memcpy() and memmove() as relocation code lib: Mark gunzip as relocation code vbe: Support providing a linker script vbe: Provide VPL binman-symbols for the next phase vbe: Tidy up a few comments vbe: Allow VBE to disable adding loadables to the FDT vbe: Add an implementation of VBE-ABrec MAINTAINERS | 7 + boot/Kconfig | 73 +++++++++ boot/Makefile | 4 + boot/image-fit.c | 29 ++-- boot/vbe_abrec.c | 83 ++++++++++ boot/vbe_abrec.h | 115 ++++++++++++++ boot/vbe_abrec_fw.c | 276 +++++++++++++++++++++++++++++++++ boot/vbe_common.c | 24 +-- boot/vbe_common.h | 43 +++++ common/hash.c | 17 +- common/spl/Kconfig.vpl | 13 ++ common/spl/spl.c | 26 +++- common/spl/spl_fit.c | 40 +++-- common/spl/spl_reloc.c | 2 +- configs/sandbox_vpl_defconfig | 2 + drivers/mmc/dw_mmc.c | 4 +- include/asm-generic/sections.h | 16 ++ include/spl.h | 19 ++- include/spl_load.h | 9 +- include/vbe.h | 21 +++ lib/Kconfig | 10 ++ lib/Makefile | 11 +- lib/crc8.c | 5 +- lib/gunzip.c | 9 +- lib/lz4.c | 37 +++-- lib/lz4_wrapper.c | 2 +- lib/mbedtls/Kconfig | 40 +++++ lib/string.c | 5 +- lib/zlib/inflate.c | 18 ++- tools/Kconfig | 5 + 30 files changed, 879 insertions(+), 86 deletions(-) create mode 100644 boot/vbe_abrec.c create mode 100644 boot/vbe_abrec.h create mode 100644 boot/vbe_abrec_fw.c -- 2.43.0

3 21

[PATCH] common: fix incorrect comparison
by Maks Mishin 27 Jan '25

27 Jan '25

The variable n, which is of type size_t and cannot have negative values, is checked for a negative value in dlmalloc.c:2107. Signed-off-by: Maks Mishin <maks.mishinFZ(a)gmail.com> --- common/dlmalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/dlmalloc.c b/common/dlmalloc.c index cc4d3a0a02..a4182a8dd6 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -2104,7 +2104,7 @@ Void_t* cALLOc_impl(n, elem_size) size_t n; size_t elem_size; #endif Void_t* mem = mALLOc_impl (sz); - if ((long)n < 0) return NULL; + if ((long)n <= 0) return NULL; if (mem == NULL) return NULL; -- 2.34.1

1 0

[PATCH 1/3] mbedtls: fix incorrect kconfig dependencies on mbedtls
by Raymond Mao 27 Jan '25

27 Jan '25

Currently building with WGET_HTTPS,NET_LWIP and MBEDTLS_LIB failed due to a few incorrect kconfig dependencies. Fix these and clarify what is the purpose of MBEDTLS_LIB_CRYPTO_ALT. Signed-off-by: Raymond Mao <raymond.mao(a)linaro.org> --- cmd/Kconfig | 1 - lib/mbedtls/Kconfig | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 1a0985ca479..071601b5ac2 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2161,7 +2161,6 @@ config WGET_HTTPS select ASYMMETRIC_PUBLIC_KEY_SUBTYPE select X509_CERTIFICATE_PARSER select PKCS7_MESSAGE_PARSER - select MBEDTLS_LIB_CRYPTO select MBEDTLS_LIB_TLS select RSA_VERIFY_WITH_PKEY select X509_CERTIFICATE_PARSER diff --git a/lib/mbedtls/Kconfig b/lib/mbedtls/Kconfig index aa82336ef14..17ed2bc71de 100644 --- a/lib/mbedtls/Kconfig +++ b/lib/mbedtls/Kconfig @@ -116,6 +116,7 @@ endif # LEGACY_CRYPTO_BASIC config LEGACY_CRYPTO_CERT bool "legacy certificate libraries" + depends on LEGACY_CRYPTO select ASN1_DECODER_LEGACY if ASN1_DECODER select ASYMMETRIC_PUBLIC_KEY_LEGACY if \ ASYMMETRIC_PUBLIC_KEY_SUBTYPE @@ -210,12 +211,13 @@ endif # LEGACY_CRYPTO if MBEDTLS_LIB config MBEDTLS_LIB_CRYPTO_ALT - bool "MbedTLS crypto alternatives" + bool "Use legacy crypto libraries as MbedTLS alternatives" depends on MBEDTLS_LIB && !MBEDTLS_LIB_CRYPTO select LEGACY_CRYPTO_BASIC default y if MBEDTLS_LIB && !MBEDTLS_LIB_CRYPTO help - Enable MbedTLS crypto alternatives. + Enable MbedTLS crypto alternatives and replace it with legacy crypto + libraries. Mutually incompatible with MBEDTLS_LIB_CRYPTO. config MBEDTLS_LIB_CRYPTO @@ -451,7 +453,7 @@ config MBEDTLS_LIB_TLS depends on ASYMMETRIC_PUBLIC_KEY_MBEDTLS depends on ASN1_DECODER_MBEDTLS depends on ASYMMETRIC_PUBLIC_KEY_MBEDTLS - depends on MBEDTLS_LIB_CRYPTO + depends on MBEDTLS_LIB help Enable MbedTLS TLS library. Required for HTTPs support in wget -- 2.25.1

1 2

[PATCH 0/8] mediatek: final preparation for OF_UPSTREAM support
by Christian Marangi 27 Jan '25

27 Jan '25

This is the last batch of part to push actual support of OF_UPSTREAM for the mediatek SoC. The plan is to make the current downstream DTS on part with upstream implementation so we can permit a gradual transition to it while we don't cause any regression to any user. This is to have the same node downstream and upstream. Mediatek is working hard upstream to also push all the remaining nodes. All patch are the final changes after the pinctrl patch merged previously. All patch pass CI tests tested in this PR [0] [0] https://github.com/u-boot/u-boot/pull/731 Christian Marangi (7): pinctrl: mediatek: mt7981: rename reg-names to upstream linux format pinctrl: mediatek: mt7986: rename reg-names to upstream linux format mediatek: mt7986: move gpio-controller up and rename pinctrl to pio pinctrl: mediatek: mt7988: rename reg-names to upstream linux format mediatek: mt7988: move gpio-controller up and rename pinctrl to pio mediatek: mt7981: move gpio-controller up and rename pinctrl to pio arm: dts: mediatek: add PCIe node for MT7981 John Crispin (1): arm: dts: mediatek: add USB nodes for MT7981 arch/arm/dts/mt7981-emmc-rfb.dts | 4 +- arch/arm/dts/mt7981-rfb.dts | 4 +- arch/arm/dts/mt7981-sd-rfb.dts | 4 +- arch/arm/dts/mt7981.dtsi | 97 +++++++++++++++++++++-- arch/arm/dts/mt7986.dtsi | 14 ++-- arch/arm/dts/mt7986a-bpi-r3-sd.dts | 12 +-- arch/arm/dts/mt7986a-rfb.dts | 4 +- arch/arm/dts/mt7986a-sd-rfb.dts | 4 +- arch/arm/dts/mt7986b-rfb.dts | 4 +- arch/arm/dts/mt7986b-sd-rfb.dts | 4 +- arch/arm/dts/mt7988-rfb.dts | 2 +- arch/arm/dts/mt7988-sd-rfb.dts | 2 +- arch/arm/dts/mt7988.dtsi | 12 ++- drivers/pinctrl/mediatek/pinctrl-mt7981.c | 5 +- 14 files changed, 125 insertions(+), 47 deletions(-) -- 2.47.1

1 8