October 2023 - U-Boot

[PATCH] test/py: net: Add a test for 'pxe get' command
by Love Kumar 13 Oct '23

13 Oct '23

Execute the 'pxe get' command to download a pxe configuration file from the TFTP server and validate its interpretation. Signed-off-by: Love Kumar <love.kumar(a)amd.com> --- test/py/tests/test_net.py | 66 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py index cd4b4dc53cbc..b2241ae6a482 100644 --- a/test/py/tests/test_net.py +++ b/test/py/tests/test_net.py @@ -6,6 +6,7 @@ import pytest import u_boot_utils +import uuid """ Note: This test relies on boardenv_* containing configuration values to define @@ -61,6 +62,16 @@ env__net_nfs_readable_file = { 'crc32': 'c2244b26', } +# Details regarding a file that may be read from a TFTP server. This variable +# may be omitted or set to None if PXE testing is not possible or desired. +env__net_pxe_readable_file = { + 'fn': 'default', + 'addr': 0x2000000, + 'size': 74, + 'timeout': 50000, + 'pattern': 'Linux', +} + # True if a router advertisement service is connected to the network, and should # be tested. If router advertisement testing is not possible or desired, this variable may be omitted or set to False. @@ -260,3 +271,58 @@ def test_net_nfs(u_boot_console): output = u_boot_console.run_command('crc32 %x $filesize' % addr) assert expected_crc in output + +(a)pytest.mark.buildconfigspec("cmd_net") +(a)pytest.mark.buildconfigspec("cmd_pxe") +def test_net_pxe_get(u_boot_console): + """Test the pxe get command. + + A pxe configuration file is downloaded from the TFTP server and interpreted + to boot the images mentioned in pxe configuration file. + + The details of the file to download are provided by the boardenv_* file; + see the comment at the beginning of this file. + """ + + if not net_set_up: + pytest.skip("Network not initialized") + + test_net_setup_static(u_boot_console) + + f = u_boot_console.config.env.get("env__net_pxe_readable_file", None) + if not f: + pytest.skip("No PXE readable file to read") + + addr = f.get("addr", None) + timeout = f.get("timeout", u_boot_console.p.timeout) + + pxeuuid = uuid.uuid1() + u_boot_console.run_command(f"setenv pxeuuid {pxeuuid}") + expected_text_uuid = f"Retrieving file: pxelinux.cfg/{pxeuuid}" + + ethaddr = u_boot_console.run_command("echo $ethaddr") + ethaddr = ethaddr.replace(':', '-') + expected_text_ethaddr = f"Retrieving file: pxelinux.cfg/01-{ethaddr}" + + ip = u_boot_console.run_command("echo $ipaddr") + ip = ip.split('.') + ipaddr_file = "".join(['%02x' % int(x) for x in ip]).upper() + expected_text_ipaddr = f"Retrieving file: pxelinux.cfg/{ipaddr_file}" + expected_text_default = f"Retrieving file: pxelinux.cfg/default" + + with u_boot_console.temporary_timeout(timeout): + output = u_boot_console.run_command("pxe get") + + assert "TIMEOUT" not in output + assert expected_text_uuid in output + assert expected_text_ethaddr in output + assert expected_text_ipaddr in output + + i = 1 + for i in range(0, len(ipaddr_file) - 1): + expected_text_ip = f"Retrieving file: pxelinux.cfg/{ipaddr_file[:-i]}" + assert expected_text_ip in output + i += 1 + + assert expected_text_default in output + assert "Config file 'default.boot' found" in output -- 2.25.1

3 3

Re: [PATCH 1/1] riscv: enable CONFIG_DEBUG_UART by default
by Rick Chen 13 Oct '23

13 Oct '23

> From: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> > Sent: Saturday, September 23, 2023 7:35 AM > To: Rick Jian-Zhi Chen(陳建志) <rick(a)andestech.com>; Leo Yu-Chi Liang(梁育齊) <ycliang(a)andestech.com> > Cc: u-boot(a)lists.denx.de; Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> > Subject: [PATCH 1/1] riscv: enable CONFIG_DEBUG_UART by default > > Most boards don't enable the pre-console buffer. So we will not see any early messages. OpenSBI 1.3 provides us with the debug console extension that can fill this gap. > > For S-Mode U-Boot enable CONFIG_DEBUG_UART by default. > > Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> > --- > arch/riscv/Kconfig | 1 + > 1 file changed, 1 insertion(+) Reviewed-by: Rick Chen <rick(a)andestech.com>

1 0

Re: [PATCH 7/7] riscv: Remove common.h usage
by Rick Chen 13 Oct '23

13 Oct '23

> From: Tom Rini <trini(a)konsulko.com> > Sent: Friday, October 13, 2023 7:04 AM > To: u-boot(a)lists.denx.de > Cc: Rick Jian-Zhi Chen(陳建志) <rick(a)andestech.com>; Leo Yu-Chi Liang(梁育齊) <ycliang(a)andestech.com> > Subject: [PATCH 7/7] riscv: Remove common.h usage > > We can remove common.h from most cases of the code here, and only a few places need an additional header instead. > > Signed-off-by: Tom Rini <trini(a)konsulko.com> > --- > Cc: Rick Chen <rick(a)andestech.com> > Cc: Leo <ycliang(a)andestech.com> > --- Reviewed-by: Rick Chen <rick(a)andestech.com>

1 0

Re: [PATCH 1/1] configs: sifive: enable poweroff command on Unmatched
by Rick Chen 13 Oct '23

13 Oct '23

> From: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> > Sent: Sunday, October 01, 2023 1:41 PM > To: Paul Walmsley <paul.walmsley(a)sifive.com>; Green Wan <green.wan(a)sifive.com> > Cc: Rick Jian-Zhi Chen(陳建志) <rick(a)andestech.com>; Leo Yu-Chi Liang(梁育齊) <ycliang(a)andestech.com>; u-boot(a)lists.denx.de; Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> > Subject: [PATCH 1/1] configs: sifive: enable poweroff command on Unmatched > > Powering off the SiFive HiFive Unmatched board is supported both via the SBI and GPIO sysreset drivers. See device-tree entry > > compatible = "gpio-poweroff". > > Enable the poweroff command. > > Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> > --- > configs/sifive_unmatched_defconfig | 1 + > 1 file changed, 1 insertion(+) Reviewed-by: Rick Chen <rick(a)andestech.com>

1 0

[PATCH v2 0/5] clk : rockchip: update rk3568 and rk3588 clk driver
by Elaine Zhang 13 Oct '23

13 Oct '23

Change in V2: drop [PATCH v1 1/7] and [PATCH v1 2/7], upstream kernel first. update commit message and remove change id. Elaine Zhang (3): clk: rockchip: rk3568: support dclk_vop select more parent clks clk: rockchip: rk3588: support aclk_top_root set 750M clk: rockchip: rk3588: fix up the frac pll calculation Guochun Huang (1): clk: rk3588: Add 742.5M parameter for PLL Wyon Bi (1): clk: rockchip: rk3588: Avoid re-setting the pll rate of dclk_vop's parent drivers/clk/rockchip/clk_pll.c | 102 +++++++++++++++++++++++------- drivers/clk/rockchip/clk_rk3568.c | 10 ++- drivers/clk/rockchip/clk_rk3588.c | 35 +++++++--- 3 files changed, 112 insertions(+), 35 deletions(-) -- 2.17.1

2 10

[PATCH] rockchip: dts: rk3328: Sync rock64 device tree file from Linux
by Matwey V. Kornilov 13 Oct '23

13 Oct '23

Sync the rk3328-rock64 dts from v6.6-rc5. See Linux kernel commit for details: 03633c4ef1fb ("arm64: dts: rockchip: fix USB regulator on ROCK64") Signed-off-by: Matwey V. Kornilov <matwey.kornilov(a)gmail.com> --- arch/arm/dts/rk3328-rock64.dts | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/arch/arm/dts/rk3328-rock64.dts b/arch/arm/dts/rk3328-rock64.dts index f69a38f42d..0a27fa5271 100644 --- a/arch/arm/dts/rk3328-rock64.dts +++ b/arch/arm/dts/rk3328-rock64.dts @@ -37,7 +37,8 @@ vin-supply = <&vcc_io>; }; - vcc_host_5v: vcc-host-5v-regulator { + /* Common enable line for all of the rails mentioned in the labels */ + vcc_host_5v: vcc_host1_5v: vcc_otg_5v: vcc-host-5v-regulator { compatible = "regulator-fixed"; gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; @@ -48,17 +49,6 @@ vin-supply = <&vcc_sys>; }; - vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator { - compatible = "regulator-fixed"; - gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&usb20_host_drv>; - regulator-name = "vcc_host1_5v"; - regulator-always-on; - regulator-boot-on; - vin-supply = <&vcc_sys>; - }; - vcc_sys: vcc-sys { compatible = "regulator-fixed"; regulator-name = "vcc_sys"; -- 2.35.3

2 1

[PATCH v7 0/7] J721S2 DTS Sync from v6.6-rc1 to u-boot
by Manorit Chawdhry 12 Oct '23

12 Oct '23

The sync tries to ensure that U-boot remains functional with the updated Linux DTS and all the fixes from Linux move to U-boot during the sync. The series tries to sync from Linux v6.6-rc1 along with addition of the documentation for J721S2 that had been previously missing. DMA fixes [0] are currently being upstreamed to Linux. Test Logs are included in [1] [0]: https://lore.kernel.org/all/20230810174356.3322583-1-vigneshr@ti.com/ [1]: https://gist.github.com/manorit2001/dbad09fd00e8b7c3872e85874c8e648c Signed-off-by: Manorit Chawdhry <m-chawdhry(a)ti.com> --- Changes in v7: - Convert bootph-pre-ram to bootph-all in -u-boot.dtsi (Refer to https://lore.kernel.org/all/CAPnjgZ3MgWX8T0A0SofphEr_Xd77pE3hte9DNye1RuBVeB…) - Link to v6: https://lore.kernel.org/r/20230921-b4-upstream-j721s2-r5-pinmux-v6-0-ca9639… --- Manorit Chawdhry (6): Revert "arm: dts: k3-j7*: ddr: Update to 0.10 version of DDR config tool" arm: mach-k3: j721s2: Add mcu_timer0 id to the dev list arm: dts: k3-j721s2: Sync from Linux tag v6.6-rc1 arm: dts: k3-am68: Sync from Linux tag v6.6-rc1 docs: board: ti: Add j721s2_evm documentation board: ti: j721s2: MAINTAINERS: Update the MAINTAINERS File. Udit Kumar (1): configs: j721s2_evm_r5_defconfig: Increase malloc pool size in DRAM arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi | 119 ++-- arch/arm/dts/k3-am68-sk-base-board.dts | 524 +++++++++----- arch/arm/dts/k3-am68-sk-r5-base-board.dts | 151 +--- arch/arm/dts/k3-am68-sk-som.dtsi | 112 +-- arch/arm/dts/k3-j721e-ddr-evm-lp4-4266.dtsi | 98 +-- .../dts/k3-j721s2-common-proc-board-u-boot.dtsi | 112 ++- arch/arm/dts/k3-j721s2-common-proc-board.dts | 376 ++++++---- arch/arm/dts/k3-j721s2-ddr-evm-lp4-4266.dtsi | 464 ++++++------ arch/arm/dts/k3-j721s2-main.dtsi | 777 ++++++++++++++++++++- arch/arm/dts/k3-j721s2-mcu-wakeup.dtsi | 374 +++++++++- arch/arm/dts/k3-j721s2-r5-common-proc-board.dts | 158 +---- arch/arm/dts/k3-j721s2-som-p0.dtsi | 172 ++--- arch/arm/dts/k3-j721s2-thermal.dtsi | 101 +++ arch/arm/dts/k3-j721s2.dtsi | 12 +- arch/arm/mach-k3/j721s2/dev-data.c | 1 + board/ti/j721s2/MAINTAINERS | 11 +- configs/j721s2_evm_r5_defconfig | 1 + doc/board/ti/j721s2_evm.rst | 341 +++++++++ doc/board/ti/k3.rst | 1 + 19 files changed, 2700 insertions(+), 1205 deletions(-) --- base-commit: e29b932aa07fa0226d325b35d96cd4eea0370129 change-id: 20230816-b4-upstream-j721s2-r5-pinmux-25c4cd61b258 Best regards, -- Manorit Chawdhry <m-chawdhry(a)ti.com>

4 16

[PATCH v5 0/2] J7200 device tree sync from v6.6-rc1 to u-boot
by Reid Tonking 12 Oct '23

12 Oct '23

This series tries to sync device tree files from Linux v6.6-rc1 while making changes to the u-boot.dtsi and r5-common-proc-board.dts files in order to remove duplicate nodes and achieve successful boot. DMA fixes [0] are currently being upstreamed to Linux. They'll be fixed in U-boot post their merge in Linux. Previous versions (v1-v3) of patch no longer boot in next branch due to a recent change with how bootph-pre-ram now works [1]. Changes have been in this version to avoid future issues with that. Boot log is included in [2] [0]: https://lore.kernel.org/all/20230810174356.3322583-1-vigneshr@ti.com/ [1]: https://lore.kernel.org/u-boot/CAPnjgZ3MgWX8T0A0SofphEr_Xd77pE3hte9DNye1RuB… [2]: https://gist.github.com/reidt1/809bafbab561bb148513e2b55ba11a56 --- Changes in v5: - Replaced bootph-all's in r5.dts with bootph-pre-ram - Link to v4: https://lore.kernel.org/u-boot/20231004165629.506664-1-reidt@ti.com/ Reid Tonking (2): arm: mach-k3: j7200: Add mcu_timer0 id to the dev list arm: dts: j7200: dts sync with Linux 6.6-rc1 .../k3-j7200-common-proc-board-u-boot.dtsi | 208 +++---- arch/arm/dts/k3-j7200-common-proc-board.dts | 186 +++--- arch/arm/dts/k3-j7200-main.dtsi | 535 +++++++++++++++++- arch/arm/dts/k3-j7200-mcu-wakeup.dtsi | 286 +++++++++- .../arm/dts/k3-j7200-r5-common-proc-board.dts | 301 +--------- arch/arm/dts/k3-j7200-som-p0.dtsi | 154 +++-- arch/arm/dts/k3-j7200-thermal.dtsi | 47 ++ arch/arm/dts/k3-j7200.dtsi | 30 +- arch/arm/mach-k3/j7200/dev-data.c | 1 + 9 files changed, 1207 insertions(+), 541 deletions(-) create mode 100644 arch/arm/dts/k3-j7200-thermal.dtsi -- 2.34.1

3 5

[PATCH v2 0/2] board: ti: am6x: Switch to standard boot
by Roger Quadros 12 Oct '23

12 Oct '23

Hi, This series switches am64x to standard boot flow. Also minor fix to am62x boot targets. NOTE: Tested on AM64x GP EVM but I had to hand edit the grub.cfg file provided with the TI release [1] from, menuentry 'boot'{ linux /Image root=PARTUUID=3a4a99a8-02 rootwait rootfstype=ext4 } to, menuentry 'boot'{ linux /Image console=ttyS2,115200n8 root=PARTUUID=3a4a99a8-02 rootwait rootfstype=ext4 } else there is no console output. [1] https://dr-download.ti.com/software-development/software-development-kit-sd… cheers, -roger Changelog: v2: - Added Nishanth's Reviewed-by for patch 1 - Dropped unnecessary headers and macro from patch 2 Roger Quadros (2): board: ti: am62x: am62x.env: Fix boot_targets board: ti: am64x: Switch to standard boot flow board/ti/am62x/am62x.env | 2 +- board/ti/am64x/am64x.env | 1 + configs/am64x_evm_a53_defconfig | 5 +++-- include/configs/am64x_evm.h | 9 --------- 4 files changed, 5 insertions(+), 12 deletions(-) base-commit: e29b932aa07fa0226d325b35d96cd4eea0370129 prerequisite-patch-id: afb49f33f198747451687f83936f039049365924 prerequisite-patch-id: 1d8297eb0a3b44d8578cae785cc22f0fb6077239 prerequisite-patch-id: 4ae9fdc0b3737e55289a78a59d546a08c03d62e5 prerequisite-patch-id: 2be0e0caf153bec2c453b2f21342ba207c1ee13d prerequisite-patch-id: 7710703ce9a41b72ff3fb89abf0823625a5b5454 prerequisite-patch-id: 60d61440bf0ab8c0bea8b971ef18aa6d0d26e113 prerequisite-patch-id: c974e6d80489cbb0ee8cc1f3e19bcc9cf47f25b6 -- 2.34.1

4 11

[PATCH] clk: ti: clk-sci: Notify AVS driver based upon clock rate
by Udit Kumar 12 Oct '23

12 Oct '23

AVS driver needs to be notified before or after clock change, depending upon new rate is greater or less than current clock rate. Fixes: 1e0aa873bc7cd ("clk: clk-ti-sci: Notify AVS driver upon setting clock rate") Cc: Keerthy <j-keerthy(a)ti.com> Signed-off-by: Udit Kumar <u-kumar1(a)ti.com> --- Boot logs https://gist.github.com/uditkumarti/5a05f9b18b8e5bc347ef98c901cc13d4 Separate patch for clk-sci driver to handle AVS, as per review feedback in https://lore.kernel.org/all/20230920120256.2901860-1-u-kumar1@ti.com/ drivers/clk/ti/clk-sci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/clk/ti/clk-sci.c b/drivers/clk/ti/clk-sci.c index 74df5a397b..8fc3254c99 100644 --- a/drivers/clk/ti/clk-sci.c +++ b/drivers/clk/ti/clk-sci.c @@ -91,12 +91,12 @@ static ulong ti_sci_clk_set_rate(struct clk *clk, ulong rate) const struct ti_sci_handle *sci = data->sci; const struct ti_sci_clk_ops *cops = &sci->ops.clk_ops; int ret; + int freq_scale_up = rate >= ti_sci_clk_get_rate(clk) ? 1 : 0; debug("%s(clk=%p, rate=%lu)\n", __func__, clk, rate); -#ifdef CONFIG_K3_AVS0 - k3_avs_notify_freq(clk->id, clk->data, rate); -#endif + if (IS_ENABLED(CONFIG_K3_AVS0) && freq_scale_up) + k3_avs_notify_freq(clk->id, clk->data, rate); ret = cops->set_freq(sci, clk->id, clk->data, 0, rate, ULONG_MAX); if (ret) { @@ -104,6 +104,9 @@ static ulong ti_sci_clk_set_rate(struct clk *clk, ulong rate) return ret; } + if (IS_ENABLED(CONFIG_K3_AVS0) && !freq_scale_up) + k3_avs_notify_freq(clk->id, clk->data, rate); + return rate; } -- 2.34.1

2 1