November 2024 - U-Boot

[PATCH] net: lwip: fix dhcp_loop()
by Jerome Forissier 23 Nov '24

23 Nov '24

The local variables ipstr, maskstr and gwstr in static function dhcp_loop() cannot be pointers to read-only data, since they may be written to in case the device index is > 0. Therefore make them char arrays allocated on the stack. Reported-by: Ilias Apalodimas <ilias.apalodimas at linaro.org> Signed-off-by: Jerome Forissier <jerome.forissier(a)linaro.org> --- net/lwip/dhcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/lwip/dhcp.c b/net/lwip/dhcp.c index 23b56226921..bfc72ca6c57 100644 --- a/net/lwip/dhcp.c +++ b/net/lwip/dhcp.c @@ -27,9 +27,9 @@ static void call_lwip_dhcp_fine_tmr(void *ctx) static int dhcp_loop(struct udevice *udev) { - char *ipstr = "ipaddr\0\0"; - char *maskstr = "netmask\0\0"; - char *gwstr = "gatewayip\0\0"; + char ipstr[] = "ipaddr\0\0"; + char maskstr[] = "netmask\0\0"; + char gwstr[] = "gatewayip\0\0"; unsigned long start; struct netif *netif; struct dhcp *dhcp; -- 2.43.0

3 3

[PATCH] board: armltd: Make myself maintainer for total compute
by ben.horgan＠arm.com 23 Nov '24

23 Nov '24

From: Ben Horgan <ben.horgan(a)arm.com> The previous maintainer is no longer involved in total compute. Signed-off-by: Ben Horgan <ben.horgan(a)arm.com> --- board/armltd/total_compute/MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/armltd/total_compute/MAINTAINERS b/board/armltd/total_compute/MAINTAINERS index 3dc1cd188a..92486f4193 100644 --- a/board/armltd/total_compute/MAINTAINERS +++ b/board/armltd/total_compute/MAINTAINERS @@ -1,5 +1,5 @@ TOTAL_COMPUTE BOARD -M: Usama Arif <usama.arif(a)arm.com> +M: Ben Horgan <ben.horgan(a)arm.com> S: Maintained F: board/armltd/total_compute/ F: include/configs/total_compute.h -- 2.25.1 IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

4 3

[PATCH] Revert "test: Update time tests to use unit-test asserts"
by Tom Rini 23 Nov '24

23 Nov '24

While at the base level, this conversion looks equivalent, we now see both of these tests failing (due to exceeding their allowed margin for being too slow) in Azure with a very high frequency. This reverts commit 88db4fc5fec20429881896740df61d402b4b1f66. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Cc: Simon Glass <sjg(a)chromium.org> --- test/lib/time.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/test/lib/time.c b/test/lib/time.c index b99e738c500f..2095bef75892 100644 --- a/test/lib/time.c +++ b/test/lib/time.c @@ -22,7 +22,11 @@ static int test_get_timer(struct unit_test_state *uts) next = get_timer(0); } while (start == next); - ut_asserteq(start + 1, next); + if (start + 1 != next) { + printf("%s: iter=%d, start=%lu, next=%lu, expected a difference of 1\n", + __func__, iter, start, next); + return -EINVAL; + } start++; } @@ -31,7 +35,11 @@ static int test_get_timer(struct unit_test_state *uts) * an extra millisecond may have passed. */ diff = get_timer(base); - ut_assert(diff == iter || diff == iter + 1); + if (diff != iter && diff != iter + 1) { + printf("%s: expected get_timer(base) to match elapsed time: diff=%lu, expected=%d\n", + __func__, diff, iter); + return -EINVAL; + } return 0; } @@ -49,8 +57,11 @@ static int test_timer_get_us(struct unit_test_state *uts) next = timer_get_us(); if (next != prev) { delta = next - prev; - ut_assert(delta >= 0); - if (delta) { + if (delta < 0) { + printf("%s: timer_get_us() went backwards from %lu to %lu\n", + __func__, prev, next); + return -EINVAL; + } else if (delta != 0) { if (delta < min) min = delta; prev = next; @@ -59,7 +70,11 @@ static int test_timer_get_us(struct unit_test_state *uts) } } - ut_asserteq(1, min); + if (min != 1) { + printf("%s: Minimum microsecond delta should be 1 but is %lu\n", + __func__, min); + return -EINVAL; + } return 0; } @@ -80,7 +95,8 @@ static int test_time_comparison(struct unit_test_state *uts) error = delta_us - 1000000; printf("%s: Microsecond time for 1 second: %lu, error = %ld\n", __func__, delta_us, error); - ut_assert(abs(error) <= 1000); + if (abs(error) > 1000) + return -EINVAL; return 0; } @@ -99,7 +115,8 @@ static int test_udelay(struct unit_test_state *uts) error = delta - 1000; printf("%s: Delay time for 1000 udelay(1000): %lu ms, error = %ld\n", __func__, delta, error); - ut_assert(abs(error) <= 100); + if (abs(error) > 100) + return -EINVAL; return 0; } -- 2.43.0

