December 2024 - U-Boot

[PATCH v14 00/10] net: tcp: improve tcp support in legacy stack
by Mikhail Kshevetskiy 11 Dec '24

11 Dec '24

Legacy TCP stack is bad. Here are some of the known issues: * tcp packet from other connection can break a current one * tcp send sequence always starts from zero * bad tcp options processing * strange assumptions on packet size for selective acknowledge * tcp interface assumes one of the two scenarios: - data downloading from remote host to a board - request-response exchange with a small packets so it's not possible to upload large amount of data from the board to remote host. * wget test generate bad tcp stream, test should fail but it passes instead This series of patches fixes all of the above issues. The benefits: * A lot of bug was fixed * Better and more reliable TCP state machine * Tcp clients becomes smaller/simpler * Data uploading was fixed (now it's possible to transmit a huge amount of data from the board to remote host) Modification was verified with * firmware downloading via u-boot wget command * fastboot over tcp * netcat linux client * Firefox/Chrome/Edge using example web-server implementation Changes v2: * cover letter was added * some patches were removed Changes v3: * better cover letter Changes v4: * fix bug in debug output * add more comments * code style fixes Changes v5: * old patches were occasionally sent with v4 * add back web-server patches * fix bug in debug output * add more comments * code style fixes Changes v6: * fix the wget test * improve description of "simplify tcp header filling code" patch Changes v7: * fix include ordering * improve option descriptions * fix a lot of extra brackets and comparisons against NULL / 0 * add empty lines before final returns * fixed a bug with zero size httpd uploads Changes v8: * [tcp] add function to restart rx inactivity timeout. This may help in the cases where remote peer waits for u-boot data, but u-boot is busy with long executing action * [httpd] add function returning underlying tcp stream from request id. This (with the above change) allows avoid connection break for the long processing post requests. Changes v9: * rebase all changes on top of origin/next * update test/cmd/wget patch description (bad tcp ack/seq issue was already fixed in origin/next) * tcp: add rx/tx packet counters to a tcp_stream structure * wget: use tcp rx packet counter instead of own one * netcat: use tcp rx/tx packet counters instead of own one Changes v10: * netcat: fix bug appeared after rx/tx packet counter addition * rebased on top of v2024.10 Changes v11: * fix spelling in cover letter Changes v12: * rebase on top of master branch (3df6145db0e) * slightly change tcp->rx() & tcp->tx() callback declarations, this allow us to terminate a connection if something goes wrong in rx/tx paths. * set net_boot_file_size variable in httpd_upload * set filesize env variable to a proper value netcat and httpd_upload Changes v13: * rebase on top of master branch (8573ea41058) * remove netcat support * remove example httpd server implementation Changes v14: * fix issues found by github CI Mikhail Kshevetskiy (10): net/tcp: fix TCP options processing net/tcp: fix selective acknowledge net/tcp: put connection specific data into a tcp_stream structure net/tcp: add connection info to tcp_stream structure net/tcp: rename ack_edge and seq_init to more common rcv_nxt and irs net/tcp: improve tcp framework, use better state machine test/cmd/wget: fix the test net/tcp: simplify tcp header filling code net/tcp: define a fallback value for rcv_wnd size net/net: fix include ordering arch/sandbox/include/asm/eth.h | 4 + include/net-legacy.h | 5 +- include/net/tcp.h | 258 ++++++- include/net/wget.h | 8 - net/fastboot_tcp.c | 193 ++--- net/net.c | 45 +- net/tcp.c | 1297 ++++++++++++++++++++++---------- net/wget.c | 465 ++++-------- test/cmd/wget.c | 58 +- 9 files changed, 1444 insertions(+), 889 deletions(-) -- 2.45.2

2 11

[PATCH v2 01/13] ARM: dts: renesas: Fix R-Car spelling
by Marek Vasut 11 Dec '24

11 Dec '24