3 3

[PATCH] net: lwip: fix get_udev_ipv4_info()
by Jerome Forissier 23 Nov '24

23 Nov '24

The local variables ipstr, maskstr and gwstr in static function get_udev_ipv4_info() cannot be pointers to read-only data, since they may be written to in case the device index is > 0. Therefore make them char arrays allocated on the stack. Reported-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Reported-by: Adriano Cordova <adrianox(a)gmail.com> Link: https://lists.denx.de/pipermail/u-boot/2024-November/572066.html Signed-off-by: Jerome Forissier <jerome.forissier(a)linaro.org> --- net/lwip/net-lwip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/lwip/net-lwip.c b/net/lwip/net-lwip.c index 470217781a4..b863047f598 100644 --- a/net/lwip/net-lwip.c +++ b/net/lwip/net-lwip.c @@ -91,9 +91,9 @@ struct netif *net_lwip_get_netif(void) static int get_udev_ipv4_info(struct udevice *dev, ip4_addr_t *ip, ip4_addr_t *mask, ip4_addr_t *gw) { - char *ipstr = "ipaddr\0\0"; - char *maskstr = "netmask\0\0"; - char *gwstr = "gatewayip\0\0"; + char ipstr[] = "ipaddr\0\0"; + char maskstr[] = "netmask\0\0"; + char gwstr[] = "gatewayip\0\0"; int idx = dev_seq(dev); char *env; -- 2.40.1

3 2

[PATCH v2] net: lwip: provide entropy to MBed TLS in one go
by Ilias Apalodimas 23 Nov '24

23 Nov '24

We currently provide entropy to mbedTLS using 8b chunks. Take into account the 'len' parameter passed by MBed TLS to the entropy gathering function instead. Note that the current code works because len is always 128 (defined at compile time), therefore mbedtls_hardware_poll() is called repeatedly and the buffer is filled correctly. But passing 'len' to dm_rng_read() is both better and simpler. Reviewed-by: Jerome Forissier <jerome.forissier(a)linaro.org> Suggested-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- Changes since v1: - Update the commit message and title and picked up r-b from Jerome - v1 can be found here https://lore.kernel.org/u-boot/42870ab3-1621-491f-a221-8ced932ed703@linaro.… net/lwip/wget.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/lwip/wget.c b/net/lwip/wget.c index ba8579899002..4fd552fd306e 100644 --- a/net/lwip/wget.c +++ b/net/lwip/wget.c @@ -42,7 +42,6 @@ int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) { struct udevice *dev; - u64 rng = 0; int ret; *olen = 0; @@ -52,12 +51,11 @@ int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, log_err("Failed to get an rng: %d\n", ret); return ret; } - ret = dm_rng_read(dev, &rng, sizeof(rng)); + ret = dm_rng_read(dev, output, len); if (ret) return ret; - memcpy(output, &rng, len); - *olen = sizeof(rng); + *olen = len; return 0; } -- 2.45.2

3 2

[PATCH] net: lwip: wget: update help string
by Jerome Forissier 23 Nov '24

23 Nov '24

The lwIP version of wget also supports the legacy syntax. Document it in the help string. Signed-off-by: Jerome Forissier <jerome.forissier(a)linaro.org> --- cmd/net-lwip.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/net-lwip.c b/cmd/net-lwip.c index 42f8bd6b259..4dc97c6e184 100644 --- a/cmd/net-lwip.c +++ b/cmd/net-lwip.c @@ -39,7 +39,8 @@ U_BOOT_CMD( #if defined(CONFIG_CMD_WGET) U_BOOT_CMD( wget, 3, 1, do_wget, - "boot image via network using HTTP protocol", - "[loadAddress] URL" + "boot image via network using HTTP/HTTPS protocol", + "[loadAddress] url\n" + "wget [loadAddress] [host:]path" ); #endif -- 2.40.1

3 2

[PATCH 1/1] test: unit test for hextoull()
by Heinrich Schuchardt 23 Nov '24

23 Nov '24

Provide a unit test for the hextoull() function. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- test/str_ut.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/str_ut.c b/test/str_ut.c index 96e048975d8..1110971d995 100644 --- a/test/str_ut.c +++ b/test/str_ut.c @@ -18,6 +18,8 @@ static const char str4[] = "1234567890123 I lost closer friends"; static const char str5[] = "0x9876543210the last time I was deloused"; static const char str6[] = "0778octal is seldom used"; static const char str7[] = "707it is a piece of computing history"; +static const char str8[] = "0x887e2561352d80fa"; +static const char str9[] = "614FF7EAA63009DA"; /* Declare a new str test */ #define STR_TEST(_name, _flags) UNIT_TEST(_name, _flags, str_test) @@ -189,6 +191,22 @@ static int str_hextoul(struct unit_test_state *uts) } STR_TEST(str_hextoul, 0); +static int str_hextoull(struct unit_test_state *uts) +{ + char *endp; + + /* Just a simple test, since we know this uses simple_strtoull() */ + ut_asserteq_64(0x887e2561352d80faULL, hextoull(str8, &endp)); + ut_asserteq_64(0x12, endp - str8); + ut_asserteq_64(0x614ff7eaa63009daULL, hextoull(str9, &endp)); + ut_asserteq_64(0x10, endp - str9); + ut_asserteq_64(0x887e2561352d80faULL, hextoull(str8, NULL)); + ut_asserteq_64(0x614ff7eaa63009daULL, hextoull(str9, NULL)); + + return 0; +} +STR_TEST(str_hextoull, 0); + static int str_dectoul(struct unit_test_state *uts) { char *endp; -- 2.45.2

3 2

[PATCH 1/1] cmd: improve description of the cdp command
by Heinrich Schuchardt 23 Nov '24

23 Nov '24

Users might not know what 'CDP' refers to. Provide basic information. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 636833646f6..c55a39600c3 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2016,7 +2016,9 @@ config CMD_PING6 config CMD_CDP bool "cdp" help - Perform CDP network configuration + The cdp command is used to announce the U-Boot device in the network + and to retrieve configuration data including the VLAN id using the + proprietary Cisco Discovery Protocol (CDP). config CMD_SNTP bool "sntp" -- 2.45.2

2 1

[PULL] Please pull qcom/qcom-main
by Caleb Connolly 23 Nov '24

23 Nov '24

Hi Tom, Some nice new features this cycle and a few cleanups for rc3. * UFS support is enabled for SC7280 and SM8150 platforms. * Qualcomm dt-bindings headers are all dropped in favour of dts/upstream. * The SMMU driver now correctly handles stream ID 0 and is disabled in EL2. * Initial support for capsule updates (using the new dynamic UUIDs) is added for the RB3 Gen 2 board alongside a new SCSI backend for DFU. * CONFIG_PINCONF is enabled in qcom_defconfig. * The vqmmc supply is now enabled for sdcard support on boards that need it. * A quirk is added for reading GPIOs on the PM8550 PMIC CI: https://source.denx.de/u-boot/custodians/u-boot-snapdragon/-/pipelines/23474 Previous CI run prior to rebase: https://source.denx.de/u-boot/custodians/u-boot-snapdragon/-/pipelines/23364 The following changes since commit 8573ea4105829b9a915b23f56d1577b3f09ed918: Merge patch series "labgrid: Provide an integration with Labgrid" (2024-11-13 16:39:19 -0600) are available in the Git repository at: git@source.denx.de:/u-boot/custodians/u-boot-snapdragon.git HEAD for you to fetch changes up to 7aad7833323aa9260935d172744a50f56356d52a: treewide: remove Qualcomm dt-binding headers that are available upstream (2024-11-20 17:57:58 +0100) ---------------------------------------------------------------- Caleb Connolly (9): mach-snapdragon: configure logging phy: qcom: ufs: add sc7280 dfu: add scsi backend disk: expose partition type flags mach-snapdragon: implement capsule update support qcom_defconfig: enable capsule update support iommu: qcom-smmu: allow SID 0 iommu: qcom-smmu: handle running in el2 treewide: remove Qualcomm dt-binding headers that are available upstream Julius Lehmann (1): phy: qcom: Add SM8150 to QMP UFS PHY driver Neil Armstrong (7): qcom_defconfig: enable PINCONF ARM: mach-snapdragon: configure a larger default SYS_MALLOC_LEN for fastboot mmc: msm_sdhci: enable vqmmc at probe if available gpio: qcom_pmic: add again the quirk to skip GPIO configuration on PM8550 phy: qcom: ufs: drop unused ufsphy_v2_regs_layout dt-bindings: remove phy/phy-qcom-qmp.h in favor of dts/upstream qcom_defconfig: enable UFS Qualcomm controller and PHY drivers arch/arm/mach-snapdragon/Kconfig | 6 + arch/arm/mach-snapdragon/Makefile | 1 + arch/arm/mach-snapdragon/board.c | 8 +- arch/arm/mach-snapdragon/capsule_update.c | 153 ++++++++ arch/arm/mach-snapdragon/qcom-priv.h | 6 + configs/qcm6490_defconfig | 6 + configs/qcom_defconfig | 9 + disk/part_efi.c | 1 + doc/usage/dfu.rst | 33 ++ drivers/dfu/Kconfig | 7 + drivers/dfu/Makefile | 1 + drivers/dfu/dfu.c | 5 +- drivers/dfu/dfu_scsi.c | 435 +++++++++++++++++++++ drivers/gpio/qcom_pmic_gpio.c | 21 +- drivers/iommu/qcom-hyp-smmu.c | 9 +- drivers/mmc/msm_sdhci.c | 12 + drivers/phy/qcom/phy-qcom-qmp-ufs.c | 210 +++++++++- include/configs/qcom.h | 5 + include/dfu.h | 27 ++ include/dt-bindings/clock/qcom,camcc-sdm845.h | 116 ------ include/dt-bindings/clock/qcom,dispcc-sdm845.h | 56 --- include/dt-bindings/clock/qcom,gcc-msm8916.h | 179 --------- include/dt-bindings/clock/qcom,gcc-msm8996.h | 361 ----------------- include/dt-bindings/clock/qcom,gcc-qcs404.h | 180 --------- include/dt-bindings/clock/qcom,gcc-sdm845.h | 246 ------------ include/dt-bindings/clock/qcom,gpucc-sdm845.h | 24 -- include/dt-bindings/clock/qcom,lpass-sdm845.h | 15 - include/dt-bindings/clock/qcom,mmcc-msm8996.h | 295 -------------- include/dt-bindings/clock/qcom,rpmcc.h | 174 --------- include/dt-bindings/clock/qcom,rpmh.h | 36 -- include/dt-bindings/clock/qcom,turingcc-qcs404.h | 15 - include/dt-bindings/clock/qcom,videocc-sdm845.h | 35 -- include/dt-bindings/dma/qcom-gpi.h | 11 - include/dt-bindings/firmware/qcom,scm.h | 39 -- include/dt-bindings/iio/qcom,spmi-vadc.h | 300 -------------- include/dt-bindings/interconnect/qcom,msm8916.h | 100 ----- .../dt-bindings/interconnect/qcom,msm8996-cbf.h | 12 - include/dt-bindings/interconnect/qcom,msm8996.h | 163 -------- include/dt-bindings/interconnect/qcom,osm-l3.h | 15 - include/dt-bindings/interconnect/qcom,sdm845.h | 150 ------- include/dt-bindings/phy/phy-qcom-qmp.h | 20 - include/dt-bindings/phy/phy-qcom-qusb2.h | 37 -- include/dt-bindings/pinctrl/qcom,pmic-gpio.h | 164 -------- include/dt-bindings/pinctrl/qcom,pmic-mpp.h | 106 ----- include/dt-bindings/power/qcom-rpmpd.h | 412 ------------------- .../dt-bindings/regulator/qcom,rpmh-regulator.h | 36 -- include/dt-bindings/reset/qcom,gcc-msm8916.h | 100 ----- include/dt-bindings/reset/qcom,sdm845-aoss.h | 17 - include/dt-bindings/reset/qcom,sdm845-pdc.h | 22 -- include/dt-bindings/soc/qcom,apr.h | 28 -- include/dt-bindings/soc/qcom,rpmh-rsc.h | 14 - include/dt-bindings/sound/qcom,lpass.h | 46 --- include/dt-bindings/sound/qcom,q6afe.h | 9 - include/dt-bindings/sound/qcom,q6asm.h | 26 -- include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h | 234 ----------- include/dt-bindings/sound/qcom,wcd9335.h | 15 - include/part.h | 1 + 57 files changed, 945 insertions(+), 3819 deletions(-) create mode 100644 arch/arm/mach-snapdragon/capsule_update.c create mode 100644 drivers/dfu/dfu_scsi.c delete mode 100644 include/dt-bindings/clock/qcom,camcc-sdm845.h delete mode 100644 include/dt-bindings/clock/qcom,dispcc-sdm845.h delete mode 100644 include/dt-bindings/clock/qcom,gcc-msm8916.h delete mode 100644 include/dt-bindings/clock/qcom,gcc-msm8996.h delete mode 100644 include/dt-bindings/clock/qcom,gcc-qcs404.h delete mode 100644 include/dt-bindings/clock/qcom,gcc-sdm845.h delete mode 100644 include/dt-bindings/clock/qcom,gpucc-sdm845.h delete mode 100644 include/dt-bindings/clock/qcom,lpass-sdm845.h delete mode 100644 include/dt-bindings/clock/qcom,mmcc-msm8996.h delete mode 100644 include/dt-bindings/clock/qcom,rpmcc.h delete mode 100644 include/dt-bindings/clock/qcom,rpmh.h delete mode 100644 include/dt-bindings/clock/qcom,turingcc-qcs404.h delete mode 100644 include/dt-bindings/clock/qcom,videocc-sdm845.h delete mode 100644 include/dt-bindings/dma/qcom-gpi.h delete mode 100644 include/dt-bindings/firmware/qcom,scm.h delete mode 100644 include/dt-bindings/iio/qcom,spmi-vadc.h delete mode 100644 include/dt-bindings/interconnect/qcom,msm8916.h delete mode 100644 include/dt-bindings/interconnect/qcom,msm8996-cbf.h delete mode 100644 include/dt-bindings/interconnect/qcom,msm8996.h delete mode 100644 include/dt-bindings/interconnect/qcom,osm-l3.h delete mode 100644 include/dt-bindings/interconnect/qcom,sdm845.h delete mode 100644 include/dt-bindings/phy/phy-qcom-qmp.h delete mode 100644 include/dt-bindings/phy/phy-qcom-qusb2.h delete mode 100644 include/dt-bindings/pinctrl/qcom,pmic-gpio.h delete mode 100644 include/dt-bindings/pinctrl/qcom,pmic-mpp.h delete mode 100644 include/dt-bindings/power/qcom-rpmpd.h delete mode 100644 include/dt-bindings/regulator/qcom,rpmh-regulator.h delete mode 100644 include/dt-bindings/reset/qcom,gcc-msm8916.h delete mode 100644 include/dt-bindings/reset/qcom,sdm845-aoss.h delete mode 100644 include/dt-bindings/reset/qcom,sdm845-pdc.h delete mode 100644 include/dt-bindings/soc/qcom,apr.h delete mode 100644 include/dt-bindings/soc/qcom,rpmh-rsc.h delete mode 100644 include/dt-bindings/sound/qcom,lpass.h delete mode 100644 include/dt-bindings/sound/qcom,q6afe.h delete mode 100644 include/dt-bindings/sound/qcom,q6asm.h delete mode 100644 include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h delete mode 100644 include/dt-bindings/sound/qcom,wcd9335.h

2 1

Adding cross compile for armv7 to docs
by Peter Polgar 23 Nov '24

23 Nov '24

Hi, I have recently built U-Boot for an armv7 board (OrangePi PC). It took me some googling to find the dependencies needed to cross compile on Ubuntu. I am thinking about adding the info to the documentation here: https://github.com/u-boot/u-boot/blob/master/doc/build/gcc.rst#debian-based I have a few questions though: Can I send a PR now or should I wait for the next merge window? Is it ok to commit to github.com or should it go to source.denx.de instead? Thanks, Peter

2 1