The correct spelling is R-Car, including the dash, update the usage. Comment change only, no functional change. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)lists.denx.de --- V2: No change --- arch/arm/dts/r8a7790-u-boot.dtsi | 2 +- arch/arm/dts/r8a7791-u-boot.dtsi | 2 +- arch/arm/dts/r8a7792-u-boot.dtsi | 2 +- arch/arm/dts/r8a7793-u-boot.dtsi | 2 +- arch/arm/dts/r8a7794-u-boot.dtsi | 2 +- arch/arm/dts/r8a77951-u-boot.dtsi | 2 +- arch/arm/dts/r8a77960-u-boot.dtsi | 2 +- arch/arm/dts/r8a77965-u-boot.dtsi | 2 +- arch/arm/dts/r8a77970-u-boot.dtsi | 2 +- arch/arm/dts/r8a77980-u-boot.dtsi | 2 +- arch/arm/dts/r8a77990-u-boot.dtsi | 2 +- arch/arm/dts/r8a77995-u-boot.dtsi | 2 +- arch/arm/dts/r8a779x-u-boot.dtsi | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/dts/r8a7790-u-boot.dtsi b/arch/arm/dts/r8a7790-u-boot.dtsi index 45e2fa6f9f0..2a7d76bd7b1 100644 --- a/arch/arm/dts/r8a7790-u-boot.dtsi +++ b/arch/arm/dts/r8a7790-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Device Tree Source extras for U-Boot on RCar R8A7790 SoC + * Device Tree Source extras for U-Boot on R-Car R8A7790 SoC * * Copyright (C) 2018 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/arch/arm/dts/r8a7791-u-boot.dtsi b/arch/arm/dts/r8a7791-u-boot.dtsi index 7143ffc1658..bb0e2fd106c 100644 --- a/arch/arm/dts/r8a7791-u-boot.dtsi +++ b/arch/arm/dts/r8a7791-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Device Tree Source extras for U-Boot on RCar R8A7791 SoC + * Device Tree Source extras for U-Boot on R-Car R8A7791 SoC * * Copyright (C) 2018 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/arch/arm/dts/r8a7792-u-boot.dtsi b/arch/arm/dts/r8a7792-u-boot.dtsi index 214cfde1f89..ebbdcb7efd5 100644 --- a/arch/arm/dts/r8a7792-u-boot.dtsi +++ b/arch/arm/dts/r8a7792-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Device Tree Source extras for U-Boot on RCar R8A7792 SoC + * Device Tree Source extras for U-Boot on R-Car R8A7792 SoC * * Copyright (C) 2018 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/arch/arm/dts/r8a7793-u-boot.dtsi b/arch/arm/dts/r8a7793-u-boot.dtsi index fb947462c54..08f2248e1f3 100644 --- a/arch/arm/dts/r8a7793-u-boot.dtsi +++ b/arch/arm/dts/r8a7793-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Device Tree Source extras for U-Boot on RCar R8A7793 SoC + * Device Tree Source extras for U-Boot on R-Car R8A7793 SoC * * Copyright (C) 2018 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/arch/arm/dts/r8a7794-u-boot.dtsi b/arch/arm/dts/r8a7794-u-boot.dtsi index 53b54c88917..303afaeb4ce 100644 --- a/arch/arm/dts/r8a7794-u-boot.dtsi +++ b/arch/arm/dts/r8a7794-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Device Tree Source extras for U-Boot on RCar R8A7794 SoC + * Device Tree Source extras for U-Boot on R-Car R8A7794 SoC * * Copyright (C) 2018 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/arch/arm/dts/r8a77951-u-boot.dtsi b/arch/arm/dts/r8a77951-u-boot.dtsi index 4cbec591479..c16c5116592 100644 --- a/arch/arm/dts/r8a77951-u-boot.dtsi +++ b/arch/arm/dts/r8a77951-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Device Tree Source extras for U-Boot on RCar R8A7795 SoC + * Device Tree Source extras for U-Boot on R-Car R8A7795 SoC * * Copyright (C) 2018 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/arch/arm/dts/r8a77960-u-boot.dtsi b/arch/arm/dts/r8a77960-u-boot.dtsi index 15a91474324..2245be2aa76 100644 --- a/arch/arm/dts/r8a77960-u-boot.dtsi +++ b/arch/arm/dts/r8a77960-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Device Tree Source extras for U-Boot on RCar R8A7796 SoC + * Device Tree Source extras for U-Boot on R-Car R8A7796 SoC * * Copyright (C) 2018 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/arch/arm/dts/r8a77965-u-boot.dtsi b/arch/arm/dts/r8a77965-u-boot.dtsi index 54107d1ae35..f39acc237d3 100644 --- a/arch/arm/dts/r8a77965-u-boot.dtsi +++ b/arch/arm/dts/r8a77965-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Device Tree Source extras for U-Boot on RCar R8A77965 SoC + * Device Tree Source extras for U-Boot on R-Car R8A77965 SoC * * Copyright (C) 2018 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/arch/arm/dts/r8a77970-u-boot.dtsi b/arch/arm/dts/r8a77970-u-boot.dtsi index d252c2e8e6c..7900c641ba1 100644 --- a/arch/arm/dts/r8a77970-u-boot.dtsi +++ b/arch/arm/dts/r8a77970-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Device Tree Source extras for U-Boot on RCar R8A77970 SoC + * Device Tree Source extras for U-Boot on R-Car R8A77970 SoC * * Copyright (C) 2018 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/arch/arm/dts/r8a77980-u-boot.dtsi b/arch/arm/dts/r8a77980-u-boot.dtsi index 9f7bf499bc0..aa7e058c585 100644 --- a/arch/arm/dts/r8a77980-u-boot.dtsi +++ b/arch/arm/dts/r8a77980-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Device Tree Source extras for U-Boot on RCar R8A77980 SoC + * Device Tree Source extras for U-Boot on R-Car R8A77980 SoC * * Copyright (C) 2019 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/arch/arm/dts/r8a77990-u-boot.dtsi b/arch/arm/dts/r8a77990-u-boot.dtsi index 50bbbe18647..b701f68db81 100644 --- a/arch/arm/dts/r8a77990-u-boot.dtsi +++ b/arch/arm/dts/r8a77990-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Device Tree Source extras for U-Boot on RCar R8A77990 SoC + * Device Tree Source extras for U-Boot on R-Car R8A77990 SoC * * Copyright (C) 2018 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/arch/arm/dts/r8a77995-u-boot.dtsi b/arch/arm/dts/r8a77995-u-boot.dtsi index 347b59ac42c..f4bafb6d088 100644 --- a/arch/arm/dts/r8a77995-u-boot.dtsi +++ b/arch/arm/dts/r8a77995-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Device Tree Source extras for U-Boot on RCar R8A77995 SoC + * Device Tree Source extras for U-Boot on R-Car R8A77995 SoC * * Copyright (C) 2018 Marek Vasut <marek.vasut(a)gmail.com> */ diff --git a/arch/arm/dts/r8a779x-u-boot.dtsi b/arch/arm/dts/r8a779x-u-boot.dtsi index 001ac59adb9..d1441f1f9df 100644 --- a/arch/arm/dts/r8a779x-u-boot.dtsi +++ b/arch/arm/dts/r8a779x-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Device Tree Source extras for U-Boot on RCar Gen3 + * Device Tree Source extras for U-Boot on R-Car Gen3 * * Copyright (C) 2018 Marek Vasut <marek.vasut(a)gmail.com> */ -- 2.45.2

1 12

[PATCH] rockchip: Add support for Radxa ROCK 5C Lite
by FUKAUMI Naoki 11 Dec '24

11 Dec '24

Radxa ROCK 5C Lite[1] is a RK3582 based single board computer. [1] https://radxa.com/products/rock5/5c Signed-off-by: FUKAUMI Naoki <naoki(a)radxa.com> --- this patch depends on follwing patches: - https://patchwork.ozlabs.org/project/uboot/patch/20241210222341.3537543-2-j… - https://patchwork.ozlabs.org/project/uboot/patch/20241211033934.23044-6-nao… --- arch/arm/mach-rockchip/rk3588/Kconfig | 5 +++-- configs/rock-5-rk3588s_defconfig | 1 + doc/board/rockchip/rockchip.rst | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3588/Kconfig b/arch/arm/mach-rockchip/rk3588/Kconfig index e1487ecb0464..733ea35839a5 100644 --- a/arch/arm/mach-rockchip/rk3588/Kconfig +++ b/arch/arm/mach-rockchip/rk3588/Kconfig @@ -261,10 +261,11 @@ config TARGET_ROCK_5_ITX_RK3588 Powered by either 12V, ATX power-supply or PoE config TARGET_ROCK_5_RK3588S - bool "Radxa ROCK 5C RK3588S2 board" + bool "Radxa ROCK 5C/5C Lite RK3588S2/RK3582 board" select BOARD_LATE_INIT help - Radxa ROCK 5C is a Rockchip RK3588S2 based single board computer. + Radxa ROCK 5C/5C Lite are Rockchip RK3588S2/RK3582 based + single board computer. config TARGET_SIGE7_RK3588 bool "ArmSoM Sige7 RK3588 board" diff --git a/configs/rock-5-rk3588s_defconfig b/configs/rock-5-rk3588s_defconfig index 54043264de48..a0137520803f 100644 --- a/configs/rock-5-rk3588s_defconfig +++ b/configs/rock-5-rk3588s_defconfig @@ -18,6 +18,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y CONFIG_LEGACY_IMAGE_FORMAT=y +CONFIG_OF_SYSTEM_SETUP=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588s-rock-5a.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst index 6b952654cb3d..4516260976ee 100644 --- a/doc/board/rockchip/rockchip.rst +++ b/doc/board/rockchip/rockchip.rst @@ -141,7 +141,7 @@ List of mainline supported Rockchip boards: - Radxa ROCK 5 ITX (rock-5-itx-rk3588) - Radxa ROCK 5A (rock5a-rk3588s) - Radxa ROCK 5B (rock5b-rk3588) - - Radxa ROCK 5C (rock-5-rk3588s) + - Radxa ROCK 5C/5C Lite (rock-5-rk3588s) - Rockchip Toybrick TB-RK3588X (toybrick-rk3588) - Theobroma Systems RK3588-SBC Jaguar (jaguar-rk3588) - Theobroma Systems SOM-RK3588-Q7 - Tiger (tiger-rk3588) -- 2.43.0

2 1

[PATCH v2 0/5] rockchip: Add support for Radxa ROCK 5C
by FUKAUMI Naoki 11 Dec '24

11 Dec '24

Radxa ROCK 5C is a Rockchip RK3588S2 based single board computer. Cristian Ciocaltea (1): arm64: dts: rockchip: Add HDMI0 node to rk3588 FUKAUMI Naoki (3): arm64: dts: rockchip: enable PCIe on M.2 E key for Radxa ROCK 5A arm64: dts: rockchip: add Radxa ROCK 5C rockchip: Add support for Radxa ROCK 5C Sam Edwards (1): arm64: dts: rockchip: Split up RK3588's PCIe pinctrls arch/arm/dts/rk3588s-rock-5-u-boot.dtsi | 16 + arch/arm/dts/rk3588s-rock-5c-u-boot.dtsi | 6 + arch/arm/mach-rockchip/rk3588/Kconfig | 7 + board/radxa/rock-5-rk3588s/Kconfig | 12 + board/radxa/rock-5-rk3588s/MAINTAINERS | 8 + board/radxa/rock-5-rk3588s/Makefile | 3 + board/radxa/rock-5-rk3588s/rock-5-rk3588s.c | 77 ++ configs/rock-5-rk3588s_defconfig | 95 ++ doc/board/rockchip/rockchip.rst | 1 + .../arm64/rockchip/rk3588-base-pinctrl.dtsi | 271 +++++- .../src/arm64/rockchip/rk3588-base.dtsi | 41 + .../src/arm64/rockchip/rk3588s-rock-5a.dts | 34 + .../src/arm64/rockchip/rk3588s-rock-5c.dts | 920 ++++++++++++++++++ include/configs/rock-5-rk3588s.h | 15 + 14 files changed, 1458 insertions(+), 48 deletions(-) create mode 100644 arch/arm/dts/rk3588s-rock-5-u-boot.dtsi create mode 100644 arch/arm/dts/rk3588s-rock-5c-u-boot.dtsi create mode 100644 board/radxa/rock-5-rk3588s/Kconfig create mode 100644 board/radxa/rock-5-rk3588s/MAINTAINERS create mode 100644 board/radxa/rock-5-rk3588s/Makefile create mode 100644 board/radxa/rock-5-rk3588s/rock-5-rk3588s.c create mode 100644 configs/rock-5-rk3588s_defconfig create mode 100644 dts/upstream/src/arm64/rockchip/rk3588s-rock-5c.dts create mode 100644 include/configs/rock-5-rk3588s.h -- 2.43.0

1 6

[PATCH] boards/sunxi/MAINTAINERS: sort items
by Icenowy Zheng 11 Dec '24

11 Dec '24

Some items are out of alphabetical order. Put them to the corresponding position to fix the order. Signed-off-by: Icenowy Zheng <uwu(a)icenowy.me> --- board/sunxi/MAINTAINERS | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 84799879e85..267d6d6d9f2 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -216,11 +216,6 @@ M: Aleksandr Aleksandrov <aleksandr.aleksandrov(a)emlid.com> S: Maintained F: configs/emlid_neutis_n5_devboard_defconfig -LCTECH PI F1C200S -M: Andre Przywara <andre.przywara(a)arm.com> -S: Maintained -F: configs/lctech_pi_f1c200s_defconfig - GEMEI-G9 TABLET M: Priit Laes <plaes(a)plaes.org> S: Maintained @@ -276,6 +271,28 @@ M: Jelle de Jong <jelledejong(a)powercraft.nl> S: Maintained F: configs/Lamobo_R1_defconfig +LCTECH PI F1C200S +M: Andre Przywara <andre.przywara(a)arm.com> +S: Maintained +F: configs/lctech_pi_f1c200s_defconfig + +LIBRETECH ALL-H3-CC BOARDS +M: Chen-Yu Tsai <wens(a)csie.org> +S: Maintained +F: configs/libretech_all_h3_cc_h2_plus_defconfig +F: configs/libretech_all_h3_cc_h3_defconfig +F: configs/libretech_all_h3_cc_h5_defconfig + +LIBRETECH ALL-H3-IT BOARDS +M: Chen-Yu Tsai <wens(a)csie.org> +S: Maintained +F: configs/libretech_all_h3_it_h5_defconfig + +LIBRETECH ALL-H5-CC BOARDS +M: Chen-Yu Tsai <wens(a)csie.org> +S: Maintained +F: configs/libretech_all_h5_cc_h5_defconfig + LICHEEPI-ZERO BOARD M: Icenowy Zheng <icenowy(a)aosc.xyz> S: Maintained @@ -336,23 +353,6 @@ M: Siarhei Siamashka <siarhei.siamashka(a)gmail.com> S: Maintained F: configs/MSI_Primo81_defconfig -LIBRETECH ALL-H3-CC BOARDS -M: Chen-Yu Tsai <wens(a)csie.org> -S: Maintained -F: configs/libretech_all_h3_cc_h2_plus_defconfig -F: configs/libretech_all_h3_cc_h3_defconfig -F: configs/libretech_all_h3_cc_h5_defconfig - -LIBRETECH ALL-H3-IT BOARDS -M: Chen-Yu Tsai <wens(a)csie.org> -S: Maintained -F: configs/libretech_all_h3_it_h5_defconfig - -LIBRETECH ALL-H5-CC BOARDS -M: Chen-Yu Tsai <wens(a)csie.org> -S: Maintained -F: configs/libretech_all_h5_cc_h5_defconfig - NANOPI DUO2 BOARD M: Chuanhong Guo <gch981213(a)gmail.com> S: Maintained -- 2.47.1

1 0

[REGRESSION] lmb: add and reserve memory above ram_top
by Sam Protsenko 11 Dec '24

11 Dec '24

Hi Sughosh, Commit eb052cbb896f ("lmb: add and reserve memory above ram_top") causes a regression on the E850-96 board. It looks like it could be not E850-96 specific though. During U-Boot boot (the most recent master branch, with this commit present), before U-Boot shell appears, I observe the next error message, which doesn't happen before this patch: ERROR: reserving fdt memory region failed (addr=f0000000 size=200000 flags=4) The memory node [1] is defined like this in the E850-96 dts: memory@80000000 { device_type = "memory"; reg = <0x0 0x80000000 0x3ab00000>, <0x0 0xc0000000 0x40000000>, <0x8 0x80000000 0x80000000>; }; And the reserved-memory node [2] has only one entry: ramoops@f0000000 { reg = <0x0 0xf0000000 0x200000>; ... }; Here is the relevant part of 'bdinfo' output: lmb_dump_all: memory.count = 0x3 memory[0] [0x80000000-0xbaafffff], 0x3ab00000 bytes, flags: none memory[1] [0xc0000000-0xffffffff], 0x40000000 bytes, flags: none memory[2] [0x880000000-0x8ffffffff], 0x80000000 bytes, flags: none reserved.count = 0x4 reserved[0] [0xb922d000-0xb922ffff], 0x3000 bytes, flags: no-notify, no-overwrite reserved[1] [0xb9230e10-0xbaafffff], 0x18cf1f0 bytes, flags: no-overwrite reserved[2] [0xc0000000-0xffffffff], 0x40000000 bytes, flags: no-overwrite reserved[3] [0x880000000-0x8ffffffff], 0x80000000 bytes, flags: no-overwrite The same error also occurs when I'm trying to boot Linux with 'booti' command: Working FDT set to 8a000000 ERROR: reserving fdt memory region failed (addr=f0000000 size=200000 flags=4) Loading Device Tree to 00000000b912a000, end 00000000b922cfff ... OK Although I think the device tree portion above is valid, I also tried to cleanup the 'memory' and 'reserved-memory' nodes like this, to see if that was going to help working around the issue: memory@80000000 { device_type = "memory"; reg = <0x0 0x80000000 0x80000000>, <0x8 0x80000000 0x80000000>; }; reserved-memory { ... secure_reserved: secure-os@bab00000 { reg = <0x0 0xbab00000 0x5500000>; no-map; }; ramoops@f0000000 { reg = <0x0 0xf0000000 0x200000>; ... }; }; It made the first error message (during the U-Boot boot) go away, but the later errors (when trying to boot the kernel) still persist. Here is the relevant 'bdinfo' output with my dts change above applied: lmb_dump_all: memory.count = 0x2 memory[0] [0x80000000-0xffffffff], 0x80000000 bytes, flags: none memory[1] [0x880000000-0x8ffffffff], 0x80000000 bytes, flags: none reserved.count = 0x5 reserved[0] [0xbab00000-0xbfffffff], 0x5500000 bytes, flags: no-map reserved[1] [0xf0000000-0xf01fffff], 0x200000 bytes, flags: no-overwrite reserved[2] [0xfe72d000-0xfe72ffff], 0x3000 bytes, flags: no-notify, no-overwrite reserved[3] [0xfe730dd0-0xffffffff], 0x18cf230 bytes, flags: no-overwrite reserved[4] [0x880000000-0x8ffffffff], 0x80000000 bytes, flags: no-overwrite The error messages I'm observing after issuing the 'booti' command are as follows: ERROR: reserving fdt memory region failed (addr=bab00000 size=5500000 flags=2) ERROR: reserving fdt memory region failed (addr=f0000000 size=200000 flags=4) It looks like all mentioned error messages are harmless, in a way that I'm still able to boot Linux, and U-Boot reserved areas still seem to exist in 'bdinfo'. But seeing error messages like that is definitely a nuisance by itself, and might be an indicator of some actual issues. Do you have any remedy for that by chance? Please let me know if you need more debug input from my side. Thanks! [1] https://source.denx.de/u-boot/u-boot/-/blob/master/dts/upstream/src/arm64/e… [2] https://source.denx.de/u-boot/u-boot/-/blob/master/dts/upstream/src/arm64/e…

2 5

[PATCH 0/6] lmb: Fix reserving the same region multiple times
by Sam Protsenko 11 Dec '24

11 Dec '24

Since commit 1d9aa4a283da ("lmb: Fix the allocation of overlapping memory areas with !LMB_NONE") the lmb_add_region_flags() returns -1 when the caller tries to add the already existing region with !LMB_NONE flags (it was returning 0 before that patch). That causes boot_fdt_reserve_region() function to print erroneous error messages when it's called consequently more than one time. Make lmb_add_region_flags() return -EEXIST when the already added region with !LMB_NONE flags is being added, and then check that error code in boot_fdt_reserve_region() to avoid printing the misleading error messages. I didn't want to change lmb_add_region_flags() behavior back to always returning 0 on attempts to add already existing regions with !LMB_NONE flags, as the unit tests in test/lib/lmb.c would break, and also commit 1d9aa4a283da ("lmb: Fix the allocation of overlapping memory areas with !LMB_NONE") specifically states that behavior is expected and required for efi_allocate_pages() calls with type=EFI_ALLOCATE_ADDRESS. All unit tests pass in sandbox U-Boot, with a small test modification in [PATCH 2/6]. I also made a bit of LMB cleanups in this series, while at it. Only [PATCH 6/6] introduces an actual functional change. Sam Protsenko (6): lmb: Fix flags data type in lmb_add_region_flags() lmb: Return -EEXIST in lmb_add_region_flags() if region already added lmb: Make const flag_str[] in lmb_print_region_flags() more const lmb: Improve coding style lmb: Improve kernel-doc comments boot: fdt: Handle already reserved memory in boot_fdt_reserve_region() boot/image-fdt.c | 2 +- include/lmb.h | 125 ++++++++++++++++++++++++++++------------------- lib/lmb.c | 105 +++++++++++++-------------------------- test/lib/lmb.c | 2 +- 4 files changed, 109 insertions(+), 125 deletions(-) -- 2.39.5

3 18

[PATCH] mtd: spi-nor: Fix the read issue when addr_width is 4byte
by Venkatesh Yadav Abbarapu 11 Dec '24

11 Dec '24

Fix the read issue for 4byte address width by passing the entire length to the read function, split the memory of 16MB size banks only when the address width is 3byte. Also update the size when the configuration is stacked. Fixes: 5d40b3d384 ("mtd: spi-nor: Add parallel and stacked memories support") Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> --- drivers/mtd/spi/spi-nor-core.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index ec841fb13b..c37a9bce74 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -1580,6 +1580,7 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, loff_t offset = from; u32 read_len = 0; u32 rem_bank_len = 0; + u32 stack_shift = 0; u8 bank; bool is_ofst_odd = false; @@ -1593,18 +1594,20 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, } while (len) { - bank = (u32)from / SZ_16M; - if (nor->flags & SNOR_F_HAS_PARALLEL) - bank /= 2; - - rem_bank_len = SZ_16M * (bank + 1); - if (nor->flags & SNOR_F_HAS_PARALLEL) - rem_bank_len *= 2; - rem_bank_len -= from; - + if (nor->addr_width == 3) { + bank = (u32)from / SZ_16M; + if (nor->flags & SNOR_F_HAS_PARALLEL) + bank /= 2; + + rem_bank_len = SZ_16M * (bank + 1); + if (nor->flags & SNOR_F_HAS_PARALLEL) + rem_bank_len *= 2; + rem_bank_len -= from; + } offset = from; if (nor->flags & SNOR_F_HAS_STACKED) { + stack_shift = 1; if (offset >= (mtd->size / 2)) { offset = offset - (mtd->size / 2); nor->spi->flags |= SPI_XFER_U_PAGE; @@ -1616,6 +1619,9 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, if (nor->flags & SNOR_F_HAS_PARALLEL) offset /= 2; + if (nor->addr_width == 4) + rem_bank_len = (mtd->size >> stack_shift) - offset; + #ifdef CONFIG_SPI_FLASH_BAR ret = write_bar(nor, offset); if (ret < 0) -- 2.17.1

3 2

[PATCH] common: relocate fdt_blob in global_data for FDTSRC_EMBED case
by Evgeny Bachinin 11 Dec '24

11 Dec '24

Patch resolves two kind of bugs, one of which is vulnerability related to KASLR. === Issue briefly === Working with FDT (via non-relocated gd::fdt_blob) from inside bootm command may lead to the reading the garbage instead of FDT nodes. And this can result in various side-effects depending on DTS nodes, being parsed during bootm. But below is my specific story how I faced with this issue due to MESON_RNG probing failure. === Bugs description === 1) Bug is revealed on: * configuration below * U-boot 2024.10 - f919c3a889f ("Prepare v2024.10") It seems, the following patch is a trigger: ea955eea4f ("fdt: automatically add /chosen/kaslr-seed if DM_RNG is enabled") Generally, CONFIG_OF_EMBED=y & CONFIG_RNG_MESON=y are the most valuable ones for reproducing the issue. ``` CONFIG_ARCH_FIXUP_FDT_MEMORY=y CONFIG_CMD_FDT=y CONFIG_DEFAULT_FDT_FILE="" CONFIG_FDT_64BIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y CONFIG_OF_LIBFDT_ASSUME_MASK=0x0 CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_OF_LIBFDT=y CONFIG_OF_LIST="meson-axg-our-device-name" CONFIG_OF_REAL=y CONFIG_OF_TRANSLATE=y CONFIG_SUPPORT_OF_CONTROL=y CONFIG_SYS_FDT_PAD=0x3000 CONFIG_TOOLS_OF_LIBFDT=y CONFIG_DM_RNG=y CONFIG_RNG_MESON=y ``` 2) Due to CONFIG_OF_EMBED, the DTS is embedded into U-boot ELF and accessible via __dtb_dt_begin symbol. On early boot stage (board_f.c) the fdtdec_setup() is called only once before U-boot's relocation into top of RAM. fdtdec_setup() initializes gd::fdt_blob for FDTSRC_EMBED case: ``` gd->fdt_blob = dtb_dt_embedded(); gd->fdt_src = FDTSRC_EMBED; ``` 3) Then reloc_fdt() is called in board_f.c But due to CONFIG_OF_EMBED=y the reloc_fdt() does not update gd::fdt_blob value (strictly speaking, it is impossible for CONFIG_OF_EMBED=y, because U-boot ELF has not been relocated yet at this moment). As a result after relocation we get fdt_blob, pointing to DTS address before relocation: ``` # bdinfo <...> relocaddr = 0x000000000fedf000 reloc off = 0x000000000eedf000 <...> fdt_blob = 0x010ce6c0 << points to __dtb_dt_begin before relocation new_fdt = 0x0000000000000000 << empty erroneously fdt_size = 0x0000000000000000 << zero erroneously ``` 4) During bootm command (according to our ITS-config file) the Linux is loaded into 0x01080000 (which is very close to fdt_blob addr 0x010ce6c0). ``` ## Loading kernel from FIT Image at 04000000 ... Trying 'kernel' kernel subimage <...> Load Address: 0x01080000 ``` So Linux image overwrites the gd::fdt_blob memory location in RAM (0x010ce6c0). 5) Issue: Hence any manipulation with DTS (say, via FDT API) inside implementation of bootm command leads to accessing the fdt_blob area with garbage, that can lead to two situations: 5.1) Abort. Call to fdt_off_dt_struct() from fdt_next_tag() :: fdt_offset_ptr():: fdt_offset_ptr_() returns with garbage, that leads to tagp value being out of RAM top addr (256 Mb in our board), causing the abort: ``` Boot cmd: bootm 0x4000000#boot_evt1 bootm_run_states() <...> image_setup_libfdt() fdt_chosen() fdt_kaslrseed() uclass_get_device() uclass_get_device_tail() device_probe() device_of_to_plat() meson_rng_of_to_plat() clk_get_by_name_optional() clk_get_by_name() clk_get_by_name_nodev() ofnode_stringlist_search() fdt_stringlist_search() fdt_getprop() fdt_get_property_namelen_() fdt_first_property_offset() fdt_check_node_offset_() fdt_next_tag(): ``` tagp = fdt_offset_ptr(fdt, offset, FDT_TAGSIZE); ``` fdt_next_tag() tagp:0x22890766 fdt_next_tag() ram_top:0x10000000 (tagp OUT of RAM) "Synchronous Abort" handler, esr 0x96000010, far 0x22890766 elr: 000000000108be24 lr : 000000000108be24 (reloc) elr: 000000000ff6fe24 lr : 000000000ff6fe24 x0 : 0000000000000041 x1 : 0000000000000000 x2 : 000000000ff3b57c x3 : 0000000000000012 x4 : 000000000ded2ad5 x5 : 0000000000000020 x6 : 00000000ffffffe8 x7 : 000000000ded2f40 x8 : 00000000ffffffd8 x9 : 000000000000000d x10: 0000000000000006 x11: 000000000001869f x12: 000000000fffffff x13: 000000000fffffff x14: 0000000000000000 x15: 000000000ded2abb x16: 000000000ff3b080 x17: 0000000000000001 x18: 000000000ded3dc0 x19: 0000000022890766 x20: 00000000010cb0f0 x21: 00000000000015e4 x22: 000000000ff8f4d8 x23: 000000000000000b x24: 000000000ded2fbc x25: 000000000ffe2000 x22: 000000000ff8f4d8 x23: 000000000000000b x24: 000000000ded2fbc x25: 000000000ffe2000 x26: 000000000ffe2000 x27: 000000000000000b x28: 000000000ff9cf2d x29: 000000000ded2f40 Code: aa1603e1 91197484 52801742 94004de8 (b9400276) ``` 5.2) Vulnerability situation "KASLR is disabled". Almost the same as in (5.1), but 2 situations happen (depending on the value of garbage): * call to fdt_offset_ptr_() :: fdt_off_dt_struct(fdt) returns not so big garbage, leading to tagp, being inside RAM. * or calculations of absoffset inside fdt_offset_ptr() leads to failure of the one of if() conditions with NULL as retval. Result is fdt_next_tag() interprets the tagp as FDT_END. And we are returning from our callstack via functions' error paths, leading to "No RNG device" and "KASLR disabled due to lack of seed": ``` fdt_kaslrseed() uclass_get_device() <...> device_probe() device_of_to_plat() meson_rng_of_to_plat() clk_get_by_name() clk_get_by_name_nodev() <...> fdt_stringlist_search() fdt_getprop() fdt_get_property_namelen_() fdt_first_property_offset() fdt_check_node_offset_() fdt_next_tag(): ``` tagp = fdt_offset_ptr(fdt, offset, FDT_TAGSIZE); ``` fdt_next_tag() tagp:0000000001890677 fdt_next_tag() ram_top:0x10000000 (tagp is inside RAM) uclass_get_device_tail():486 device_probe() ret:-22 No RNG device Starting kernel ... [ 0.000000] Linux version 6.9.12 [ 0.000000] KASLR disabled due to lack of seed ``` Signed-off-by: Evgeny Bachinin <EABachinin(a)salutedevices.com> --- Tested: * on board with Amlogic AXG SoC. * on sandbox: make sure that certain code from patch is called (of course, when CONFIG_OF_EMBED=y) * U-boot CI: https://github.com/u-boot/u-boot/pull/698/checks --- common/board_r.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/common/board_r.c b/common/board_r.c index 62228a723e12f8742437acae380e82f79903a8f5..88dc756b2a5e5a44f55f9b0fd012adc798a8afdb 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -152,6 +152,15 @@ static int initr_reloc_global_data(void) */ gd->env_addr += gd->reloc_off; #endif + + /* + * For CONFIG_OF_EMBED case the FDT is embedded into ELF, available by + * __dtb_dt_begin. After U-boot ELF self-relocation to RAM top address + * it is worth to update fdt_blob in global_data + */ + if (IS_ENABLED(CONFIG_OF_EMBED)) + gd->fdt_blob = dtb_dt_embedded(); + #ifdef CONFIG_EFI_LOADER /* * On the ARM architecture gd is mapped to a fixed register (r9 or x18). --- base-commit: cca05617a8f585f3a98a8fa82f75cc68a530d771 change-id: 20241119-of_embed_fdt_blob_garbage-ea729a8236e1 Best regards, -- Evgeny Bachinin <EABachinin(a)salutedevices.com>

4 6

[RFC PATCH 0/7] Cleanup the LMB subsystem
by Ilias Apalodimas 11 Dec '24

11 Dec '24

The LMB subsystem was used opportunistically for a number of years. A while back Sughosh merged it with the EFI subsystem in order to have a common allocator and avoid subsystems overwriting memory they shouldn't. This is an initial cleanup of all the crud we gathered over the years. There's no functional change expected from the patches as they just cleanup some abstraction functions and rename a few variables to make more sense. This has to be rebased on top of Sam's [0] changes but that should be trivial. I plan to make even bigger changes -- e.g I don't see the point of having *_alloc() and *_reserve() versions of the functions since they mostly do the same thing and just cause confusion. lmb_alloc_addr_flags() returning the base address on success makes little sense since we already *request* the address on the function arguments, etc. But since this patchset grew enough already, I'd like to get it in before more refactoring happens. It's worth noting that although some patches slightly increase the code size due to an extra flags argument being carried around, the final result is eventually smaller. add/remove: 2/5 grow/shrink: 17/3 up/down: 479/-524 (-45) Function old new delta lmb_alloc_base_flags - 299 +299 lmb_alloc_addr_flags - 90 +90 test_alloc_addr 2933 2963 +30 lib_test_lmb_overlapping_reserve 1018 1030 +12 test_multi_alloc.constprop 3034 3042 +8 test_get_unreserved_size 1032 1038 +6 boot_relocate_fdt 599 605 +6 lmb_alloc 4 9 +5 wget_handler 1530 1533 +3 tftp_handler 1190 1192 +2 test_noreserved 1207 1209 +2 test_bigblock 911 913 +2 load_serial 946 948 +2 lib_test_lmb_flags 2101 2103 +2 do_spi_flash 3150 3152 +2 do_bootz 526 528 +2 do_bootm_linux 2067 2069 +2 bootm_run_states 5275 5277 +2 _fs_read.lto_priv 331 333 +2 lmb_reserve 4 - -4 lmb_alloc_addr 4 - -4 lmb_overlaps_region 62 52 -10 lmb_add_region_flags 600 568 -32 lmb_alloc_base 48 - -48 efi_allocate_pages.part 303 249 -54 _lmb_alloc_addr.lto_priv 92 - -92 _lmb_alloc_base.lto_priv 280 - -280 Total: Before=2492742, After=2492697, chg -0.00% [0] https://lore.kernel.org/u-boot/20241208002121.31887-1-semen.protsenko@linar… Ilias Apalodimas (7): lmb: Replace lmb_reserve() with lmb_reserve_flags() lmb: Simplify lmb_addrs_overlap() lmb: Rename free_mem to available_mem lmb: Remove lmb_add_region() lmb: Replace lmb_alloc_addr() with lmb_alloc_addr_flags() lmb: Replace lmb_alloc_base() with lmb_alloc_base_flags() lmb: Rename _lmb_alloc_addr_flags() arch/powerpc/cpu/mpc85xx/mp.c | 2 +- arch/powerpc/lib/misc.c | 2 +- boot/bootm.c | 3 +- boot/image-board.c | 24 +++++--- boot/image-fdt.c | 11 ++-- cmd/booti.c | 2 +- cmd/bootz.c | 2 +- cmd/load.c | 2 +- fs/fs.c | 2 +- include/lmb.h | 11 ++-- lib/lmb.c | 111 +++++++++++----------------------- test/cmd/bdinfo.c | 2 +- test/lib/lmb.c | 68 +++++++++++---------- 13 files changed, 105 insertions(+), 137 deletions(-) -- 2.45.2

5 25