June 2024 - U-Boot

[PATCH 1/1] efi_selftest: can't have measured device-tree with kaslr-seed
by Heinrich Schuchardt 22 Jun '24

22 Jun '24

Test that we don't have a /chosen/kaslr-seed property if we measure the device-tree. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_selftest/efi_selftest_fdt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/efi_selftest/efi_selftest_fdt.c b/lib/efi_selftest/efi_selftest_fdt.c index aa3b13ae3ab..066d9581432 100644 --- a/lib/efi_selftest/efi_selftest_fdt.c +++ b/lib/efi_selftest/efi_selftest_fdt.c @@ -227,6 +227,13 @@ static int execute(void) return EFI_ST_FAILURE; } } + if (IS_ENABLED(CONFIG_EFI_TCG2_PROTOCOL_MEASURE_DTB)) { + str = get_property(u"kaslr-seed", u"chosen"); + if (str) { + efi_st_error("kaslr-seed with measured fdt\n"); + return EFI_ST_FAILURE; + } + } if (IS_ENABLED(CONFIG_RISCV)) { u32 fdt_hartid; -- 2.45.1

2 3

[PATCH 1/2] tpm: Fix return code, if the eventlog buffer is full
by Ilias Apalodimas 22 Jun '24

22 Jun '24

We currently return 'No space left on device' if the eventlong buffer we allocated is not enough. On a similar check later on that function during the call to tcg2_log_init() we return 'No buffer space available'. So switch both error codes to -ENOBUFS since we are always checking a buffer and not a device. Fixes: 97707f12fdab ("tpm: Support boot measurements") Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/tpm-v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c index a67daed2f3c1..91526af33acb 100644 --- a/lib/tpm-v2.c +++ b/lib/tpm-v2.c @@ -554,7 +554,7 @@ int tcg2_log_prepare_buffer(struct udevice *dev, struct tcg2_event_log *elog, if (elog->log_size) { if (log.found) { if (elog->log_size < log.log_position) - return -ENOSPC; + return -ENOBUFS; /* * Copy the discovered log into the user buffer -- 2.45.2

1 3

[PATCH v3 00/18] Bug-fixes for a few boards
by Simon Glass 22 Jun '24

22 Jun '24

This series includes fixes to get some rockchip and nvidia boards working again. It also drops the broken Beaglebone Black config and provides a devicetree fix for coral (x86). Changes in v3: - Use BLOBLIST instead of OF_BLOBLIST - Cut the patch down to bare bones - Split out the refactoring into a separate patch - Drop the non-dcache optimisation, since the cache should normally be on Changes in v2: - Put the conditions under EFI_TCG2_PROTOCOL - Consider MEASURED_BOOT too - Remove the superfluous if() and drop the debug() as well - Use 'phase' instead of 'stage' - Add new patch to correct memory size in SPL - Drop patch "regulator: rk8xx: Fix incorrect parameter" - Rewrite boneblack patch to onstead drop the target and update docs Simon Glass (18): binman: Support an assumed size for missing binaries binman: Make Intel ME default to position 0x1000 mkeficapsule: Add a --version argument binman: Collect the version number for mkeficapsule binman: Deal with mkeficapsule being missing binman: Return failure when a usage() message is generated binman: Keep the efi_capsule input file x86: Set up some assumed sizes for binary blobs nvidia: nyan-big: Disable debug UART tpm: Avoid code bloat when not using EFI_TCG2_PROTOCOL rockchip: veyron: Add logging for power init power: regulator: Handle autoset in regulators_enable_boot_on() fdt: Correct condition for bloblist existing spl: Allow ATF to work when dcache is disabled rockchip: Ensure memory size is available in RK3399 SPL rockchip: Avoid #ifdefs in RK3399 SPL rockchip: bob: kevin: Disable dcache in SPL Drop the special am335x_boneblack_vboot target arch/x86/dts/u-boot.dtsi | 5 ++ board/google/veyron/veyron.c | 30 +++---- board/ti/am335x/MAINTAINERS | 1 - boot/Kconfig | 4 + common/spl/spl_atf.c | 3 +- configs/am335x_boneblack_vboot_defconfig | 94 ---------------------- configs/am335x_evm_defconfig | 3 +- configs/chromebook_bob_defconfig | 1 + configs/chromebook_kevin_defconfig | 1 + configs/nyan-big_defconfig | 1 - doc/mkeficapsule.1 | 4 + doc/usage/fit/beaglebone_vboot.rst | 21 +++-- drivers/power/regulator/regulator-uclass.c | 2 +- drivers/ram/rockchip/sdram_rk3399.c | 49 ++++++----- lib/Kconfig | 4 - lib/fdtdec.c | 12 ++- tools/binman/binman.rst | 7 ++ tools/binman/btool/mkeficapsule.py | 3 +- tools/binman/entry.py | 1 + tools/binman/etype/blob.py | 7 +- tools/binman/etype/efi_capsule.py | 5 +- tools/binman/etype/intel_descriptor.py | 2 +- tools/binman/ftest.py | 28 +++++++ tools/binman/test/326_assume_size.dts | 16 ++++ tools/binman/test/327_assume_size_ok.dts | 16 ++++ tools/mkeficapsule.c | 10 ++- 26 files changed, 168 insertions(+), 162 deletions(-) delete mode 100644 configs/am335x_boneblack_vboot_defconfig create mode 100644 tools/binman/test/326_assume_size.dts create mode 100644 tools/binman/test/327_assume_size_ok.dts -- 2.34.1

5 30

USB gadget device (USB_ETHER) with ChipIdea device controller (imx)
by Tim Harvey 22 Jun '24

22 Jun '24

Greetings, Is anyone successfully using USB gadget device (USB_ETHER) on any imx that has the ChipIdea device controller? (imx6/imx7/imx8mm): I've never been able to get this to work as when usb_setup_ehci_gadget() is called from ci_udc's usb_gadget_register_driver() it first removes the usb controller (and its children) before reprobing it and this causes a hang. Here's an example with v2024.07-rc4 on an imx8mm-venice-gw73xx-0x (imx8mm_venice_defconfig) after enabling CONFIG_USB_ETHER: u-boot=> net list eth0 : ethernet@30be0000 00:d0:12:ba:f8:cc active u-boot=> bind usb 0 usb_ether # bind usb_ether to first usb controller u-boot=> net list eth0 : ethernet@30be0000 00:d0:12:ba:f8:cc active eth2 : usb_ether 00:00:00:00:00:00 u-boot => setenv eth2addr 00:d0:12:ba:f8:cd u-boot=> net list eth0 : ethernet@30be0000 00:d0:12:ba:f8:cc active eth2 : usb_ether 00:d0:12:ba:f8:cd u-boot=> setenv ethact usb_ether; setenv ipaddr 10.0.0.2; setenv netmask 255.255.255.0; ping 10.0.0.1 ^^^ board hangs, USB host connected to board does not enumerate a CDC ether device Unbinding ethernet via 'unbind ethernet 0' first does not appear to make a difference. The following patch resolves this however I don't think this is the right fix as that was apparently added for a reason in commit fbeceb260232a ("dm: usb: Allow setting up a USB controller as a device/gadget"): diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index a1cd0ad2d669..38111fda8af9 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -403,6 +403,7 @@ int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp) ret = uclass_find_first_device(UCLASS_USB, &dev); if (ret) return ret; +#if 0 ret = device_remove(dev, DM_REMOVE_NORMAL); if (ret) return ret; @@ -412,6 +413,7 @@ int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp) ret = device_probe(dev); if (ret) return ret; +#endif *ctlrp = dev_get_priv(dev); return 0; diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index a1cd0ad2d669..38111fda8af9 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -403,6 +403,7 @@ int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp) ret = uclass_find_first_device(UCLASS_USB, &dev); if (ret) return ret; +#if 0 ret = device_remove(dev, DM_REMOVE_NORMAL); if (ret) return ret; @@ -412,6 +413,7 @@ int usb_setup_ehci_gadget(struct ehci_ctrl **ctlrp) ret = device_probe(dev); if (ret) return ret; +#endif *ctlrp = dev_get_priv(dev); return 0; Adding debugging to device_remove the hang occurs when removing 'usb_ether.bootdev' and I'm not quite sure where this device even comes from: usb_setup_ehci_gadget removing usb@32e40000 device_remove usb@32e40000 flags=0x1 device_remove usb_ether flags=0x1 device_remove usb_ether.bootdev flags=0x1 I don't understand why usb_setup_ehci_gadget() is removing the device in the first place just to go and probe it again. This is not a regression... I've never seen this work since I first tried it back in Feb 2022 [1] Any ideas? Best Regards, Tim [1] https://lore.kernel.org/all/CAJ+vNU1xH-J-0RV09OuM1e+hsRV=HXvh2oS6PfCWY5d+0s…

1 0

[PATCH 0/5] Add Binman code-coverage test to CI
by Simon Glass 21 Jun '24

21 Jun '24

Binman has 100% code coverage to ensure that future changes and refactors do not break existing entry types. This is a critical feature, given that it is relied on to produce images for all sorts of different SoCs and vendors. With the NXP additions the 'binman test -T' step was missed, so the Binman coverage test is currently failing. This series provides a means to close the testing gap. It cannot be applied until the tests are added, which should happen before -next is applied to -master Simon Glass (5): Dockerfile: Add python3-coverage Dockerfile: Add python3-pycryptodome buildman: Support building within a Python venv u_boot_pylib: Use correct coverage tool within venv CI: Run code-coverage test for Binman .gitlab-ci.yml | 4 +- tools/buildman/bsettings.py | 3 ++ tools/buildman/test.py | 83 +++++++++++++++++++++++++++++++++ tools/buildman/toolchain.py | 31 ++++++++++-- tools/docker/Dockerfile | 2 + tools/u_boot_pylib/test_util.py | 11 +++-- 6 files changed, 126 insertions(+), 8 deletions(-) -- 2.34.1

3 18

[PATCH 00/11] Tools updates for Labgrid
by Simon Glass 21 Jun '24

21 Jun '24

This series includes patches to update buildman to support Labgrid better and some minor binman fixes. Simon Glass (11): binman: efi: Correct entry docs binman: Regenerate nxp docs binman: ti: Regenerate entry docs binman: Update the entrydocs header buildman: Make mrproper an argument to _reconfigure() buildman: Make mrproper an argument to _config_and_build() buildman: Make mrproper an argument to run_commit() buildman: Avoid rebuilding when --mrproper is used buildman: Add a flag to force mrproper on failure buildman: Retry the build for current source buildman: Add a way to limit the number of buildmans tools/binman/entries.rst | 115 ++++++++++++++----- tools/binman/entry.py | 2 +- tools/binman/etype/efi_capsule.py | 40 +++---- tools/binman/etype/efi_empty_capsule.py | 22 ++-- tools/binman/etype/ti_secure.py | 45 ++++---- tools/buildman/builder.py | 18 +-- tools/buildman/builderthread.py | 44 +++++--- tools/buildman/buildman.rst | 8 +- tools/buildman/cmdline.py | 6 +- tools/buildman/control.py | 141 +++++++++++++++++++++++- tools/buildman/pyproject.toml | 6 +- tools/buildman/test.py | 121 ++++++++++++++++++++ tools/u_boot_pylib/terminal.py | 7 +- 13 files changed, 465 insertions(+), 110 deletions(-) -- 2.34.1

1 11

[PATCH v2 00/43] labgrid: Provide an integration with Labgrid
by Simon Glass 21 Jun '24

21 Jun '24

Labgrid provides access to a hardware lab in an automated way. It is possible to boot U-Boot on boards in the lab without physically touching them. It relies on relays, USB UARTs and SD muxes, among other things. By way of background, about 4 years ago I wrong a thing called Labman[1] which allowed my lab of about 30 devices to be operated remotely, using tbot for the console and build integration. While it worked OK and I used it for many bisects, I didn't take it any further. It turns out that there was already an existing program, called Labgrid, which I did not know about at time (thank you Tom for telling me). It is more rounded than Labman and has a number of advantages: - does not need udev rules, mostly - has several existing users who rely on it - supports multiple machines exporting their devices It lacks a 'lab check' feature and a few other things, but these can be remedied. On and off over the past several weeks I have been experimenting with Labgrid. I have managed to create an initial U-Boot integration (this series) by adding various features to Labgrid[2] and the U-Boot test hooks. I hope that this might inspire others to set up boards and run tests automatically, rather than relying on infrequent, manual test. Perhaps it may even be possible to have a number of labs available. Included in the integration are a number of simple scripts which make it easy to connect to boards and run tests: ub-int <target> Build and boot on a target, starting an interactive session ub-cli <target> Build and boot on a target, ensure U-Boot starts and provide an interactive session from there ub-smoke <target> Smoke test U-Boot to check that it boots to a prompt on a target ub-bisect Bisect a git tree to locate a failure on a particular target ub-pyt <target> <testspec> Run U-Boot pytests on a target Some of these help to provide the same tbot[4] workflow which I have relied on for several years, albeit much simpler versions. The goal here is to create some sort of script which can collect patches from the mailing list, apply them and test them on a selection of boards. I suspect that script already exists, so please let me know what you suggest. I hope you find this interesting and take a look! [1] https://github.com/sjg20/u-boot/tree/lab6a [2] https://github.com/labgrid-project/labgrid/pull/1411 [3] https://github.com/sjg20/uboot-test-hooks/tree/labgrid [4] https://tbot.tools/index.html Changes in v2: - Only disable echo if a terminal is detected - Add new patch to update u-boot.cfg with CFG_... options - Avoid running a docker image for skipped lab tests Simon Glass (43): trace: Update test to tolerate different trace-cmd version binman: efi: Correct entry docs binman: Regenerate nxp docs binman: ti: Regenerate entry docs binman: Update the entrydocs header buildman: Make mrproper an argument to _reconfigure() buildman: Make mrproper an argument to _config_and_build() buildman: Make mrproper an argument to run_commit() buildman: Avoid rebuilding when --mrproper is used buildman: Add a flag to force mrproper on failure buildman: Retry the build for current source buildman: Add a way to limit the number of buildmans dm: core: Enhance comments on bind_drivers_pass() initcall: Correct use of relocation offset am33xx: Provide a function to set up the debug UART sunxi: Mark scp as optional google: Disable TPMv2 on most Chromebooks meson: Correct driver declaration for meson_axg_gpio test: Allow signaling that U-Boot is ready test: Make bootstd init run only on sandbox test: Use a constant for the test timeout test: Pass stderr to stdout test: Release board after tests complete log: Allow tests to pass with CONFIG_LOGF_FUNC_PAD set test: Allow connecting to a running board test: Decode exceptions only with sandbox test: Avoid failing skipped tests test: dm: Show failing driver name test: Check help output test: Create a common function to get the config test: Introduce the concept of a role test: Move the receive code into a function test: Separate out the exception handling test: Detect dead connections test: Tidy up remaining exceptions test: Introduce lab mode test: Improve handling of sending commands test: Fix mulptiplex_log typo test: Avoid double echo when starting up test: Try to shut down the lab console gracefully test: Add a section for closing the connection Update u-boot.cfg to include CFG also CI: Allow running tests on sjg lab .gitlab-ci.yml | 153 +++++++++++++++++ arch/arm/dts/sunxi-u-boot.dtsi | 1 + arch/arm/mach-omap2/am33xx/board.c | 18 +- configs/chromebook_link64_defconfig | 1 + configs/chromebook_link_defconfig | 1 + configs/chromebook_samus_defconfig | 1 + configs/chromebook_samus_tpl_defconfig | 1 + configs/nyan-big_defconfig | 4 +- configs/snow_defconfig | 1 + drivers/core/lists.c | 16 ++ drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 2 +- drivers/pinctrl/meson/pinctrl-meson-axg.c | 4 +- drivers/pinctrl/meson/pinctrl-meson-axg.h | 2 +- drivers/pinctrl/meson/pinctrl-meson-g12a.c | 4 +- lib/initcall.c | 6 +- scripts/Makefile.autoconf | 2 +- test/py/conftest.py | 86 ++++++++-- test/py/tests/test_dm.py | 5 +- test/py/tests/test_help.py | 6 +- test/py/tests/test_log.py | 11 +- test/py/tests/test_trace.py | 6 +- test/py/tests/test_ut.py | 1 + test/py/u_boot_console_base.py | 154 ++++++++++++------ test/py/u_boot_console_exec_attach.py | 31 +++- test/py/u_boot_console_sandbox.py | 2 +- test/py/u_boot_spawn.py | 126 ++++++++++++-- test/test-main.c | 16 +- tools/binman/entries.rst | 115 +++++++++---- tools/binman/entry.py | 2 +- tools/binman/etype/efi_capsule.py | 40 ++--- tools/binman/etype/efi_empty_capsule.py | 22 +-- tools/binman/etype/ti_secure.py | 45 ++--- tools/buildman/builder.py | 18 +- tools/buildman/builderthread.py | 44 +++-- tools/buildman/buildman.rst | 8 +- tools/buildman/cmdline.py | 6 +- tools/buildman/control.py | 141 +++++++++++++++- tools/buildman/pyproject.toml | 6 +- tools/buildman/test.py | 121 ++++++++++++++ tools/u_boot_pylib/terminal.py | 7 +- 40 files changed, 1009 insertions(+), 227 deletions(-) -- 2.34.1

2 45

[PATCH] doc: board: ti: Add capsule documentation for TI K3 devices
by Jonathan Humphreys 21 Jun '24

21 Jun '24

Added introductory documentation about capsule support for TI devices, including links to more detailed information. Also added a note in the build secction that points to the host package dependency docs. This patch is followup from a request in the series introducing capsule update for TI boards. https://lore.kernel.org/r/20240618145058.552eapp5iiz772ej@hardcore Signed-off-by: Jonathan Humphreys <j-humphreys(a)ti.com> --- doc/board/ti/k3.rst | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/doc/board/ti/k3.rst b/doc/board/ti/k3.rst index 76375473185..67b066a07d3 100644 --- a/doc/board/ti/k3.rst +++ b/doc/board/ti/k3.rst @@ -204,6 +204,11 @@ online Build Procedure --------------- +.. note :: + + Make sure you have installed all necessary host package dependencies + before proceeding. See :ref:`build/gcc:Building with GCC`. + Depending on the specifics of your device, you will need three or more binaries to boot your SoC. @@ -388,6 +393,30 @@ wakeup and main domain and to boot to the U-Boot prompt | `tispl.bin` for HS devices or `tispl.bin_unsigned` for GP devices | `u-boot.img` for HS devices or `u-boot.img_unsigned` for GP devices +Capsules +-------- + +Most K3 boards have support for UEFI capsule update via capsule-on-disk +functionality. Check the ``CONFIG_EFI_CAPSULE_ON_DISK`` config option for +the board under question to verify. If configured, capsules for each of the +binaries above are automatically generated as part of the binary's build. +They are named `<binary>-capsule.bin`. For example, the capsule for +`u-boot.img` would be called `uboot-capsule.bin`. + +See :ref:`uefi_capsule_update_ref` for more information on U-Boot's support +for capsule update and how they are applied. + +Each board defines the capsules generated, including where those capsules +are applied. See the ``update_info`` definition for a board, typically +found at `board/ti/<board>/evm.c`. For example, `board/ti/am62x/evm.c`. +Usually, if the board has OSPI flash, the capsules will be applied there, +else the boot partition of the eMMC device. + +Once applied, the board will have U-Boot binaries in on-board non-volatile +storage. To start booting from that storage, set the bootmode pins +accordingly. Future updates can be performed by using the capsules +generated from the corresponding U-Boot builds. + FIT signature signing --------------------- -- 2.34.1

1 0

[PATCH v2 0/6] Add Binman code-coverage test to CI
by Simon Glass 21 Jun '24

21 Jun '24

Binman has 100% code coverage to ensure that future changes and refactors do not break existing entry types. This is a critical feature, given that it is relied on to produce images for all sorts of different SoCs and vendors. With the NXP additions the 'binman test -T' step was missed, so the Binman coverage test is currently failing. This series provides a means to close the testing gap. It cannot be applied until the tests are added, which should happen before -next is applied to -master Changes in v2: - Add new patch to fix a few typos in toolchain code - Add to azure also (oops) - Add to buildman requirements instead - Fix 'envronment' typo Simon Glass (6): buildman: Add python3-coverage buildman: Add python3-pycryptodome buildman: Fix a few typos in toolchain code buildman: Support building within a Python venv u_boot_pylib: Use correct coverage tool within venv CI: Run code-coverage test for Binman .azure-pipelines.yml | 5 +- .gitlab-ci.yml | 4 +- tools/buildman/bsettings.py | 3 ++ tools/buildman/requirements.txt | 2 + tools/buildman/test.py | 83 +++++++++++++++++++++++++++++++++ tools/buildman/toolchain.py | 35 +++++++++++--- tools/u_boot_pylib/test_util.py | 11 +++-- 7 files changed, 132 insertions(+), 11 deletions(-) -- 2.34.1

2 8

[PATCH 0/2] doc: develop: testing: Fix more reference links
by Alexander Dahl 21 Jun '24

21 Jun '24

Found some more broken reference links when reading the documentation. Greets Alex Alexander Dahl (2): doc: develop: testing: Fix broken reference to pytest suite help doc: develop: testing: Fix reference to test writing section doc/develop/testing.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: fe2ce09a0753634543c32cafe85eb87a625f76ca -- 2.39.2

2 4

[PATCH] RFC: Add a tag for the world builds
by Simon Glass 21 Jun '24

21 Jun '24

Currently the world builds run on all runners, including faster and slower ones. The difference can be quite dramatic, with some builders 4x as fast as others, resulting in just one world build taking between 20 minutes and an hour and 20 minutes. Add a tag so that we can select which builders run these CPU-intensive jobs. With this tag we can also increase CPU utilisation by running multiple QEMU tests in parallel. Currently these tests leave most machines fairly idle, since we cannot run more than one world build on a machine. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 165f765a833..750c4ff5f4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ variables: DEFAULT_TAG: "" + BUILD_TAG: "build" MIRROR_DOCKER: docker.io default: @@ -92,6 +93,8 @@ stages: .world_build: stage: world build + tags: + - ${BUILD_TAG} rules: - when: always -- 2.34.1

2 4

[PATCH 0/6] Move DRAM address of ATF
by Andrew Davis 21 Jun '24

21 Jun '24

Hello all, Explanation for this series is mostly in [4/6]. First 3 patches should be safe to take independent of the last 3. Thanks, Andrew Andrew Davis (6): arm: mach-k3: Add default ATF location for AM62/AM62a arm: mach-k3: Add config option for setting OP-TEE address arm: mach-k3: am62: Enable OF_SYSTEM_SETUP for all boards arm: mach-k3: am62: Fixup TF-A/OP-TEE reserved-memory node in FDT arm: mach-k3: am62a: Fixup TF-A/OP-TEE reserved-memory node in FDT arm: mach-k3: Move DRAM address of ATF for AM62/AM62a arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 4 +- arch/arm/dts/k3-am65-iot2050-boot-image.dtsi | 4 +- arch/arm/dts/k3-binman.dtsi | 8 +-- .../dts/k3-j721e-beagleboneai64-u-boot.dtsi | 4 +- arch/arm/mach-k3/Kconfig | 10 +++- arch/arm/mach-k3/Makefile | 1 + arch/arm/mach-k3/am625_fdt.c | 2 + arch/arm/mach-k3/am62a7_fdt.c | 16 ++++++ arch/arm/mach-k3/am62ax/Kconfig | 1 + arch/arm/mach-k3/am62x/Kconfig | 3 ++ arch/arm/mach-k3/common_fdt.c | 52 +++++++++++++++++++ arch/arm/mach-k3/common_fdt.h | 2 + configs/am62ax_evm_a53_defconfig | 1 - configs/am62x_beagleplay_a53_defconfig | 1 - configs/am62x_evm_a53_defconfig | 1 - configs/phycore_am62x_a53_defconfig | 1 - configs/verdin-am62_a53_defconfig | 2 - 17 files changed, 96 insertions(+), 17 deletions(-) create mode 100644 arch/arm/mach-k3/am62a7_fdt.c -- 2.39.2

9 28

[PATCH] arm: dts: corstone1000: enable secondary cores for FVP
by harsimransingh.tungal＠arm.com 21 Jun '24

21 Jun '24

From: Harsimran Singh Tungal <harsimransingh.tungal(a)arm.com> Add the secondary cores nodes in the dts file Signed-off-by: Harsimran Singh Tungal <harsimransingh.tungal(a)arm.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: Rui Miguel Silva <rui.silva(a)linaro.org> --- arch/arm/dts/corstone1000-fvp.dts | 25 +++++++++++++++++++++++++ arch/arm/dts/corstone1000.dtsi | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/corstone1000-fvp.dts b/arch/arm/dts/corstone1000-fvp.dts index 26b0f1b3ce..3076fb9f34 100644 --- a/arch/arm/dts/corstone1000-fvp.dts +++ b/arch/arm/dts/corstone1000-fvp.dts @@ -49,3 +49,28 @@ clock-names = "smclk", "apb_pclk"; }; }; + +&cpus { + cpu1: cpu@1 { + device_type = "cpu"; + compatible = "arm,cortex-a35"; + reg = <0x1>; + enable-method = "psci"; + next-level-cache = <&L2_0>; + }; + cpu2: cpu@2 { + device_type = "cpu"; + compatible = "arm,cortex-a35"; + reg = <0x2>; + enable-method = "psci"; + next-level-cache = <&L2_0>; + }; + cpu3: cpu@3 { + device_type = "cpu"; + compatible = "arm,cortex-a35"; + reg = <0x3>; + enable-method = "psci"; + next-level-cache = <&L2_0>; + }; +}; + diff --git a/arch/arm/dts/corstone1000.dtsi b/arch/arm/dts/corstone1000.dtsi index 1e0ec075e4..5d9d95b21c 100644 --- a/arch/arm/dts/corstone1000.dtsi +++ b/arch/arm/dts/corstone1000.dtsi @@ -21,7 +21,7 @@ stdout-path = "serial0:115200n8"; }; - cpus { + cpus: cpus { #address-cells = <1>; #size-cells = <0>; -- 2.25.1

3 3

[PATCH] mach-snapdragon: move default environment to a file
by Caleb Connolly 21 Jun '24

21 Jun '24

Make use of CONFIG_DEFAULT_ENV_FILE and move the default qcom environment to a file under board/qualcomm. This is much cleaner and means we don't need to recompile on changing the environment. Additionally, extend the environment to include a boot menu and auto-boot using EFI instead of bootm. Since we now support MMC and USB on most platforms, these are much more useful defaults. Signed-off-by: Caleb Connolly <caleb.connolly(a)linaro.org> --- board/qualcomm/default.env | 12 ++++++++++++ configs/qcom_defconfig | 2 ++ include/configs/qcom.h | 7 ------- 3 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 board/qualcomm/default.env diff --git a/board/qualcomm/default.env b/board/qualcomm/default.env new file mode 100644 index 000000000000..243aede77be7 --- /dev/null +++ b/board/qualcomm/default.env @@ -0,0 +1,12 @@ +stdin=serial,button-kbd +stdout=serial,vidconsole +stderr=serial,vidconsole +bootfile=/extlinux/extlinux.conf +preboot=scsi scan; usb start +fastboot=fastboot -l $fastboot_addr_r usb 0 +do_boot=bootefi bootmgr +bootmenu_0=Boot first available device=run do_boot +bootmenu_1=Enable fastboot mode=run fastboot +bootmenu_2=Reset device=reset +menucmd=bootmenu +bootcmd=run do_boot diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig index 80ad3b32e139..a9e3797bb39a 100644 --- a/configs/qcom_defconfig +++ b/configs/qcom_defconfig @@ -35,8 +35,10 @@ CONFIG_CMD_BMP=y CONFIG_CMD_LOG=y CONFIG_OF_LIVE=y CONFIG_OF_BOARD_SETUP=y CONFIG_BUTTON_QCOM_PMIC=y +CONFIG_USE_DEFAULT_ENV_FILE=y +CONFIG_DEFAULT_ENV_FILE="board/qualcomm/default.env" CONFIG_CLK=y CONFIG_CLK_QCOM_QCM2290=y CONFIG_CLK_QCOM_QCS404=y CONFIG_CLK_QCOM_SDM845=y diff --git a/include/configs/qcom.h b/include/configs/qcom.h index e50b3bce5cdd..5b5ebbd844df 100644 --- a/include/configs/qcom.h +++ b/include/configs/qcom.h @@ -10,12 +10,5 @@ #define __CONFIGS_SNAPDRAGON_H #define CFG_SYS_BAUDRATE_TABLE { 115200, 230400, 460800, 921600 } -/* Load addressed are calculated during board_late_init(). See arm/mach-snapdragon/board.c */ -#define CFG_EXTRA_ENV_SETTINGS \ - "stdin=serial,button-kbd\0" \ - "stdout=serial,vidconsole\0" \ - "stderr=serial,vidconsole\0" \ - "bootcmd=bootm $prevbl_initrd_start_addr\0" - #endif -- 2.45.0

2 5

[PATCH v2] arm: dts: k3-am625-beagleplay: Package TIFS Stub
by Dhruva Gole 21 Jun '24

21 Jun '24

Add support for packaging the TIFS Stub as it's required for basic Low Power Modes like Deep Sleep. Acked-by: Neha Malcom Francis <n-francis(a)ti.com> Signed-off-by: Dhruva Gole <d-gole(a)ti.com> --- No changes from v1, just picked Neha's ack and rebased on master again. Link to v1: https://lore.kernel.org/u-boot/20240612062351.3690091-1-d-gole@ti.com/ arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 33 +++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi index fb2032068d1c..5e2248a4a668 100644 --- a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi +++ b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi @@ -69,6 +69,23 @@ }; }; + tifsstub-gp { + filename = "tifsstub.bin_gp"; + ti-secure-rom { + content = <&tifsstub_gp>; + core = "secure"; + load = <0x60000>; + sw-rev = <CONFIG_K3_X509_SWRV>; + keyfile = "ti-degenerate-key.pem"; + tifsstub; + }; + tifsstub_gp: tifsstub-gp.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-gp.bin"; + type = "blob-ext"; + optional; + }; + }; + ti-spl_unsigned { filename = "tispl.bin_unsigned"; pad-byte = <0xff>; @@ -105,6 +122,19 @@ }; }; + tifsstub-gp { + description = "tifsstub"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-gp"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_gp"; + }; + }; + dm { description = "DM binary"; type = "firmware"; @@ -148,7 +178,8 @@ conf-0 { description = "k3-am625-beagleplay"; firmware = "atf"; - loadables = "tee", "dm", "spl"; + loadables = "tee", "dm", "spl", + "tifsstub-gp"; fdt = "fdt-0"; }; }; base-commit: 16324b43db3f2b4fbbc3b701893fcfc4104f33fb -- 2.34.1

3 5

mkimage alignment of initrd with -T multi
by Chris Packham 21 Jun '24

21 Jun '24

Hi U-Boot, I've been given a MIPS reference board with a fairly old vendor U-Boot on it. It does seem to support the Mutli-File Image format but I'm running into an issue where the kernel expects the initrd on a page boundary. I'm using a command like the following to produce and image cat board.dtb >> vmlinux.bin gzip vmlinux.bin >vmlinux.gz mkimage -C gzip -A mips -O linux -T multi -a 0x80100000 -e 0x80100000 -d vmlinux.gz:initrd.sqsh myboard.img I can mess about with padding vmlinux.gz after the gzip step but the process is a bit fragile and involves me guessing at some magic numbers that I think might be sizes of certain headers. Is there any way to convince mkimage to make sure the initrd is on an appropriately aligned boundary so I don't have to guess. Thanks, Chris

2 1

[PATCH] board: gateworks: venice: Simplify Ethernet initialization
by Tim Harvey 21 Jun '24

21 Jun '24

With DM enabled, there is no need for board code to initialize the Ethernet interfaces. Specifically board_interface_eth_init will handle the configuration of GPR1. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- board/gateworks/venice/venice.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/board/gateworks/venice/venice.c b/board/gateworks/venice/venice.c index 3080ff20cb02..d4c22121497b 100644 --- a/board/gateworks/venice/venice.c +++ b/board/gateworks/venice/venice.c @@ -45,22 +45,6 @@ int board_fit_config_name_match(const char *path) return -1; } -static int __maybe_unused setup_fec(void) -{ - struct iomuxc_gpr_base_regs *gpr = - (struct iomuxc_gpr_base_regs *)IOMUXC_GPR_BASE_ADDR; - -#ifndef CONFIG_IMX8MP - /* Use 125M anatop REF_CLK1 for ENET1, not from external */ - clrsetbits_le32(&gpr->gpr[1], 0x2000, 0); -#else - /* Enable RGMII TX clk output */ - setbits_le32(&gpr->gpr[1], BIT(22)); -#endif - - return 0; -} - #if (IS_ENABLED(CONFIG_NET)) int board_phy_config(struct phy_device *phydev) { @@ -91,9 +75,6 @@ int board_init(void) { venice_eeprom_init(1); - if (IS_ENABLED(CONFIG_FEC_MXC)) - setup_fec(); - return 0; } -- 2.25.1

1 0

[PATCH 0/4] boot: fix crash in bootflow menu with EFI BOOTMGR support + typos
by Quentin Schulz 20 Jun '24

20 Jun '24

bootflow menu currently crashes U-Boot with a NULL pointer dereference because bootflow->dev is NULL for global bootmeths (such as EFI BOOTMGR). Therefore, let's check if the bootflow is associated with a global bootmeth before trying to make it part of the menu. While this makes U-Boot not crash anymore, bootflow menu doesn't work for me (I have never had a happy path with it, but I haven't actually tried it before today :) ) and this was basically just implemented following Simon's suggestion sent over IRC. No clue if this is enough or just a quick band-aid patch. This also fixes typos in multiple places. Signed-off-by: Quentin Schulz <quentin.schulz(a)cherry.de> --- Quentin Schulz (4): cmd: fix typo in CMD_BOOTMETH help text boot: fix typos in help text of Kconfig configs doc: bootstd: fix typos boot: bootflow_menu: fix crash for EFI BOOTMGR global bootmeth boot/Kconfig | 22 +++++++++++----------- boot/bootflow_menu.c | 7 +++++++ cmd/Kconfig | 2 +- doc/develop/bootstd.rst | 50 ++++++++++++++++++++++++------------------------- include/bootflow.h | 3 ++- 5 files changed, 46 insertions(+), 38 deletions(-) --- base-commit: 1ebd659cf020843fd8e8ef90d85a66941cbab6ec change-id: 20240612-bootflow-efi-crash-c52449ef643e Best regards, -- Quentin Schulz <quentin.schulz(a)cherry.de>

3 9

[PATCH 0/3] lib: smbios: Extend driver with using sysinfo driver
by Michal Simek 20 Jun '24

20 Jun '24

Hi, currently only DT way is supported and it is added directly to lib/smbios.c but I think DT and env is only one way how information can be found that's why this series is improving handling with using sysinfo driver which can be platform specific. At the end of day DT should be taken from smbios.c and put to sysinfo DT driver instead of implementing it directly in this generic file. Thanks, Michal Michal Simek (3): xilinx: Enable SMBIOS command lib: smbios: Let detect the system via sysinfo lib: smbios: Detect system properties via SYSINFO IDs configs/xilinx_versal_net_virt_defconfig | 1 + configs/xilinx_versal_virt_defconfig | 1 + configs/xilinx_zynqmp_kria_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 1 + include/sysinfo.h | 9 +++++ lib/smbios.c | 42 +++++++++++++++++++----- 6 files changed, 46 insertions(+), 9 deletions(-) -- 2.44.0

5 12

[PATCH] efi_loader: adjust config options for capsule updates
by Ilias Apalodimas 20 Jun '24

20 Jun '24

EFI_IGNORE_OSINDICATIONS is used to ignore OsIndications if setvariable at runtime is not supported and allow the platform to perform capsule updates on disk. With the recent changes boards can conditionally enable setvariable at runtime using EFI_RT_VOLATILE_STORE. So let's make the options depend on each other and clarify their functionality. When EFI_RT_VOLATILE_STORE, setvariable at runtime is supported and EFI_IGNORE_OSINDICATIONS, which also breaks the EFI spec, is not needed anymore. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 430bb7f0f7dc..c84064de1366 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -220,6 +220,8 @@ config EFI_CAPSULE_ON_DISK config EFI_IGNORE_OSINDICATIONS bool "Ignore OsIndications for CapsuleUpdate on-disk" depends on EFI_CAPSULE_ON_DISK + depends on !EFI_RT_VOLATILE_STORE + default y help There are boards where U-Boot does not support SetVariable at runtime. Select this option if you want to use the capsule-on-disk feature -- 2.45.2

3 5

obscure microsd detection issue between U-Boot and kernel
by Tim Harvey 20 Jun '24

20 Jun '24

Greetings, I'm seeing an issue on an imx8mm board (imx8mm-venice-gw73xx) where for a specific set of microsd cards if I have accessed the microsd in U-Boot with UHS/1.8V the kernel will not recognize that microsd when scanning. The issue does not occur with all microsd cards but seems to appear with a large sample size of a specific card/model (Kingston SDC32 32GB SDR104 card). I do not see a signal integrity issue on the scope. Instrumenting the kernel the issue is that the host reports a CRC error as soon as the first mmc_send_if_cond call which occurs in mmc_rescan_try_freq. I can avoid the issue by either not accessing the microsd in U-Boot or by disabling UHS/1.8V mode in U-Boot therefore what I think is happening is that U-Boot leaves the card in UHS/1.8V signalling mode and when the kernel scans it sets the voltage back to 3.3V standard/default and default timings then issues its clock cycles to 'reset' the card and the card does not recognize the reset. I'm wondering if this is because the reset is done via clock cycles after the kernel has set the I/O voltage back to 3.3V when perhaps the card is still in 1.8V mode (although I don't see how that would cause an issue)? Is there some sort of MMC 'reset' I can/should do in U-Boot before booting the kernel? Has anyone encountered anything like this before? Best Regards, Tim

3 6

[PATCH v3 0/9] misc: introduce STATUS LED activity function
by Christian Marangi 20 Jun '24

20 Jun '24

This series expand the STATUS LED framework with a new color and a big new feature. One thing that many device need is a way to communicate to the user that the device is actually doing something. This is especially useful for recovery steps where an user (for example) insert an USB drive, keep a button pressed and the device autorecover. There is currently no way to signal the user externally that the bootloader is processing/recoverying aside from setting a LED on. A solid LED on is not enough and won't actually signal any kind of progress. Solution is the good old blinking LED but uboot doesn't suggest (and support) interrupts and almost all the LED are usually GPIO LED that doesn't support HW blink. To fix this and handle the problem of device not supporting HW blink, expand the STATUS LED framework with new API. We introduce a new config LED_STATUS_ACTIVITY, that similar to the RED, GREEN and others, takes the LED ID set in the LED_STATUS config and is used as the global LED for activity operations. We add status_led_activity_start/stop() used to turn the activity LED on and register a cyclic to make it blink. LED will continue to blink until _stop() is called. Function that will start some kind of action will first call _start() and then at the end will call stop(). If (on the broken implementation) a _start() is called before calling a _stop(), the Cyclic is first unregister and is registered again. Support for this is initially added to the tftp, mtd and ubi command. This also contains a big fixup for the gpio_led driver that currently deviates from the Documentation and make the coloured status led feature unusable. Changes v3: - Add log on Status LED error conditions Changes v2: - Add Documentation conversion - Rework to Cyclic and simplify implementation Christian Marangi (9): misc: gpio_led: fix broken coloured LED status functions led: status_led: add support for white LED colour led: status_led: add function to toggle a status LED led: status_led: add warning when an invalid Status LED ID is used led: status_led: add new activity LED config and functions tftp: implement support for LED status activity mtd: implement support for LED status activity ubi: implement support for LED status activity doc: convert README.LED to .rst documentation cmd/legacy_led.c | 6 + cmd/mtd.c | 19 ++++ cmd/ubi.c | 15 ++- common/board_f.c | 2 + doc/README.LED | 77 ------------- doc/api/index.rst | 1 + doc/api/status_led.rst | 35 ++++++ drivers/led/Kconfig | 30 +++++ drivers/misc/gpio_led.c | 41 +++++-- drivers/misc/status_led.c | 75 ++++++++++++- include/status_led.h | 231 +++++++++++++++++++++++++++++++++++++- net/tftp.c | 7 ++ 12 files changed, 440 insertions(+), 99 deletions(-) delete mode 100644 doc/README.LED create mode 100644 doc/api/status_led.rst -- 2.43.0

3 12

[PATCH v4 0/9] misc: introduce STATUS LED activity function
by Christian Marangi 20 Jun '24

20 Jun '24

This series expand the STATUS LED framework with a new color and a big new feature. One thing that many device need is a way to communicate to the user that the device is actually doing something. This is especially useful for recovery steps where an user (for example) insert an USB drive, keep a button pressed and the device autorecover. There is currently no way to signal the user externally that the bootloader is processing/recoverying aside from setting a LED on. A solid LED on is not enough and won't actually signal any kind of progress. Solution is the good old blinking LED but uboot doesn't suggest (and support) interrupts and almost all the LED are usually GPIO LED that doesn't support HW blink. To fix this and handle the problem of device not supporting HW blink, expand the STATUS LED framework with new API. We introduce a new config LED_STATUS_ACTIVITY, that similar to the RED, GREEN and others, takes the LED ID set in the LED_STATUS config and is used as the global LED for activity operations. We add status_led_activity_start/stop() used to turn the activity LED on and register a cyclic to make it blink. LED will continue to blink until _stop() is called. Function that will start some kind of action will first call _start() and then at the end will call stop(). If (on the broken implementation) a _start() is called before calling a _stop(), the Cyclic is first unregister and is registered again. Support for this is initially added to the tftp, mtd and ubi command. This also contains a big fixup for the gpio_led driver that currently deviates from the Documentation and make the coloured status led feature unusable. (world tested with the azure pipeline) Changes v4: - Rebase on top of next - Rework for cyclic changes on next - Fix compilation error - Fix compilation warning due to missing header Changes v3: - Add log on Status LED error conditions Changes v2: - Add Documentation conversion - Rework to Cyclic and simplify implementation Christian Marangi (9): misc: gpio_led: fix broken coloured LED status functions led: status_led: add support for white LED colour led: status_led: add function to toggle a status LED led: status_led: add warning when an invalid Status LED ID is used led: status_led: add new activity LED config and functions tftp: implement support for LED status activity mtd: implement support for LED status activity ubi: implement support for LED status activity doc: convert README.LED to .rst documentation cmd/legacy_led.c | 6 + cmd/mtd.c | 19 ++++ cmd/ubi.c | 15 ++- common/board_f.c | 2 + doc/README.LED | 77 ------------- doc/api/index.rst | 1 + doc/api/status_led.rst | 35 ++++++ drivers/led/Kconfig | 30 +++++ drivers/misc/gpio_led.c | 41 +++++-- drivers/misc/status_led.c | 75 ++++++++++++- include/status_led.h | 231 +++++++++++++++++++++++++++++++++++++- net/tftp.c | 7 ++ 12 files changed, 440 insertions(+), 99 deletions(-) delete mode 100644 doc/README.LED create mode 100644 doc/api/status_led.rst -- 2.43.0

4 16

[PATCH v5 1/2] arm: mediatek: add mt8195 SOC support
by Macpaul Lin 20 Jun '24

20 Jun '24

From: Fabien Parent <fparent(a)baylibre.com> The MediaTek MT8195 is a ARM64-based SoC with a quad-core Cortex-A73 and a quad-core Cortex-A53. It is including UART, SPI, USB3.0 device and hosts, SD and MMC cards, UFS, PWM, I2C, I2S, S/PDIF, and several LPDDR3 and LPDDR4 options. Signed-off-by: Fabien Parent <fparent(a)baylibre.com> Signed-off-by: Macpaul Lin <macpaul.lin(a)mediatek.com> --- MAINTAINERS | 2 + arch/arm/dts/mt8195.dtsi | 370 +++++++++++++++++++++++++ arch/arm/mach-mediatek/Kconfig | 13 +- arch/arm/mach-mediatek/Makefile | 1 + arch/arm/mach-mediatek/mt8195/Kconfig | 13 + arch/arm/mach-mediatek/mt8195/Makefile | 3 + arch/arm/mach-mediatek/mt8195/init.c | 97 +++++++ 7 files changed, 498 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/mt8195.dtsi create mode 100644 arch/arm/mach-mediatek/mt8195/Kconfig create mode 100644 arch/arm/mach-mediatek/mt8195/Makefile create mode 100644 arch/arm/mach-mediatek/mt8195/init.c Changes for v2: - Correct node name to t-phy for u3phy0. - Add platform compatible string "mediatek,mt8195-tphy" to all usb phy nodes. - remove clock nodes that software cannot controlled in phy nodes. - Test and add back "mac" for HOST only xhci nodes. Changes for v3: - Revise device node name from "xhciX: xhciX@" to "xhciX: xhci@". Changes for v4: - No change. Changes for v5: - Fix Copyright year to 2023. - Fix memory map in dram_init() to support 8GB onboard memory. - Add '#if !IS_ENABLED(CONFIG_SYSRESET)' with reset_cpu(). - Correct reset_cpu() function prototype. - rebase patchset to v2023-10.rc1 - Add missing arch/arm/mach-mediatek/mt8195/Kconfig. diff --git a/MAINTAINERS b/MAINTAINERS index 47581cf6fb..4d0f017e7e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -369,8 +369,10 @@ ARM MEDIATEK M: Ryder Lee <ryder.lee(a)mediatek.com> M: Weijie Gao <weijie.gao(a)mediatek.com> M: Chunfeng Yun <chunfeng.yun(a)mediatek.com> +M: Macpaul Lin <macpaul.lin(a)mediatek.com> R: GSS_MTK_Uboot_upstream <GSS_MTK_Uboot_upstream(a)mediatek.com> S: Maintained +F: arch/arm/dts/mt8195.dtsi F: arch/arm/mach-mediatek/ F: arch/arm/include/asm/arch-mediatek/ F: board/mediatek/ diff --git a/arch/arm/dts/mt8195.dtsi b/arch/arm/dts/mt8195.dtsi new file mode 100644 index 0000000000..14cb28d008 --- /dev/null +++ b/arch/arm/dts/mt8195.dtsi @@ -0,0 +1,370 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* + * Copyright (C) 2023 MediaTek Inc. + * Copyright (C) 2023 BayLibre, SAS + * Author: Ben Ho <ben.ho(a)mediatek.com> + * Erin Lo <erin.lo(a)mediatek.com> + * Fabien Parent <fparent(a)baylibre.com> + * Macpaul Lin <macpaul.lin(a)mediatek.com> + */ + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/phy/phy.h> + +/ { + compatible = "mediatek,mt8195"; + interrupt-parent = <&sysirq>; + #address-cells = <2>; + #size-cells = <2>; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu-map { + cluster0 { + core0 { + cpu = <&cpu0>; + }; + core1 { + cpu = <&cpu1>; + }; + core2 { + cpu = <&cpu2>; + }; + core3 { + cpu = <&cpu3>; + }; + }; + + cluster1 { + core0 { + cpu = <&cpu4>; + }; + core1 { + cpu = <&cpu5>; + }; + core2 { + cpu = <&cpu6>; + }; + core3 { + cpu = <&cpu7>; + }; + }; + }; + + cpu0: cpu@0 { + device_type = "cpu"; + compatible = "arm,cortex-a53"; + reg = <0x000>; + enable-method = "psci"; + capacity-dmips-mhz = <741>; + }; + + cpu1: cpu@1 { + device_type = "cpu"; + compatible = "arm,cortex-a53"; + reg = <0x001>; + enable-method = "psci"; + capacity-dmips-mhz = <741>; + }; + + cpu2: cpu@2 { + device_type = "cpu"; + compatible = "arm,cortex-a53"; + reg = <0x002>; + enable-method = "psci"; + capacity-dmips-mhz = <741>; + }; + + cpu3: cpu@3 { + device_type = "cpu"; + compatible = "arm,cortex-a53"; + reg = <0x003>; + enable-method = "psci"; + capacity-dmips-mhz = <741>; + }; + + cpu4: cpu@100 { + device_type = "cpu"; + compatible = "arm,cortex-a73"; + reg = <0x100>; + enable-method = "psci"; + capacity-dmips-mhz = <1024>; + }; + + cpu5: cpu@101 { + device_type = "cpu"; + compatible = "arm,cortex-a73"; + reg = <0x101>; + enable-method = "psci"; + capacity-dmips-mhz = <1024>; + }; + + cpu6: cpu@102 { + device_type = "cpu"; + compatible = "arm,cortex-a73"; + reg = <0x102>; + enable-method = "psci"; + capacity-dmips-mhz = <1024>; + }; + + cpu7: cpu@103 { + device_type = "cpu"; + compatible = "arm,cortex-a73"; + reg = <0x103>; + enable-method = "psci"; + capacity-dmips-mhz = <1024>; + }; + }; + + clk26m: oscillator { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <26000000>; + clock-output-names = "clk26m"; + }; + + mmc_source_clk: mmc-source-clk{ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <400000000>; + clock-output-names = "mmc_source_clk"; + }; + + soc { + #address-cells = <2>; + #size-cells = <2>; + compatible = "simple-bus"; + ranges; + + watchdog: watchdog@10007000 { + compatible = "mediatek,mt8195-wdt", + "mediatek,wdt"; + reg = <0 0x10007000 0 0x100>; + status = "disabled"; + }; + + gic: interrupt-controller@c000000 { + compatible = "arm,gic-v3"; + #interrupt-cells = <4>; + interrupt-parent = <&gic>; + interrupt-controller; + reg = <0 0x0c000000 0 0x40000>, /* GICD */ + <0 0x0c100000 0 0x200000>, /* GICR */ + <0 0x0c400000 0 0x2000>, /* GICC */ + <0 0x0c410000 0 0x1000>, /* GICH */ + <0 0x0c420000 0 0x2000>; /* GICV */ + + interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH 0>; + ppi-partitions { + ppi_cluster0: interrupt-partition-0 { + affinity = <&cpu0 &cpu1 &cpu2 &cpu3>; + }; + ppi_cluster1: interrupt-partition-1 { + affinity = <&cpu4 &cpu5 &cpu6 &cpu7>; + }; + }; + }; + + sysirq: interrupt-controller@c530a80 { + compatible = "mediatek,mt8195-sysirq", + "mediatek,mt6577-sysirq"; + interrupt-controller; + #interrupt-cells = <3>; + interrupt-parent = <&gic>; + reg = <0 0x0c530a80 0 0x50>; + }; + + topckgen: syscon@10000000 { + compatible = "mediatek,mt8195-topckgen", "syscon"; + reg = <0 0x10000000 0 0x1000>; + #clock-cells = <1>; + }; + + infracfg: syscon@10001000 { + compatible = "mediatek,mt8195-infracfg", "syscon"; + reg = <0 0x10001000 0 0x1000>; + #clock-cells = <1>; + }; + + apmixedsys: syscon@1000c000 { + compatible = "mediatek,mt8195-apmixedsys", "syscon"; + reg = <0 0x1000c000 0 0x1000>; + #clock-cells = <1>; + }; + + uart0: serial@11001100 { + compatible = "mediatek,mt8195-uart", + "mediatek,hsuart"; + reg = <0 0x11001100 0 0x1000>; + interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_LOW>; + clock-frequency = <26000000>; + clocks = <&clk26m>, <&clk26m>; + clock-names = "baud", "bus"; + status = "disabled"; + }; + + mmc0: mmc@11230000 { + compatible = "mediatek,mt8195-mmc", + "mediatek,mt8183-mmc"; + reg = <0 0x11230000 0 0x1000>, + <0 0x11f50000 0 0x1000>; + interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_LOW>; + clocks = <&mmc_source_clk>, + <&clk26m>, + <&clk26m>; + clock-names = "source", "hclk", "source_cg"; + status = "disabled"; + }; + + u3phy0: t-phy@11f40000 { + compatible = "mediatek,mt8195-tphy", "mediatek,generic-tphy-v2"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0x11e40000 0xe00>; + status = "okay"; + + u2port0: usb-phy@0 { + reg = <0 0x700>; + #phy-cells = <1>; + status = "okay"; + }; + + u3port0: usb-phy@700 { + reg = <0x700 0x700>; + #phy-cells = <1>; + status = "okay"; + }; + }; + + usb: usb@11200000 { + compatible ="mediatek,mt8195-mtu3", "mediatek,mtu3"; + reg = <0 0x11203e00 0 0x0100>; + reg-names = "ippc"; + phys = <&u2port0 PHY_TYPE_USB2>; + clocks = <&clk26m>, + <&clk26m>, + <&clk26m>; + clock-names = "sys_ck", "ref_ck", "mcu_ck"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + status = "disabled"; + + ssusb: ssusb@11200000 { + compatible = "mediatek,ssusb"; + reg = <0 0x11200000 0 0x3e00>; + reg-names = "mac"; + interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_LOW>; + status = "disabled"; + }; + + xhci0: xhci@11200000 { + compatible = "mediatek,mtk-xhci"; + reg = <0 0x11200000 0 0x1000>; + reg-names = "mac"; + interrupts = <GIC_SPI 129 IRQ_TYPE_LEVEL_LOW>; + clocks = <&clk26m>, + <&clk26m>, + <&clk26m>, + <&clk26m>; + clock-names = "sys_ck", "xhci_ck", "ref_ck", "mcu_ck"; + status = "disabled"; + }; + }; + + u3phy1: t-phy@11e30000 { + compatible = "mediatek,mt8195-tphy", "mediatek,generic-tphy-v2"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0x11e30000 0xe00>; + status = "disabled"; + + u2port1: usb-phy@0 { + reg = <0x0 0x700>; + #phy-cells = <1>; + }; + + u3port1: usb-phy@700 { + reg = <0x700 0x700>; + #phy-cells = <1>; + }; + }; + + xhci1: xhci@11290000 { + compatible = "mediatek,mt8195-xhci", + "mediatek,mtk-xhci"; + reg = <0 0x11290000 0 0x1000>, + <0 0x11293e00 0 0x0100>; + reg-names = "mac", "ippc"; + interrupts = <GIC_SPI 530 IRQ_TYPE_LEVEL_HIGH>; + phys = <&u2port1 PHY_TYPE_USB2>; + clocks = <&clk26m>, + <&clk26m>, + <&clk26m>, + <&clk26m>; + clock-names = "sys_ck", "xhci_ck", "ref_ck", "mcu_ck"; + status = "disabled"; + }; + + u3phy2: t-phy@11c40000 { + compatible = "mediatek,mt8195-tphy", "mediatek,generic-tphy-v2"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0x11c40000 0x700>; + status = "disabled"; + + u2port2: usb-phy@0 { + reg = <0x0 0x700>; + #phy-cells = <1>; + }; + }; + + xhci2: xhci@112a0000 { + compatible = "mediatek,mt8195-xhci", + "mediatek,mtk-xhci"; + reg = <0 0x112a0000 0 0x1000>, + <0 0x112a3e00 0 0x0100>; + reg-names = "mac", "ippc"; + interrupts = <GIC_SPI 533 IRQ_TYPE_LEVEL_HIGH>; + phys = <&u2port2 PHY_TYPE_USB2>; + clocks = <&clk26m>, + <&clk26m>, + <&clk26m>; + clock-names = "sys_ck", "xhci_ck", "ref_ck"; + status = "disabled"; + }; + + u3phy3: t-phy@11c50000 { + compatible = "mediatek,mt8195-tphy", "mediatek,generic-tphy-v2"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0x11c50000 0x700>; + status = "okay"; + + u2port3: usb-phy@0 { + reg = <0x0 0x700>; + #phy-cells = <1>; + }; + }; + + xhci3: xhci@112b0000 { + compatible = "mediatek,mt8195-xhci", + "mediatek,mtk-xhci"; + reg = <0 0x112b0000 0 0x1000>, + <0 0x112b3e00 0 0x0100>; + reg-names = "mac", "ippc"; + interrupts = <GIC_SPI 536 IRQ_TYPE_LEVEL_HIGH>; + phys = <&u2port3 PHY_TYPE_USB2>; + clocks = <&clk26m>, + <&clk26m>, + <&clk26m>; + clock-names = "sys_ck", "xhci_ck", "ref_ck"; + usb2-lpm-disable; + status = "disabled"; + }; + }; +}; diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig index 04aa2fd97f..3a2af1cdee 100644 --- a/arch/arm/mach-mediatek/Kconfig +++ b/arch/arm/mach-mediatek/Kconfig @@ -67,6 +67,15 @@ config TARGET_MT8183 SD and MMC cards, UFS, PWM, I2C, I2S, S/PDIF, and several LPDDR3 and LPDDR4 options. +config TARGET_MT8195 + bool "MediaTek MT8195 SoC" + select ARM64 + help + The MediaTek MT8195 is a ARM64-based SoC with a quad-core Cortex-A73 and + a quad-core Cortex-A53. It is including UART, SPI, USB3.0 device and hosts, + SD and MMC cards, UFS, PWM, I2C, I2S, S/PDIF, and several LPDDR3 + and LPDDR4 options. + config TARGET_MT8512 bool "MediaTek MT8512 M1 Board" select ARM64 @@ -105,6 +114,7 @@ config SYS_BOARD default "mt7981" if TARGET_MT7981 default "mt7986" if TARGET_MT7986 default "mt8183" if TARGET_MT8183 + default "mt8195" if TARGET_MT8195 default "mt8512" if TARGET_MT8512 default "mt8516" if TARGET_MT8516 default "mt8518" if TARGET_MT8518 @@ -122,6 +132,7 @@ config SYS_CONFIG_NAME default "mt7981" if TARGET_MT7981 default "mt7986" if TARGET_MT7986 default "mt8183" if TARGET_MT8183 + default "mt8195" if TARGET_MT8195 default "mt8512" if TARGET_MT8512 default "mt8516" if TARGET_MT8516 default "mt8518" if TARGET_MT8518 @@ -134,7 +145,7 @@ config SYS_CONFIG_NAME config MTK_BROM_HEADER_INFO string default "media=nor" if TARGET_MT8518 || TARGET_MT8512 || TARGET_MT7629 || TARGET_MT7622 - default "media=emmc" if TARGET_MT8516 || TARGET_MT8365 || TARGET_MT8183 + default "media=emmc" if TARGET_MT8516 || TARGET_MT8365 || TARGET_MT8183 || TARGET_MT8195 default "media=snand;nandinfo=2k+64" if TARGET_MT7981 || TARGET_MT7986 default "lk=1" if TARGET_MT7623 diff --git a/arch/arm/mach-mediatek/Makefile b/arch/arm/mach-mediatek/Makefile index fc85293f71..fbbb5431d1 100644 --- a/arch/arm/mach-mediatek/Makefile +++ b/arch/arm/mach-mediatek/Makefile @@ -10,5 +10,6 @@ obj-$(CONFIG_TARGET_MT7629) += mt7629/ obj-$(CONFIG_TARGET_MT7981) += mt7981/ obj-$(CONFIG_TARGET_MT7986) += mt7986/ obj-$(CONFIG_TARGET_MT8183) += mt8183/ +obj-$(CONFIG_TARGET_MT8195) += mt8195/ obj-$(CONFIG_TARGET_MT8516) += mt8516/ obj-$(CONFIG_TARGET_MT8518) += mt8518/ diff --git a/arch/arm/mach-mediatek/mt8195/Kconfig b/arch/arm/mach-mediatek/mt8195/Kconfig new file mode 100644 index 0000000000..a34fa2cf2e --- /dev/null +++ b/arch/arm/mach-mediatek/mt8195/Kconfig @@ -0,0 +1,13 @@ +if TARGET_MT8195 + +config SYS_BOARD + default "mt8195" + +config SYS_CONFIG_NAME + default "mt8195" + +config MTK_BROM_HEADER_INFO + string + default "media=emmc" + +endif diff --git a/arch/arm/mach-mediatek/mt8195/Makefile b/arch/arm/mach-mediatek/mt8195/Makefile new file mode 100644 index 0000000000..886ab7e4eb --- /dev/null +++ b/arch/arm/mach-mediatek/mt8195/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-y += init.o diff --git a/arch/arm/mach-mediatek/mt8195/init.c b/arch/arm/mach-mediatek/mt8195/init.c new file mode 100644 index 0000000000..8d6b700e7e --- /dev/null +++ b/arch/arm/mach-mediatek/mt8195/init.c @@ -0,0 +1,97 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2023 MediaTek Inc. + * Copyright (C) 2023 BayLibre, SAS + * Author: Macpaul Lin <macpaul.lin(a)mediatek.com> + * Author: Fabien Parent <fparent(a)baylibre.com> + */ + +#include <clk.h> +#include <common.h> +#include <cpu_func.h> +#include <dm.h> +#include <fdtdec.h> +#include <ram.h> +#include <asm/arch/misc.h> +#include <asm/armv8/mmu.h> +#include <asm/sections.h> +#include <asm/system.h> +#include <dm/uclass.h> + +DECLARE_GLOBAL_DATA_PTR; + +int dram_init(void) +{ + int ret; + + ret = fdtdec_setup_memory_banksize(); + if (ret) + return ret; + + fdtdec_setup_mem_size_base(); + + /* + * Limit gd->ram_top not exceeding SZ_4G. + * Because some periphals like mmc requires DMA buffer + * allocaed below SZ_4G. + * + * Note: SZ_2M is for adjusting gd->relocaddr, + * the reserved memory for u-boot itself. + */ + if (gd->ram_base + gd->ram_size >= SZ_4G) + gd->mon_len = SZ_4G + gd->ram_base + SZ_2M; + + return 0; +} + +int dram_init_banksize(void) +{ + gd->bd->bi_dram[0].start = gd->ram_base; + gd->bd->bi_dram[0].size = gd->ram_size; + + return 0; +} + +int mtk_pll_early_init(void) +{ + return 0; +} + +int mtk_soc_early_init(void) +{ + return 0; +} + +#if !IS_ENABLED(CONFIG_SYSRESET) +void reset_cpu(void) +{ + psci_system_reset(); +} +#endif + +int print_cpuinfo(void) +{ + printf("CPU: MediaTek MT8195\n"); + return 0; +} + +static struct mm_region mt8195_mem_map[] = { + { + /* DDR */ + .virt = 0x40000000UL, + .phys = 0x40000000UL, + .size = 0x200000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE, + }, { + .virt = 0x00000000UL, + .phys = 0x00000000UL, + .size = 0x20000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + 0, + } +}; + +struct mm_region *mem_map = mt8195_mem_map; -- 2.18.0

7 8

[PATCH v2 0/2] Enable ICSSG Driver for AM64x
by MD Danish Anwar 20 Jun '24

20 Jun '24

This series adds config changes and env changes to enable ICSSG Ethernet Driver on AM64x. Changes since v1: *) Dropped the patch [0] as this needs to be fixed in driver as suggested by Andrew Davis <afd(a)ti.com> *) Rebased on latest u-boot/next. v1 https://lore.kernel.org/all/20240522063652.3759497-1-danishanwar@ti.com/ [0] https://lore.kernel.org/all/cb53651f-a823-41b8-81e5-c3939bd33764@ti.com/ Thanks and Regards, MD Danish Anwar MD Danish Anwar (2): configs: am64x_evm_a53: Enable ICSSG Driver board: ti: am64x: Set storage_interface and fw_dev_part ENVs board/ti/am64x/am64x.env | 5 +++++ configs/am64x_evm_a53_defconfig | 5 +++++ 2 files changed, 10 insertions(+) base-commit: 9cf83a7da95b70a37d0d2aba79439dc8a2944fe3 -- 2.34.1

2 3

[PATCH 0/5] usb: meson: switch to set_mode callback and other cleanup
by Neil Armstrong 20 Jun '24

20 Jun '24

Switch to set_mode callback now it's available and in the same time make public functions static and drop useless mach-meson headers that are no more needed. Signed-off-by: Neil Armstrong <neil.armstrong(a)linaro.org> --- Neil Armstrong (5): phy: meson-gxl-usb2: add set_mode callback usb: dwc3: meson-gxl: switch to generic_phy_set_mode phy: meson-gxl-usb2: remove phy_meson_gxl_usb2_set_mode usb: dwc3: meson-gxl: drop usb-gx.h and make dwc3_meson_gxl_force_mode static usb: dwc3: meson-g12a: drop usb.h and make dwc3_meson_g12a_force_mode static arch/arm/include/asm/arch-meson/usb-gx.h | 17 ----------------- arch/arm/include/asm/arch-meson/usb.h | 12 ------------ drivers/phy/meson-gxl-usb2.c | 30 ++++++++++++++++++------------ drivers/usb/dwc3/dwc3-meson-g12a.c | 2 +- drivers/usb/dwc3/dwc3-meson-gxl.c | 18 ++++++++++-------- 5 files changed, 29 insertions(+), 50 deletions(-) --- base-commit: f1de28e67aa9b66bfca0fad3dc18446a6ec0b504 change-id: 20240618-u-boot-usb-gxl-phy-set-mode-c3991c5f1da2 Best regards, -- Neil Armstrong <neil.armstrong(a)linaro.org>

2 9

[PATCH v2] imx8mp-venice-gw74xx: default USB1 to host mode
by Tim Harvey 19 Jun '24

19 Jun '24

The GW74xx USB1 controller connects to a dual-role connector using a GPIO for role detection via the usb-connector Linux driver (usb-conn-gpio.c). This drive does not exist yet in U-Boot so for now we will just default USB1 to host mode. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- v2: provide missing commit message --- arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi b/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi index 240fbc1b568f..a90794d8108a 100644 --- a/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi @@ -243,3 +243,8 @@ &wdog1 { bootph-pre-ram; }; + +/* gpio-usb-con not supported yet in U-Boot so make this a host for now */ +&usb_dwc3_0 { + dr_mode = "host"; +}; -- 2.25.1

1 0

[PATCH] imx8mp-venice-gw74xx: fix USB host
by Tim Harvey 19 Jun '24

19 Jun '24

Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi b/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi index 240fbc1b568f..a90794d8108a 100644 --- a/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-venice-gw74xx-u-boot.dtsi @@ -243,3 +243,8 @@ &wdog1 { bootph-pre-ram; }; + +/* gpio-usb-con not supported yet in U-Boot so make this a host for now */ +&usb_dwc3_0 { + dr_mode = "host"; +}; -- 2.25.1

2 1

[PATCH] imx8m{m,p}_venice: add NVMe to boot devices
by Tim Harvey 19 Jun '24

19 Jun '24

Add nvme device 0 to available boot devices. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- include/configs/imx8mm_venice.h | 1 + include/configs/imx8mp_venice.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index 046d5685d04d..66816618b0cb 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -23,6 +23,7 @@ func(MMC, mmc, 2) \ func(USB, usb, 0) \ func(USB, usb, 1) \ + func(NVME, nvme, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> #define CFG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h index 47413ecd7fbf..81144300885f 100644 --- a/include/configs/imx8mp_venice.h +++ b/include/configs/imx8mp_venice.h @@ -17,6 +17,7 @@ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ func(USB, usb, 0) \ + func(NVME, nvme, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> #define CFG_EXTRA_ENV_SETTINGS \ -- 2.25.1

1 0

[PATCH] board: gateworks: venice: add print for GPY111 PHY name
by Tim Harvey 19 Jun '24

19 Jun '24

Due to supply chain issues Venice boards use either a DP83867 or a GPY111 RGMII PHY. We already print an identifier for the DP83867 so add one for the GPY111 to better identify what PHY is on a board: Example: Net: GPY111 eth0: ethernet@30be0000 [PRIME] Net: DP83867 eth0: ethernet@30be0000 [PRIME] Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- board/gateworks/venice/venice.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/board/gateworks/venice/venice.c b/board/gateworks/venice/venice.c index 5b105d7659e4..3080ff20cb02 100644 --- a/board/gateworks/venice/venice.c +++ b/board/gateworks/venice/venice.c @@ -75,6 +75,9 @@ int board_phy_config(struct phy_device *phydev) val |= 0xb << 8; /* LED2(Green;Link/Act): blink for TX/RX act */ phy_write(phydev, MDIO_DEVAD_NONE, 24, val); break; + case 0xd565a401: /* MaxLinear GPY111 */ + puts("GPY111 "); + break; } if (phydev->drv->config) -- 2.25.1

1 0

[PATCH] board: gateworks: venice: delay before reading GSC EEPROM
by Tim Harvey 19 Jun '24

19 Jun '24

Extensive testing has shown that at higher temperatures operating without a GSC backup battery, the GSC needs a small delay after releasing the I2C SDA/SCL pins before it is ready to handle I2C requests. Add a delay to avoid errors such as: wait_for_sr_state: Arbitration lost sr=93 cr=80 state=2020 i2c_init_transfer: failed for chip 0x20 retry=0 Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- board/gateworks/venice/spl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/board/gateworks/venice/spl.c b/board/gateworks/venice/spl.c index 9a22eeef36ba..ec3c394d24d8 100644 --- a/board/gateworks/venice/spl.c +++ b/board/gateworks/venice/spl.c @@ -303,6 +303,7 @@ void board_init_f(ulong dummy) mdelay(10); } pinctrl_select_state(bus, "default"); + mdelay(10); } } /* Wait indefiniately until the GSC probes */ -- 2.25.1

1 0

[PATCH] board: gateworks: venice: enable GSC supervisor for new board models
by Tim Harvey 19 Jun '24

19 Jun '24

The Gateworks System Controller (GSC) has a voltage supervisor which is disabled by default. On older boards we want to maintian this but on newer boards we wish to enable the voltage supervisor. The Gateworks System Controller (GSC) can disable the board primary power supply by driving a pin to a FET high. On older board models the leakage of the GSC may exceed the leakage of the FET causing this signal slowly rise when the GSC battery is low and the board is in a powered down state resulting in the board being kept in a disabled state. Newer boards have a hardware fix to avoid this leakage and thus should enable the voltage supervisor. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- board/gateworks/venice/spl.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/board/gateworks/venice/spl.c b/board/gateworks/venice/spl.c index b0a315ba9531..9a22eeef36ba 100644 --- a/board/gateworks/venice/spl.c +++ b/board/gateworks/venice/spl.c @@ -119,13 +119,29 @@ static int dm_i2c_clrsetbits(struct udevice *dev, uint reg, uint clr, uint set) return dm_i2c_write(dev, reg, &val, 1); } -static int power_init_board(void) +static int power_init_board(struct udevice *gsc) { const char *model = eeprom_get_model(); struct udevice *bus; struct udevice *dev; int ret; + /* Enable GSC voltage supervisor for new board models */ + if ((!strncmp(model, "GW7100", 6) && model[10] > 'D') || + (!strncmp(model, "GW7101", 6) && model[10] > 'D') || + (!strncmp(model, "GW7200", 6) && model[10] > 'E') || + (!strncmp(model, "GW7201", 6) && model[10] > 'E') || + (!strncmp(model, "GW7300", 6) && model[10] > 'E') || + (!strncmp(model, "GW7301", 6) && model[10] > 'E') || + (!strncmp(model, "GW740", 5) && model[7] > 'B')) { + u8 ver; + + if (!dm_i2c_read(gsc, 14, &ver, 1) && ver > 62) { + printf("GSC : enabling voltage supervisor\n"); + dm_i2c_clrsetbits(gsc, 25, 0, BIT(1)); + } + } + if ((!strncmp(model, "GW71", 4)) || (!strncmp(model, "GW72", 4)) || (!strncmp(model, "GW73", 4)) || @@ -298,7 +314,7 @@ void board_init_f(ulong dummy) dram_sz = venice_eeprom_init(0); /* PMIC */ - power_init_board(); + power_init_board(dev); /* DDR initialization */ spl_dram_init(dram_sz); -- 2.25.1

1 0

[PATCH v2 00/14] Add basic U-Boot Support for J722S-EVM
by Jayesh Choudhary 19 Jun '24

19 Jun '24

Hello there, This series add the U-Boot support for our new platform of K3-SOC family - J722S-EVM which is a superset of AM62P. It shares the same memory map and thus the nodes are being reused from AM62P includes instead of duplicating the definitions. Some highlights of J722S SoC (in addition to AM62P SoC features) are: - Two Cortex-R5F for Functional Safety or general-purpose usage and two C7x floating point vector DSP with Matrix Multiply Accelerator for deep learning. - Vision Processing Accelerator (VPAC) with image signal processor and Depth and Motion Processing Accelerator (DMPAC). - 7xUARTs, 3xSPI, 5xI2C, 2xUSB2, 2xCAN-FD, 3xMMC and SD, GPMC for NAND/FPGA connection, OSPI memory controller, 5xMcASP for audio, 4xCSI-RX for Camera, 1 PCIe Gen3 controller, USB3.0 eCAP/eQEP, ePWM, among other peripherals. TRM: <https://www.ti.com/lit/zip/sprujb3> Schematics: <https://www.ti.com/lit/zip/sprr495> Boot test log: <https://gist.github.com/Jayesh2000/0313e58fde377f877a9a8f1acc2579ef> v1 patch: <https://patchwork.ozlabs.org/project/uboot/list/?series=408713> Changelog v1->v2: - Fix space tab inconsistency in [3/14] - Break board_init_f into smaller logical functions as suggested by Neha[7] - Add DT fixup as suggested by Andrew[8] - Sync configs with savedefconfig to take care of redundant and invalid configs. - Pick up R-by for rest of the patches. RFC series that was posted before this: <https://lore.kernel.org/all/20240404090039.87458-1-j-choudhary@ti.com/> Changes from RFC series to this series: - Remove main_pktdma node and k3_sysreset node from k3-j722s-evm-u-boot.dtsi as suggested by Andrew[0] k3_sysreset will be taken care of in [1] which is not a real dependency for this series - Fix documentation according to comments here[2] - Pick up R-by for 2 patches from RFC series[3][4] - Pick the binman change for optional DM[5] - Move init code according to [6] [0]: https://lore.kernel.org/all/d738eaaf-6f13-4502-98a1-ef1bfe82d2ff@ti.com/ [1]: https://lore.kernel.org/all/20240402160908.508974-3-afd@ti.com/ [2]: https://lore.kernel.org/all/ac5780c5-f1ca-4138-a027-d3ed65911733@ti.com/ [3]: https://lore.kernel.org/all/20240404163641.6qmcierya6svcgfb@bryanbrattlof.c… [4]: https://lore.kernel.org/all/20240404163714.p2wonpenkiz44cnd@bryanbrattlof.c… [5]: https://lore.kernel.org/all/20240529074849.363281-1-n-francis@ti.com/ [6]: https://lore.kernel.org/all/20240510202124.794448-1-afd@ti.com/ [7]: https://patchwork.ozlabs.org/project/uboot/patch/20240529132448.459330-10-j… [8]: https://patchwork.ozlabs.org/project/uboot/patch/20240529132448.459330-10-j… Jayesh Choudhary (14): arm: mach-k3: Sort CONFIG_SOC* and K3_SOC_ID entries soc: ti: k3-socinfo: Fix SOC JTAG entry order soc: add info to identify the J722S SoC family clk: ti: clk-k3: use IS_ENABLED macro and fix the clock-data order power: domain: ti: Fix the order for platform data entries arm: mach-k3: r5: Makefile: Fix the order for entries arm: mach-k3: j722s: introduce clock and device files for wkup spl ram: k3-ddrss: Enable the am62ax's DDR controller for J722S arch: mach-k3: Introduce basic files to support J722S SoC family board: ti: Introduce basic board files for the J722S family firmware: ti_sci_static_data: Add static DMA channel arm: dts: Introduce J722S U-Boot dts files configs: introduce configs needed for the J722S doc: board: ti: Add J722S-EVM documentation arch/arm/dts/Makefile | 2 + arch/arm/dts/k3-j722s-binman.dtsi | 172 + arch/arm/dts/k3-j722s-ddr-lp4-50-3733.dtsi | 2795 +++++++++++++++++ arch/arm/dts/k3-j722s-evm-u-boot.dtsi | 18 + arch/arm/dts/k3-j722s-r5-evm.dts | 82 + arch/arm/mach-k3/Kconfig | 7 +- arch/arm/mach-k3/Makefile | 1 + arch/arm/mach-k3/include/mach/hardware.h | 43 +- .../arm/mach-k3/include/mach/j722s_hardware.h | 83 + arch/arm/mach-k3/include/mach/j722s_spl.h | 49 + arch/arm/mach-k3/include/mach/spl.h | 4 + arch/arm/mach-k3/j722s/Kconfig | 33 + arch/arm/mach-k3/j722s/Makefile | 7 + arch/arm/mach-k3/j722s/j722s_fdt.c | 16 + arch/arm/mach-k3/j722s/j722s_init.c | 287 ++ arch/arm/mach-k3/r5/Makefile | 7 +- arch/arm/mach-k3/r5/j722s/Makefile | 6 + arch/arm/mach-k3/r5/j722s/clk-data.c | 312 ++ arch/arm/mach-k3/r5/j722s/dev-data.c | 69 + board/ti/j722s/Kconfig | 26 + board/ti/j722s/MAINTAINERS | 9 + board/ti/j722s/Makefile | 7 + board/ti/j722s/board-cfg.yaml | 36 + board/ti/j722s/evm.c | 29 + board/ti/j722s/j722s.env | 15 + board/ti/j722s/pm-cfg.yaml | 12 + board/ti/j722s/rm-cfg.yaml | 1119 +++++++ board/ti/j722s/sec-cfg.yaml | 379 +++ board/ti/j722s/tifs-rm-cfg.yaml | 981 ++++++ configs/j722s_evm_a53_defconfig | 172 + configs/j722s_evm_r5_defconfig | 131 + doc/board/ti/j722s_evm.rst | 260 ++ doc/board/ti/k3.rst | 1 + drivers/clk/ti/clk-k3.c | 41 +- drivers/firmware/ti_sci_static_data.h | 2 +- drivers/power/domain/ti-power-domain.c | 36 +- drivers/ram/Kconfig | 2 +- drivers/soc/soc_ti_k3.c | 29 +- include/configs/j722s_evm.h | 14 + include/k3-clk.h | 1 + include/k3-dev.h | 1 + 41 files changed, 7227 insertions(+), 69 deletions(-) create mode 100644 arch/arm/dts/k3-j722s-binman.dtsi create mode 100644 arch/arm/dts/k3-j722s-ddr-lp4-50-3733.dtsi create mode 100644 arch/arm/dts/k3-j722s-evm-u-boot.dtsi create mode 100644 arch/arm/dts/k3-j722s-r5-evm.dts create mode 100644 arch/arm/mach-k3/include/mach/j722s_hardware.h create mode 100644 arch/arm/mach-k3/include/mach/j722s_spl.h create mode 100644 arch/arm/mach-k3/j722s/Kconfig create mode 100644 arch/arm/mach-k3/j722s/Makefile create mode 100644 arch/arm/mach-k3/j722s/j722s_fdt.c create mode 100644 arch/arm/mach-k3/j722s/j722s_init.c create mode 100644 arch/arm/mach-k3/r5/j722s/Makefile create mode 100644 arch/arm/mach-k3/r5/j722s/clk-data.c create mode 100644 arch/arm/mach-k3/r5/j722s/dev-data.c create mode 100644 board/ti/j722s/Kconfig create mode 100644 board/ti/j722s/MAINTAINERS create mode 100644 board/ti/j722s/Makefile create mode 100644 board/ti/j722s/board-cfg.yaml create mode 100644 board/ti/j722s/evm.c create mode 100644 board/ti/j722s/j722s.env create mode 100644 board/ti/j722s/pm-cfg.yaml create mode 100644 board/ti/j722s/rm-cfg.yaml create mode 100644 board/ti/j722s/sec-cfg.yaml create mode 100644 board/ti/j722s/tifs-rm-cfg.yaml create mode 100644 configs/j722s_evm_a53_defconfig create mode 100644 configs/j722s_evm_r5_defconfig create mode 100644 doc/board/ti/j722s_evm.rst create mode 100644 include/configs/j722s_evm.h -- 2.25.1

2 16

[PATCH] cmd: Make use of U_BOOT_LONGHELP when missing
by Tom Rini 19 Jun '24

19 Jun '24

After adding the U_BOOT_LONGHELP macro some new commands came in still that were not making use if it. Switch these cases over and in a few places add missing newlines as well. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/arm/mach-imx/cmd_dek.c | 4 ++-- arch/arm/mach-imx/cmd_mfgprot.c | 4 ++-- arch/arm/mach-imx/imx8/snvs_security_sc.c | 16 ++++++++-------- arch/arm/mach-stm32mp/cmd_stm32key.c | 4 ++-- board/freescale/common/cmd_esbc_validate.c | 4 ++-- board/kontron/sl28/cmds.c | 4 ++-- cmd/adc.c | 4 ++-- cmd/arm/exception.c | 5 ++--- cmd/arm/exception64.c | 5 ++--- cmd/blob.c | 4 ++-- cmd/riscv/exception.c | 5 ++--- cmd/scmi.c | 5 ++--- cmd/x86/exception.c | 5 ++--- 13 files changed, 32 insertions(+), 37 deletions(-) diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c index c7962ead2d54..56e1a8f8be76 100644 --- a/arch/arm/mach-imx/cmd_dek.c +++ b/arch/arm/mach-imx/cmd_dek.c @@ -395,10 +395,10 @@ static int do_dek_blob(struct cmd_tbl *cmdtp, int flag, int argc, } /***************************************************/ -static char dek_blob_help_text[] = +U_BOOT_LONGHELP(dek_blob, "src dst len - Encapsulate and create blob of data\n" " $len bits long at address $src and\n" - " store the result at address $dst.\n"; + " store the result at address $dst.\n"); U_BOOT_CMD( dek_blob, 4, 1, do_dek_blob, diff --git a/arch/arm/mach-imx/cmd_mfgprot.c b/arch/arm/mach-imx/cmd_mfgprot.c index 9925c9922687..9f37e611a1e7 100644 --- a/arch/arm/mach-imx/cmd_mfgprot.c +++ b/arch/arm/mach-imx/cmd_mfgprot.c @@ -134,12 +134,12 @@ free_m: } /***************************************************/ -static char mfgprot_help_text[] = +U_BOOT_LONGHELP(mfgprot, "Usage:\n" "Print the public key for Manufacturing Protection\n" "\tmfgprot pubk\n" "Generates a Manufacturing Protection signature\n" - "\tmfgprot sign <data_addr> <size>"; + "\tmfgprot sign <data_addr> <size>\n"); U_BOOT_CMD( mfgprot, 4, 1, do_mfgprot, diff --git a/arch/arm/mach-imx/imx8/snvs_security_sc.c b/arch/arm/mach-imx/imx8/snvs_security_sc.c index f13dfc155165..ed0ddba73b32 100644 --- a/arch/arm/mach-imx/imx8/snvs_security_sc.c +++ b/arch/arm/mach-imx/imx8/snvs_security_sc.c @@ -597,7 +597,7 @@ exit: } #endif /* CONFIG_IMX_SNVS_SEC_SC_AUTO */ -static char snvs_cfg_help_text[] = +U_BOOT_LONGHELP(snvs_cfg, "snvs_cfg\n" "\thp.lock\n" "\thp.secvio_ctl\n" @@ -618,7 +618,7 @@ static char snvs_cfg_help_text[] = "\tlp.act_tamper_routing_ctl1\n" "\tlp.act_tamper_routing_ctl2\n" "\n" - "ALL values should be in hexadecimal format"; + "ALL values should be in hexadecimal format\n"); #define NB_REGISTERS 18 static int do_snvs_cfg(struct cmd_tbl *cmdtp, int flag, int argc, @@ -662,7 +662,7 @@ U_BOOT_CMD(snvs_cfg, snvs_cfg_help_text ); -static char snvs_dgo_cfg_help_text[] = +U_BOOT_LONGHELP(snvs_dgo_cfg, "snvs_dgo_cfg\n" "\ttamper_offset_ctl\n" "\ttamper_pull_ctl\n" @@ -671,7 +671,7 @@ static char snvs_dgo_cfg_help_text[] = "\ttamper_misc_ctl\n" "\ttamper_core_volt_mon_ctl\n" "\n" - "ALL values should be in hexadecimal format"; + "ALL values should be in hexadecimal format\n"); static int do_snvs_dgo_cfg(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) @@ -702,12 +702,12 @@ U_BOOT_CMD(snvs_dgo_cfg, snvs_dgo_cfg_help_text ); -static char tamper_pin_cfg_help_text[] = +U_BOOT_LONGHELP(tamper_pin_cfg, "snvs_dgo_cfg\n" "\tpad\n" "\tvalue\n" "\n" - "ALL values should be in hexadecimal format"; + "ALL values should be in hexadecimal format\n"); static int do_tamper_pin_cfg(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) @@ -734,7 +734,7 @@ U_BOOT_CMD(tamper_pin_cfg, tamper_pin_cfg_help_text ); -static char snvs_clear_status_help_text[] = +U_BOOT_LONGHELP(snvs_clear_status, "snvs_clear_status\n" "\tHPSR\n" "\tHPSVSR\n" @@ -742,7 +742,7 @@ static char snvs_clear_status_help_text[] = "\tLPTDSR\n" "\n" "Write the status registers with the value provided," - " clearing the status"; + " clearing the status\n"); static int do_snvs_clear_status(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) diff --git a/arch/arm/mach-stm32mp/cmd_stm32key.c b/arch/arm/mach-stm32mp/cmd_stm32key.c index 0cb3c7a9fa44..040a70f581cb 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32key.c +++ b/arch/arm/mach-stm32mp/cmd_stm32key.c @@ -419,12 +419,12 @@ static int do_stm32key_close(struct cmd_tbl *cmdtp, int flag, int argc, char *co return CMD_RET_SUCCESS; } -static char stm32key_help_text[] = +U_BOOT_LONGHELP(stm32key, "list : list the supported key with description\n" "stm32key select [<key>] : Select the key identified by <key> or display the key used for read/fuse command\n" "stm32key read [<addr> | -a ] : Read the curent key at <addr> or current / all (-a) key in OTP\n" "stm32key fuse [-y] <addr> : Fuse the current key at addr in OTP\n" - "stm32key close [-y] : Close the device\n"; + "stm32key close [-y] : Close the device\n"); U_BOOT_CMD_WITH_SUBCMDS(stm32key, "Manage key on STM32", stm32key_help_text, U_BOOT_SUBCMD_MKENT(list, 1, 0, do_stm32key_list), diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/freescale/common/cmd_esbc_validate.c index d4192e5ab521..3344653ba2da 100644 --- a/board/freescale/common/cmd_esbc_validate.c +++ b/board/freescale/common/cmd_esbc_validate.c @@ -63,14 +63,14 @@ static int do_esbc_validate(struct cmd_tbl *cmdtp, int flag, int argc, } /***************************************************/ -static char esbc_validate_help_text[] = +U_BOOT_LONGHELP(esbc_validate, "esbc_validate hdr_addr <hash_val> - Validates signature using\n" " RSA verification\n" " $hdr_addr Address of header of the image\n" " to be validated.\n" " $hash_val -Optional\n" " It provides Hash of public/srk key to be\n" - " used to verify signature.\n"; + " used to verify signature.\n"); U_BOOT_CMD( esbc_validate, 3, 0, do_esbc_validate, diff --git a/board/kontron/sl28/cmds.c b/board/kontron/sl28/cmds.c index 7851361c48cc..07514778753f 100644 --- a/board/kontron/sl28/cmds.c +++ b/board/kontron/sl28/cmds.c @@ -172,8 +172,8 @@ out: return CMD_RET_FAILURE; } -static char sl28_help_text[] = - "nvm [<hex>] - display/set the 16 non-volatile bits\n"; +U_BOOT_LONGHELP(sl28, + "nvm [<hex>] - display/set the 16 non-volatile bits\n"); U_BOOT_CMD_WITH_SUBCMDS(sl28, "SMARC-sAL28 specific", sl28_help_text, U_BOOT_SUBCMD_MKENT(nvm, 2, 1, do_sl28_nvm)); diff --git a/cmd/adc.c b/cmd/adc.c index f87f9785a114..4d3b5b61f6f0 100644 --- a/cmd/adc.c +++ b/cmd/adc.c @@ -152,11 +152,11 @@ static int do_adc_scan(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_SUCCESS; } -static char adc_help_text[] = +U_BOOT_LONGHELP(adc, "list - list ADC devices\n" "adc info <name> - Get ADC device info\n" "adc single <name> <channel> [varname] - Get Single data of ADC device channel\n" - "adc scan <name> [channel mask] - Scan all [or masked] ADC channels"; + "adc scan <name> [channel mask] - Scan all [or masked] ADC channels\n"); U_BOOT_CMD_WITH_SUBCMDS(adc, "ADC sub-system", adc_help_text, U_BOOT_SUBCMD_MKENT(list, 1, 1, do_adc_list), diff --git a/cmd/arm/exception.c b/cmd/arm/exception.c index 98a9795b68c8..8857f1216049 100644 --- a/cmd/arm/exception.c +++ b/cmd/arm/exception.c @@ -49,12 +49,11 @@ static struct cmd_tbl cmd_sub[] = { "", ""), }; -static char exception_help_text[] = +U_BOOT_LONGHELP(exception, "<ex>\n" " The following exceptions are available:\n" " breakpoint - prefetch abort\n" " unaligned - data abort\n" - " undefined - undefined instruction\n" - ; + " undefined - undefined instruction\n"); #include <exception.h> diff --git a/cmd/arm/exception64.c b/cmd/arm/exception64.c index 73d6c20ccace..4c5b953168cb 100644 --- a/cmd/arm/exception64.c +++ b/cmd/arm/exception64.c @@ -77,12 +77,11 @@ static struct cmd_tbl cmd_sub[] = { "", ""), }; -static char exception_help_text[] = +U_BOOT_LONGHELP(exception, "<ex>\n" " The following exceptions are available:\n" " breakpoint - breakpoint instruction exception\n" " unaligned - unaligned LDAR data abort\n" - " undefined - undefined instruction exception\n" - ; + " undefined - undefined instruction exception\n"); #include <exception.h> diff --git a/cmd/blob.c b/cmd/blob.c index a3c1dc49224d..b1c72e3f4406 100644 --- a/cmd/blob.c +++ b/cmd/blob.c @@ -99,7 +99,7 @@ static int do_blob(struct cmd_tbl *cmdtp, int flag, int argc, } /***************************************************/ -static char blob_help_text[] = +U_BOOT_LONGHELP(blob, "enc src dst len km - Encapsulate and create blob of data\n" " $len bytes long at address $src and\n" " store the result at address $dst.\n" @@ -115,7 +115,7 @@ static char blob_help_text[] = " modifier is stored.\n" " The modifier is required for generation\n" " /use as key for cryptographic operation.\n" - " Key modifier should be 16 byte long.\n"; + " Key modifier should be 16 byte long.\n"); U_BOOT_CMD( blob, 6, 1, do_blob, diff --git a/cmd/riscv/exception.c b/cmd/riscv/exception.c index 14ad6c440a56..2b58b1c449c0 100644 --- a/cmd/riscv/exception.c +++ b/cmd/riscv/exception.c @@ -68,14 +68,13 @@ static struct cmd_tbl cmd_sub[] = { "", ""), }; -static char exception_help_text[] = +U_BOOT_LONGHELP(exception, "<ex>\n" " The following exceptions are available:\n" " compressed - compressed instruction\n" " ebreak - breakpoint\n" " ialign16 - 16 bit aligned instruction\n" " undefined - illegal instruction\n" - " unaligned - load address misaligned\n" - ; + " unaligned - load address misaligned\n"); #include <exception.h> diff --git a/cmd/scmi.c b/cmd/scmi.c index 664062c4eff5..cfbca63e1644 100644 --- a/cmd/scmi.c +++ b/cmd/scmi.c @@ -369,7 +369,7 @@ static int do_scmi(struct cmd_tbl *cmdtp, int flag, return cp->cmd(cmdtp, flag, argc, argv); } -static char scmi_help_text[] = +U_BOOT_LONGHELP(scmi, " - SCMI utility\n" " info - get the info of SCMI services\n" " perm_dev <agent-id in hex> <device-id in hex> <flags in hex>\n" @@ -377,8 +377,7 @@ static char scmi_help_text[] = " perm_proto <agent-id in hex> <device-id in hex> <protocol-id in hex> <flags in hex>\n" " - set protocol permission to device\n" " reset <agent-id in hex> <flags in hex>\n" - " - reset platform resource settings\n" - ""; + " - reset platform resource settings\n"); U_BOOT_CMD(scmi, CONFIG_SYS_MAXARGS, 0, do_scmi, "SCMI utility", scmi_help_text); diff --git a/cmd/x86/exception.c b/cmd/x86/exception.c index 14b6bd6f4932..02735494a3c6 100644 --- a/cmd/x86/exception.c +++ b/cmd/x86/exception.c @@ -19,10 +19,9 @@ static struct cmd_tbl cmd_sub[] = { "", ""), }; -static char exception_help_text[] = +U_BOOT_LONGHELP(exception, "<ex>\n" " The following exceptions are available:\n" - " undefined - undefined instruction\n" - ; + " undefined - undefined instruction\n"); #include <exception.h> -- 2.34.1

2 3

[PATCH] rockchip: puma-rk3399: increase Ethernet PHY timeout to 30s
by Quentin Schulz 19 Jun '24

19 Jun '24

From: Quentin Schulz <quentin.schulz(a)cherry.de> On Puma v2.1 with a KSZ9031, the Ethernet PHY often doesn't detect the link in the 4-second default timeout. After some boot-loop test for about a thousand boots, 70% were below 10s, 90% below 15s and 100% below 30s. Let's play it safe and make it 30s so that hopefully all links that should be detected are. Signed-off-by: Quentin Schulz <quentin.schulz(a)cherry.de> --- include/configs/puma_rk3399.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h index 969acc89b93..2056a5eb2e4 100644 --- a/include/configs/puma_rk3399.h +++ b/include/configs/puma_rk3399.h @@ -6,6 +6,9 @@ #ifndef __PUMA_RK3399_H #define __PUMA_RK3399_H +/* Highly variable timeout in getting a link on Puma v2.1 with KSZ9031 */ +#define PHY_ANEG_TIMEOUT 30000 + #include <configs/rk3399_common.h> #endif --- base-commit: fe2ce09a0753634543c32cafe85eb87a625f76ca change-id: 20240619-puma-eth-timeout-41be9c243ed7 Best regards, -- Quentin Schulz <quentin.schulz(a)cherry.de>

3 2

[PATCH 00/20] New CI image and fixes
by Jiaxun Yang 19 Jun '24

19 Jun '24

Hi all, This series build a new CI image based on Ubuntu focal with LoongArch64 support, fixed various python scripts for python 3.12, fixed various problems popped up when testing againt latest software. This change must be combined with test hook changes at [1]. Last two commits are for demonstration purpose and not for commit into repo. CI runs passed at azure [2] and public gitlab.com runner [3]. Thanks [1]: https://lore.kernel.org/u-boot/20240611210025.798978-1-jiaxun.yang@flygoat.… [2]: https://gitlab.com/FlyGoat/u-boot/-/pipelines/1327832544 [3]: https://flygoat.visualstudio.com/u-boot/_build/results?buildId=63&view=resu… Signed-off-by: Jiaxun Yang <jiaxun.yang(a)flygoat.com> --- Jiaxun Yang (20): py: Replace deprecated unittest APIs binman: Replace pkg_resources with importlib.resources py: Replace distutils.core with setuptools py: Replace usage of configparser.read_fp doc/sphinx: Remove usage of six py: Remove unused entries in requirements.txt py: Bump requirements versions py: Bump pylint version and clear warnings binman: Workaround lz4 cli padding in test cases tests/test_event_dump: Relax match rule for output lib/charset & efi: Fix possible unaligned accesses cyclic: Rise default CYCLIC_MAX_CPU_TIME_US to 5000 CI: Ensure pip install is always performed in venv CI: GitLab: Split build_world tasks CI: Dockerfile: Set global git name & email config CI: Dockerfile: Bump various software version CI: Dockerfile: Add LoongArch64 support doc: ci: Document how to run pipeline on gitlab.com [NFC] Use Jiaxun's CI Image [NFC] CI: Dockerfile: Replace some URL with mirror sites .azure-pipelines.yml | 22 +++-- .gitlab-ci.yml | 122 ++++++++++++++---------- common/Kconfig | 2 +- configs/octeon_nic23_defconfig | 1 - doc/develop/ci_testing.rst | 12 ++- doc/develop/python_cq.rst | 4 +- doc/sphinx/kfigure.py | 3 +- doc/sphinx/requirements.txt | 1 - lib/charset.c | 21 ++-- lib/efi_loader/efi_device_path.c | 11 +-- test/py/requirements.txt | 24 +---- test/py/tests/test_event_dump.py | 10 +- test/py/tests/test_ums.py | 1 + test/py/tests/test_usb.py | 1 + tools/binman/control.py | 18 ++-- tools/binman/entry_test.py | 6 +- tools/binman/etype/fdtmap.py | 1 + tools/binman/etype/fit.py | 1 + tools/binman/etype/image_header.py | 1 + tools/binman/etype/pre_load.py | 2 + tools/binman/etype/ti_board_config.py | 1 + tools/binman/etype/x509_cert.py | 1 + tools/binman/fdt_test.py | 48 +++++----- tools/binman/ftest.py | 50 +++++----- tools/binman/setup.py | 2 +- tools/binman/state.py | 1 + tools/binman/test/184_compress_section_size.dts | 1 + tools/buildman/bsettings.py | 2 +- tools/buildman/builder.py | 2 + tools/buildman/func_test.py | 74 +++++++------- tools/buildman/requirements.txt | 7 +- tools/buildman/test.py | 2 +- tools/docker/Dockerfile | 75 +++++++++------ tools/dtoc/setup.py | 2 +- tools/microcode-tool.py | 1 + tools/patman/settings.py | 9 +- tools/patman/test_checkpatch.py | 2 + tools/qconfig.py | 1 + 38 files changed, 293 insertions(+), 252 deletions(-) --- base-commit: 1ebd659cf020843fd8e8ef90d85a66941cbab6ec change-id: 20240610-docker-image-868126a1a929 Best regards, -- Jiaxun Yang <jiaxun.yang(a)flygoat.com>

6 41

[PATCH 0/3] Add M4 remoteproc driver for TI K3 SoCs
by Hari Nagalla 19 Jun '24

19 Jun '24

This series adds support for M4 remoteproc driver for K3 devices. Logs: https://paste.sr.ht/~hnagalla/62811c4003c27ada83bc1c94500f7714ab30092a Hari Nagalla (3): remoteproc: k3-m4: Introduce K3 remote proc driver for M4 subsystem configs: am62x_evm_a53_defconfig: Enable M4 remote proc driver board: ti: am62x: Add remote proc env variables board/ti/am62x/am62x.env | 4 + configs/am62x_evm_a53_defconfig | 2 + drivers/remoteproc/Kconfig | 10 + drivers/remoteproc/Makefile | 1 + drivers/remoteproc/ti_k3_m4_rproc.c | 421 ++++++++++++++++++++++++++++ 5 files changed, 438 insertions(+) create mode 100644 drivers/remoteproc/ti_k3_m4_rproc.c -- 2.34.1

2 6

[RESEND PATCH] usb: dwc3: add newlines to dev_vdbg calls in ep0
by Caleb Connolly 19 Jun '24

19 Jun '24

For some reason none of these debug prints have newlines, resulting in a "fun" surprise when attempting to debug this driver. The other parts of the dwc3 driver have newlines, add them here too (and fix some minor nearby indent issues to make checkpatch happy). Signed-off-by: Caleb Connolly <caleb.connolly(a)linaro.org> --- Rebased on latest next, no changes --- drivers/usb/dwc3/ep0.c | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index 117d38a0340b..24f516a131b7 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -59,9 +59,9 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma, int ret; dep = dwc->eps[epnum]; if (dep->flags & DWC3_EP_BUSY) { - dev_vdbg(dwc->dev, "%s still busy", dep->name); + dev_vdbg(dwc->dev, "%s still busy\n", dep->name); return 0; } trb = &dwc->ep0_trb[dep->free_slot]; @@ -236,11 +236,11 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request, ret = -EBUSY; goto out; } - dev_vdbg(dwc->dev, "queueing request %p to %s length %d state '%s'", - request, dep->name, request->length, - dwc3_ep0_state_string(dwc->ep0state)); + dev_vdbg(dwc->dev, "queueing request %p to %s length %d state '%s\n'", + request, dep->name, request->length, + dwc3_ep0_state_string(dwc->ep0state)); ret = __dwc3_gadget_ep0_queue(dep, req); out: @@ -695,37 +695,37 @@ static int dwc3_ep0_std_request(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) int ret; switch (ctrl->bRequest) { case USB_REQ_GET_STATUS: - dev_vdbg(dwc->dev, "USB_REQ_GET_STATUS"); + dev_vdbg(dwc->dev, "USB_REQ_GET_STATUS\n"); ret = dwc3_ep0_handle_status(dwc, ctrl); break; case USB_REQ_CLEAR_FEATURE: - dev_vdbg(dwc->dev, "USB_REQ_CLEAR_FEATURE"); + dev_vdbg(dwc->dev, "USB_REQ_CLEAR_FEATURE\n"); ret = dwc3_ep0_handle_feature(dwc, ctrl, 0); break; case USB_REQ_SET_FEATURE: - dev_vdbg(dwc->dev, "USB_REQ_SET_FEATURE"); + dev_vdbg(dwc->dev, "USB_REQ_SET_FEATURE\n"); ret = dwc3_ep0_handle_feature(dwc, ctrl, 1); break; case USB_REQ_SET_ADDRESS: - dev_vdbg(dwc->dev, "USB_REQ_SET_ADDRESS"); + dev_vdbg(dwc->dev, "USB_REQ_SET_ADDRESS\n"); ret = dwc3_ep0_set_address(dwc, ctrl); break; case USB_REQ_SET_CONFIGURATION: - dev_vdbg(dwc->dev, "USB_REQ_SET_CONFIGURATION"); + dev_vdbg(dwc->dev, "USB_REQ_SET_CONFIGURATION\n"); ret = dwc3_ep0_set_config(dwc, ctrl); break; case USB_REQ_SET_SEL: - dev_vdbg(dwc->dev, "USB_REQ_SET_SEL"); + dev_vdbg(dwc->dev, "USB_REQ_SET_SEL\n"); ret = dwc3_ep0_set_sel(dwc, ctrl); break; case USB_REQ_SET_ISOCH_DELAY: - dev_vdbg(dwc->dev, "USB_REQ_SET_ISOCH_DELAY"); + dev_vdbg(dwc->dev, "USB_REQ_SET_ISOCH_DELAY\n"); ret = dwc3_ep0_set_isoch_delay(dwc, ctrl); break; default: - dev_vdbg(dwc->dev, "Forwarding to gadget driver"); + dev_vdbg(dwc->dev, "Forwarding to gadget driver\n"); ret = dwc3_ep0_delegate_req(dwc, ctrl); break; } @@ -909,19 +909,19 @@ static void dwc3_ep0_xfer_complete(struct dwc3 *dwc, dwc->setup_packet_pending = false; switch (dwc->ep0state) { case EP0_SETUP_PHASE: - dev_vdbg(dwc->dev, "Setup Phase"); + dev_vdbg(dwc->dev, "Setup Phase\n"); dwc3_ep0_inspect_setup(dwc, event); break; case EP0_DATA_PHASE: - dev_vdbg(dwc->dev, "Data Phase"); + dev_vdbg(dwc->dev, "Data Phase\n"); dwc3_ep0_complete_data(dwc, event); break; case EP0_STATUS_PHASE: - dev_vdbg(dwc->dev, "Status Phase"); + dev_vdbg(dwc->dev, "Status Phase\n"); dwc3_ep0_complete_status(dwc, event); break; default: WARN(true, "UNKNOWN ep0state %d\n", dwc->ep0state); @@ -1045,9 +1045,9 @@ static void dwc3_ep0_xfernotready(struct dwc3 *dwc, dwc->setup_packet_pending = true; switch (event->status) { case DEPEVT_STATUS_CONTROL_DATA: - dev_vdbg(dwc->dev, "Control Data"); + dev_vdbg(dwc->dev, "Control Data\n"); /* * We already have a DATA transfer in the controller's cache, * if we receive a XferNotReady(DATA) we will ignore it, unless @@ -1059,9 +1059,9 @@ static void dwc3_ep0_xfernotready(struct dwc3 *dwc, */ if (dwc->ep0_expect_in != event->endpoint_number) { struct dwc3_ep *dep = dwc->eps[dwc->ep0_expect_in]; - dev_vdbg(dwc->dev, "Wrong direction for Data phase"); + dev_vdbg(dwc->dev, "Wrong direction for Data phase\n"); dwc3_ep0_end_control_data(dwc, dep); dwc3_ep0_stall_and_restart(dwc); return; } @@ -1071,15 +1071,15 @@ static void dwc3_ep0_xfernotready(struct dwc3 *dwc, case DEPEVT_STATUS_CONTROL_STATUS: if (dwc->ep0_next_event != DWC3_EP0_NRDY_STATUS) return; - dev_vdbg(dwc->dev, "Control Status"); + dev_vdbg(dwc->dev, "Control Status\n"); dwc->ep0state = EP0_STATUS_PHASE; if (dwc->delayed_status) { WARN_ON_ONCE(event->endpoint_number != 1); - dev_vdbg(dwc->dev, "Delayed Status"); + dev_vdbg(dwc->dev, "Delayed Status\n"); return; } dwc3_ep0_do_control_status(dwc, event); @@ -1090,12 +1090,12 @@ void dwc3_ep0_interrupt(struct dwc3 *dwc, const struct dwc3_event_depevt *event) { u8 epnum = event->endpoint_number; - dev_dbg(dwc->dev, "%s while ep%d%s in state '%s'", - dwc3_ep_event_string(event->endpoint_event), - epnum >> 1, (epnum & 1) ? "in" : "out", - dwc3_ep0_state_string(dwc->ep0state)); + dev_dbg(dwc->dev, "%s while ep%d%s in state '%s'\n", + dwc3_ep_event_string(event->endpoint_event), + epnum >> 1, (epnum & 1) ? "in" : "out", + dwc3_ep0_state_string(dwc->ep0state)); switch (event->endpoint_event) { case DWC3_DEPEVT_XFERCOMPLETE: dwc3_ep0_xfer_complete(dwc, event); -- 2.45.0

2 2

[PATCH v4 1/1] usb: informative message if no controller
by Heinrich Schuchardt 19 Jun '24

19 Jun '24

The message 'No working controllers found' provides no clue that this refers to USB controllers. Provide a message that refers to USB. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> Reviewed-by: Dragan Simic <dsimic(a)manjaro.org> Reviewed-by: Caleb Connolly <caleb.connolly(a)linaro.org> Reviewed-by: Marek Vasut <marex(a)denx.de> Reviewed-by: Mattijs Korpershoek <mkorpershoek(a)baylibre.com> --- v4: correct commit message (remove log_info() reference) v3: plural controllers v2: add 'found' at end of message keep printf --- drivers/usb/host/usb-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index cd3a07e4c37..bfec303e7af 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -387,7 +387,7 @@ int usb_init(void) /* if we were not able to find at least one working bus, bail out */ if (controllers_initialized == 0) - printf("No working controllers found\n"); + printf("No USB controllers found\n"); return usb_started ? 0 : -ENOENT; } -- 2.45.1

2 1

[RFC PATCH 00/31] Make U-Boot memory reservations coherent
by Sughosh Ganu 19 Jun '24

19 Jun '24

The aim of this patch series is to fix the current state of incoherence between modules when it comes to memory usage. The primary issue that this series is trying to fix is that the EFI memory module which is responsible for allocating and freeing memory, does not have any visibility of the memory that is being used by the LMB module. This is further complicated by the fact that the LMB allocations are caller specific -- the LMB memory map is not global nor persistent. This means that the memory "allocated" by the LMB module might be relevant only for a given function. Hence one of the requirements for making the memory usage visible across modules is to make LMB allocations persistent and global, and then have means to communicate the use of memory across modules. The first set of patches in this series work on making the LMB memory map persistent and global. This is being done keeping in mind the usage of LMB memory by platforms where the same memory region can be used to load multiple different images. What is not allowed is to overwrite memory that has been allocated by the other module, currently the EFI memory module. This is being achieved by introducing a new flag, LMB_NOOVERWRITE, which represents memory which cannot be re-requested once allocated. The second set of patches are then introducing a notification mechanism to indicate any changes to a respective module's memory map. This way, any memory allocation/reservation by a module gets notified to any interested listners, who then update their memory map accordingly, thus keeping memory usage coherent. Todo's ------ I have run these patches through CI, but the LMB unit tests need an overhaul. I have currently marked these tests for manual run, as running these would obviously tamper the LMB memory map, thus affecting subsequent tests. The current set of LMB tests are written with the assumption of local LMB memory maps. This needs to be reworked. Secondly, there needs to be a test written for testing the various scenarios of memory being allocated and freed by different modules, namely LMB and EFI. I have written a couple of commands for testing the changes that I have made -- I have also included these temporary commands to assist anyone who might want to test these changes. But I will be working on adding a more comprehensive test. Lastly, as the series touches common code, there is obviously an increase in the size of the image, moreover since the LMB memory is now persistent, and the variables do not reside on the stack. I want to check if there can be ways of decreasing the size impact of the changes. Sughosh Ganu (31): lmb: remove the unused lmb_is_reserved() function lmb: staticize __lmb_alloc_base() lmb: make the lmb reservations persistent lmb: remove local instances of the lmb structure variable lmb: pass a flag to image_setup_libfdt() for lmb reservations lmb: reserve and add common memory regions post relocation lmb: remove lmb_init_and_reserve_range() function lmb: replcace the lmb_init_and_reserve() function lmb: allow for resizing lmb regions event: add events to notify memory map changes lib: Kconfig: add a config symbol for getting memory map updates add a function to check if an address is in RAM memory efi_memory: notify of any changes to the EFI memory map lmb: notify of any changes to the LMB memory map efi_memory: add an event handler to update memory map lmb: add an event handler to update memory map lmb: remove call to efi_lmb_reserve() sandbox: iommu: remove lmb allocation in the driver zynq: lmb: do not add to lmb map before relocation test: cedit: use allocated address for reading file test: event: update the expected event dump output test: lmb: run the LMB tests only on sandbox test: lmb: initialise the lmb structure before tests test: lmb: add a test case for checking overlapping region add test: lmb: adjust the test case to handle overlapping regions test: lmb: run lmb tests only manually test: bdinfo: dump the global LMB memory map cmd: bdinfo: only dump the current LMB memory temp: mx6sabresd: bump up the size limit of the board temp: cmd: efi_mem: add a command to test efi alloc/free temp: cmd: efi: add a command to dump EFI memory map arch/arc/lib/cache.c | 4 +- arch/arm/lib/stack.c | 4 +- arch/arm/mach-apple/board.c | 17 +- arch/arm/mach-snapdragon/board.c | 17 +- arch/arm/mach-stm32mp/dram_init.c | 8 +- arch/arm/mach-stm32mp/stm32mp1/cpu.c | 6 +- arch/m68k/lib/bootm.c | 7 +- arch/microblaze/lib/bootm.c | 4 +- arch/mips/lib/bootm.c | 11 +- arch/nios2/lib/bootm.c | 4 +- arch/powerpc/cpu/mpc85xx/mp.c | 4 +- arch/powerpc/include/asm/mp.h | 4 +- arch/powerpc/lib/bootm.c | 14 +- arch/riscv/lib/bootm.c | 4 +- arch/sandbox/cpu/cpu.c | 5 + arch/sh/lib/bootm.c | 4 +- arch/x86/lib/bootm.c | 4 +- arch/xtensa/lib/bootm.c | 4 +- board/xilinx/common/board.c | 33 -- boot/bootm.c | 26 +- boot/bootm_os.c | 5 +- boot/image-board.c | 34 +-- boot/image-fdt.c | 36 +-- cmd/Makefile | 2 + cmd/bdinfo.c | 5 +- cmd/booti.c | 2 +- cmd/bootz.c | 2 +- cmd/efi_map_dump.c | 28 ++ cmd/efi_memory.c | 155 ++++++++++ cmd/elf.c | 2 +- cmd/load.c | 7 +- common/board_r.c | 20 ++ common/event.c | 4 + configs/mx6sabresd_defconfig | 2 +- drivers/iommu/apple_dart.c | 8 +- drivers/iommu/sandbox_iommu.c | 17 +- fs/fs.c | 7 +- include/efi_loader.h | 2 + include/event.h | 28 ++ include/image.h | 27 +- include/lmb.h | 96 +++--- lib/Kconfig | 10 + lib/efi_loader/efi_dt_fixup.c | 2 +- lib/efi_loader/efi_helper.c | 2 +- lib/efi_loader/efi_memory.c | 127 +++++++- lib/lmb.c | 442 ++++++++++++++++++--------- net/tftp.c | 5 +- net/wget.c | 5 +- test/boot/cedit.c | 5 +- test/cmd/bdinfo.c | 22 +- test/lib/Makefile | 2 +- test/lib/lmb.c | 274 +++++++++-------- test/py/tests/test_event_dump.py | 2 + 53 files changed, 1001 insertions(+), 570 deletions(-) create mode 100644 cmd/efi_map_dump.c create mode 100644 cmd/efi_memory.c -- 2.34.1

5 126

[PATCH 1/6] clk: renesas: Synchronize R-Car R8A77951 H3 clock tables with Linux 6.9.3
by Marek Vasut 19 Jun '24

19 Jun '24

Synchronize R-Car R8A77951 H3 clock tables with Linux 6.9.3, commit 1b4861e32e461b6fae14dc49ed0f1c7f20af5146 . Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- drivers/clk/renesas/r8a7795-cpg-mssr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c index e511f74982b..4225036a1a9 100644 --- a/drivers/clk/renesas/r8a7795-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c @@ -77,6 +77,7 @@ static struct cpg_core_clk r8a7795_core_clks[] __initdata = { /* Core Clock Outputs */ DEF_GEN3_Z("z", R8A7795_CLK_Z, CLK_TYPE_GEN3_Z, CLK_PLL0, 2, 8), DEF_GEN3_Z("z2", R8A7795_CLK_Z2, CLK_TYPE_GEN3_Z, CLK_PLL2, 2, 0), + DEF_GEN3_Z("zg", R8A7795_CLK_ZG, CLK_TYPE_GEN3_ZG, CLK_PLL4, 4, 24), DEF_FIXED("ztr", R8A7795_CLK_ZTR, CLK_PLL1_DIV2, 6, 1), DEF_FIXED("ztrd2", R8A7795_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1), DEF_FIXED("zt", R8A7795_CLK_ZT, CLK_PLL1_DIV2, 4, 1), @@ -126,6 +127,7 @@ static struct cpg_core_clk r8a7795_core_clks[] __initdata = { }; static struct mssr_mod_clk r8a7795_mod_clks[] __initdata = { + DEF_MOD("3dge", 112, R8A7795_CLK_ZG), DEF_MOD("fdp1-1", 118, R8A7795_CLK_S0D1), DEF_MOD("fdp1-0", 119, R8A7795_CLK_S0D1), DEF_MOD("tmu4", 121, R8A7795_CLK_S0D6), @@ -249,6 +251,7 @@ static struct mssr_mod_clk r8a7795_mod_clks[] __initdata = { DEF_MOD("rpc-if", 917, R8A7795_CLK_RPCD2), DEF_MOD("i2c6", 918, R8A7795_CLK_S0D6), DEF_MOD("i2c5", 919, R8A7795_CLK_S0D6), + DEF_MOD("adg", 922, R8A7795_CLK_S0D4), DEF_MOD("i2c-dvfs", 926, R8A7795_CLK_CP), DEF_MOD("i2c4", 927, R8A7795_CLK_S0D6), DEF_MOD("i2c3", 928, R8A7795_CLK_S0D6), -- 2.43.0

1 5

[PATCH v2 0/3] rockchip: rk3328: Add IO-domain driver and speed up boot
by Jonas Karlman 18 Jun '24

18 Jun '24

This series adds support for RK3328 to the IO-domain driver, it also enabled ARMv8 crypto extensions and OF_LIVE to speed up boot on rk3328 boards. Before this series init time is around 4.1 seconds on a Rock64 v2.0: => bootstage report Timer summary in microseconds (11 records): Mark Elapsed Stage 63,628 SPL 284,173 220,545 end phase 342,709 58,536 board_init_f 967,537 624,828 board_init_r 2,980,332 2,012,795 eth_common_init 4,141,289 1,160,957 eth_initialize 4,141,545 256 main_loop 4,146,525 4,980 cli_loop Accumulated time: 71,396 dm_spl 329,994 dm_f 12,355 dm_r After this series init time is around 1.3 seconds on same Rock64 v2.0: => bootstage report Timer summary in microseconds (12 records): Mark Elapsed Stage 63,628 SPL 284,173 220,545 end phase 303,282 19,109 board_init_f 942,973 639,691 board_init_r 1,194,831 251,858 eth_common_init 1,363,405 168,574 eth_initialize 1,363,609 204 main_loop 1,363,738 129 cli_loop Accumulated time: 113,648 dm_spl 344,913 dm_f 6,788 of_live 17,895 dm_r Changes in v2: - Rebase on latest master bransh Jonas Karlman (3): rockchip: rk3328: Sort imply statements alphabetically rockchip: rk3328: Enable ARMv8 crypto extensions rockchip: io-domain: Add support for RK3328 arch/arm/mach-rockchip/Kconfig | 14 +++---- arch/arm/mach-rockchip/rk3328/syscon_rk3328.c | 3 ++ configs/evb-rk3328_defconfig | 1 + drivers/misc/Kconfig | 2 +- drivers/misc/rockchip-io-domain.c | 38 +++++++++++++++++++ 5 files changed, 50 insertions(+), 8 deletions(-) -- 2.43.2

3 8

[PATCH v6 0/4] automatically add /chosen/kaslr-seed and deduplicate code
by Tim Harvey 18 Jun '24

18 Jun '24

This series will automatically add /chosen/kaslr-seed to the dt if DM_RNG is enabled during the boot process. If RANDOMIZE_BASE is enabled in the Linux kernel instructing it to randomize the virtual address at which the kernel image is loaded, it expects entropy to be provided by the bootloader by populating /chosen/kaslr-seed with a 64-bit value from source of entropy at boot. If we have DM_RNG enabled populate this value automatically when fdt_chosen is called. We skip this if ARMV8_SEC_FIRMWARE_SUPPORT is enabled as its implementation uses a different source of entropy that is not yet implemented as DM_RNG. We also skip this if MEASURED_BOOT is enabled as in that case any modifications to the dt will cause measured boot to fail (although there are many other places the dt is altered). As this fdt node is added elsewhere create a library function and use it to deduplicate code. We will provide a parameter to overwrite the node if present. For our automatic injection, we will use the first rng device and not overwrite if already present with a non-zero value (which may have been populated by an earlier boot stage). This way if a board specific ft_board_setup() function wants to customize this behavior it can call fdt_kaslrseed with a rng device index of its choosing and set overwrite true. Note that the kalsrseed command (CMD_KASLRSEED) is likely pointless now but left in place in case boot scripts exist that rely on this command existing and returning success. An informational message is printed to alert users of this command that it is likely no longer needed. Note that the Kernel's EFI STUB only relies on EFI_RNG_PROTOCOL for randomization and completely ignores the kaslr-seed for its own randomness needs (i.e the randomization of the physical placement of the kernel). It gets weeded out from the DTB that gets handed over via efi_install_fdt() as it would also mess up the measured boot DTB TPM measurements as well. v6: - collected tags - add patch to fdt ut v5: - fixed typo in commit message s/it's/its/ - use cmd_process_error per Michal's suggestion - split into separate patches - remove the rng device index noting it as a future enhancement v4: - add missing /n to notice in kaslrseed cmd - combine ints in declaration - remove unused vars from board/xilinx/common/board.c ft_board_setup v3: - skip if CONFIG_MEASURED_BOOT - fix skip for CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT - pass in rng index and bool to specify overwrite - remove duplicate error strings printed outside of fdt_kaslrseed - added note to commit log about how EFI STUB weeds out kalsr-seed v2: - fix typo in commit msg - use stack for seed to avoid unecessary malloc/free - move to a library function and deduplicate code by using it elsewhere Tim Harvey (4): Add fdt_kaslrseed function to add kaslr-seed to chosen node fdt: automatically add /chosen/kaslr-seed if DM_RNG is enabled use fdt_kaslrseed function to de-duplicate code test: cmd: fdt: fix chosen test for DM_RNG board/xilinx/common/board.c | 40 ---------------------------- boot/fdt_support.c | 53 +++++++++++++++++++++++++++++++++++++ boot/pxe_utils.c | 34 +----------------------- cmd/kaslrseed.c | 49 +++++----------------------------- include/fdt_support.h | 10 +++++++ test/cmd/fdt.c | 4 +++ 6 files changed, 75 insertions(+), 115 deletions(-) -- 2.25.1

3 12

[PATCH v7 00/24] EFI: ti: Enable EFI capsule updates
by Jonathan Humphreys 18 Jun '24

18 Jun '24

Enable on disk capsule updates, which includes defining the firmware components (tiboot3, spl, u-boot) and enabling processing of raw capsule updates. This is enabled for several TI SoC based platforms: AM64, AM62, AM62p, AM69, BeaglePlay, J7, and BeagleboneAI. The configs to enable this are in a single base config file. This will make it more scalable to add additional EFI capsule features (like authentication) across all TI boards that have capsules enabled. This series also includes enabling serial flash DFU for AM62 and MMC DFU for beagleplay. Changes from v1: - Added sysfw.itb capsule definition to beagleboneai64 - removed extra commas in structure definitions Changes from v2: - Added documentation on OSPI flash layouts - Improved comments for capsule GUIDs definitions - Defined board unique capsule GUIDs and put definitions in board specific files - Added a Capsule Update porting section to the documentation Changes from v3: - Added better commit messages based upon checkpatch warnings. - Remove conditional inclusion of capsule update firmware info - Converted OSPI layout diagram to svg format Link to v3: https://lore.kernel.org/r/20240419205701.163821-1-j-humphreys@ti.com Changes from v4: - Added am69 SK board - Corrected a few spelling mistakes and clarity improvements in k3 docs section - Added CONFIG_SET_DFU_ALT_INFO guard around set_dfu_alt_info() Link to v4: https://lore.kernel.org/r/20240509164123.1753050-1-j-humphreys@ti.com Changes from v5: - Created an EFI capsule base config for TI boards, making adding additional capsule features on TI boards more scalable. Link to v5: https://lore.kernel.org/r/20240531222118.2618041-1-j-humphreys@ti.com Changes from v6: - Rebased on latest -next - added tags Link to v6: https://lore.kernel.org/r/20240607223858.1971290-1-j-humphreys@ti.com Jonathan Humphreys (24): doc: uefi: capsules: Add Capsule Update porting section doc: ti: k3: Correct spelling mistakes and improve clarity configs: ti: Create base EFI capsule configs for TI K3 devices board: am64x: Define capsule update firmware info configs: am64x: Enable EFI capsule update doc: board: ti: am64x: document OSPI layout board: j721e: Define capsule update firmware info configs: j721e: Enable EFI capsule update doc: board: ti: j721e: document OSPI layout board: beagleplay: Define capsule update firmware info configs: beagleplay: Enable DFU for MMC configs: beagleplay: Enable EFI capsule update board: am62x: Define capsule update firmware info configs: am62x: Enable EFI capsule update doc: board: ti: am62x: document OSPI layout board: am62px: Define capsule update firmware info configs: am62px: Enable EFI capsule update doc: board: ti: am62px: document OSPI layout board: beagleboneai64: Define capsule update firmware info configs: beagleboneai64: Enable EFI capsule update configs: j784s4_evm: Enable serial flash DFU support board: sk-am69: Define capsule update firmware info configs: j784s4: Enable EFI capsule update doc: board: ti: j784s4: document OSPI NOR layout board/beagle/beagleboneai64/Kconfig | 4 +- board/beagle/beagleboneai64/beagleboneai64.c | 39 + board/beagle/beagleplay/Kconfig | 4 +- board/beagle/beagleplay/beagleplay.c | 34 + board/ti/am62px/evm.c | 34 + board/ti/am62x/evm.c | 34 + board/ti/am64x/evm.c | 34 + board/ti/j721e/evm.c | 40 + board/ti/j784s4/evm.c | 34 + configs/am62px_evm_a53_defconfig | 2 + configs/am62x_beagleplay_a53_defconfig | 4 + configs/am62x_evm_a53_defconfig | 1 + configs/am64x_evm_a53_defconfig | 2 + configs/j721e_beagleboneai64_a72_defconfig | 2 + configs/j721e_evm_a72_defconfig | 2 + configs/j784s4_evm_a72_defconfig | 5 + configs/k3_efi_capsule.config | 2 + doc/board/ti/am62px_sk.rst | 24 + doc/board/ti/am62x_sk.rst | 24 + doc/board/ti/am64x_evm.rst | 24 + doc/board/ti/img/ospi_sysfw-am64.svg | 802 ++++++++++ doc/board/ti/img/ospi_sysfw.svg | 1464 ++++++++++-------- doc/board/ti/img/ospi_sysfw2.svg | 802 ++++++++++ doc/board/ti/img/ospi_sysfw3.svg | 802 ++++++++++ doc/board/ti/j721e_evm.rst | 58 +- doc/board/ti/j784s4_evm.rst | 28 + doc/board/ti/k3.rst | 10 +- doc/develop/uefi/uefi.rst | 12 + include/configs/am62px_evm.h | 24 + include/configs/am62x_evm.h | 24 + include/configs/am64x_evm.h | 24 + include/configs/beagleboneai64.h | 55 + include/configs/beagleplay.h | 41 + include/configs/j721e_evm.h | 29 + include/configs/j784s4_evm.h | 24 + 35 files changed, 3864 insertions(+), 684 deletions(-) create mode 100644 configs/k3_efi_capsule.config create mode 100644 doc/board/ti/img/ospi_sysfw-am64.svg create mode 100644 doc/board/ti/img/ospi_sysfw2.svg create mode 100644 doc/board/ti/img/ospi_sysfw3.svg create mode 100644 include/configs/beagleboneai64.h create mode 100644 include/configs/beagleplay.h -- 2.34.1

4 27

[PATCH v2] configs: j784s4: Enable basic EFI CMD support
by Jonathan Humphreys 18 Jun '24

18 Jun '24

Enable basic configs for EFI CMD support. Signed-off-by: Jonathan Humphreys <j-humphreys(a)ti.com> --- Changes from v1: - Rebased on latest -next Link to v1: https://lore.kernel.org/r/20240531223057.2619261-1-j-humphreys@ti.com configs/j784s4_evm_a72_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/j784s4_evm_a72_defconfig b/configs/j784s4_evm_a72_defconfig index 937b8810638..bb2a21f888b 100644 --- a/configs/j784s4_evm_a72_defconfig +++ b/configs/j784s4_evm_a72_defconfig @@ -55,13 +55,16 @@ CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000 CONFIG_SPL_THERMAL=y CONFIG_SPL_YMODEM_SUPPORT=y +CONFIG_CMD_BOOTEFI_SELFTEST=y CONFIG_CMD_ASKENV=y +CONFIG_CMD_NVEDIT_EFI=y CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_MTD=y CONFIG_CMD_REMOTEPROC=y +CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y -- 2.34.1

2 1

[PATCH v2] configs: j784s4: Enable RTC emulation
by Jonathan Humphreys 18 Jun '24

18 Jun '24

Enable RTC emulation for System Ready IR tests. Signed-off-by: Jonathan Humphreys <j-humphreys(a)ti.com> --- Changes from v1: - Rebased on latest -next Link to v1: https://lore.kernel.org/r/20240531223057.2619261-1-j-humphreys@ti.com configs/j784s4_evm_a72_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/j784s4_evm_a72_defconfig b/configs/j784s4_evm_a72_defconfig index bb2a21f888b..2aa16eb7270 100644 --- a/configs/j784s4_evm_a72_defconfig +++ b/configs/j784s4_evm_a72_defconfig @@ -143,6 +143,8 @@ CONFIG_SPL_RAM=y CONFIG_REMOTEPROC_TI_K3_DSP=y CONFIG_REMOTEPROC_TI_K3_R5F=y CONFIG_RESET_TI_SCI=y +CONFIG_DM_RTC=y +CONFIG_RTC_EMULATION=y CONFIG_SCSI=y CONFIG_DM_SERIAL=y CONFIG_SOC_DEVICE=y @@ -155,3 +157,4 @@ CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y CONFIG_DM_THERMAL=y +CONFIG_EFI_SET_TIME=y -- 2.34.1

2 1

[PATCH] smbios: only look for a SYSINFO udevice if SYSINFO support is enabled
by Quentin Schulz 18 Jun '24

18 Jun '24

From: Quentin Schulz <quentin.schulz(a)cherry.de> If SYSINFO support isn't enabled, it's a given that uclass_first_device for UCLASS_SYSINFO will not find anything, therefore let's skip the test entirely. This allows to get rid of the following debug message that may be confusing: Cannot find uclass for id 118: please add the UCLASS_DRIVER() declaration for this UCLASS_... id Signed-off-by: Quentin Schulz <quentin.schulz(a)cherry.de> --- lib/smbios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/smbios.c b/lib/smbios.c index b190b010f30..a822acd48e9 100644 --- a/lib/smbios.c +++ b/lib/smbios.c @@ -571,7 +571,7 @@ ulong write_smbios_table(ulong addr) int i; ctx.node = ofnode_null(); - if (IS_ENABLED(CONFIG_OF_CONTROL)) { + if (IS_ENABLED(CONFIG_OF_CONTROL) && CONFIG_IS_ENABLED(SYSINFO)) { uclass_first_device(UCLASS_SYSINFO, &ctx.dev); if (ctx.dev) parent_node = dev_read_subnode(ctx.dev, "smbios"); --- base-commit: 4f836fb324ba500ecabdba4146c3ca9e1600cdf5 change-id: 20240610-smbios-sysinfo-dca17e76e11d Best regards, -- Quentin Schulz <quentin.schulz(a)cherry.de>

3 2

[PATCH 00/13] *** Various fixes & improvements for phycore-AM6* SoMs ***
by Wadim Egorov 18 Jun '24

18 Jun '24

This patch set is for u-boot/next. It includes various fixes and improvements for phyCORE-AM62x and phyCORE-AM64x SoMs. Notable is the last patch which prepares for use with future ECC memory fixups. Nathan Morrisson (2): arch: arm: dts: k3-am625-phyboard-lyra: Add fixed partitions arch: arm: dts: k3-am642-phyboard-electra: Add fixed partitions Wadim Egorov (11): board: phytec: common: k3: Copy fixed partitions to OS device tree board: phytec: phycore-am62x: Fix CONFIG_SPL_BOARD_INIT configs: phycore_am62x: Update environment location configs: phycore_am64x: Update environment location arm: dts: k3-am625-phyboard-lyra-rdk: Enable usb port in u-boot configs: phycore_am62x_a53_defconfig: Enable DFU boot board: phytec: phycore-am62x: Pull in k3_dfu.env configs: phycore_am6xx: Update MTD & SPI configs doc: board: phytec: phycore-am62x: Add USB DFU switch config doc: board: phytec: phycore-am6: Use mtd commands board: phytec: phycore-am62x: Use memory nodes in higher boot stages .../k3-am625-phyboard-lyra-rdk-u-boot.dtsi | 35 +++++++++++++++++ .../k3-am642-phyboard-electra-rdk-u-boot.dtsi | 26 +++++++++++++ board/phytec/common/k3/board.c | 10 +++++ board/phytec/phycore_am62x/phycore-am62x.c | 31 ++++++++++++++- board/phytec/phycore_am62x/phycore_am62x.env | 2 + configs/phycore_am62x_a53_defconfig | 38 +++++++++++++++++-- configs/phycore_am62x_r5_defconfig | 1 - configs/phycore_am64x_a53_defconfig | 8 ++-- configs/phycore_am64x_r5_defconfig | 1 - doc/board/phytec/phycore-am62x.rst | 12 ++++-- doc/board/phytec/phycore-am64x.rst | 8 ++-- 11 files changed, 155 insertions(+), 17 deletions(-) -- 2.34.1

4 17

[PATCH v3 1/1] usb: informative message if no controller
by Heinrich Schuchardt 18 Jun '24

18 Jun '24

The message 'No working controllers found' provides no clue that this refers to USB controllers. Provide a message that refers to USB. Use log_info(). Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v3: plural controllers v2: add 'found' at end of message keep printf --- drivers/usb/host/usb-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index a1cd0ad2d66..e16432a1516 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -388,7 +388,7 @@ int usb_init(void) /* if we were not able to find at least one working bus, bail out */ if (controllers_initialized == 0) - printf("No working controllers found\n"); + printf("No USB controllers found\n"); return usb_started ? 0 : -ENOENT; } -- 2.43.0

5 5

[PATCH] cmd: make 'booti -h' not crash the board
by Caleb Connolly 18 Jun '24

18 Jun '24

Check the result of hextoul() when parsing the first argument to booti, and add specific handling for "-h" to print usage rather than causing a null pointer exception. Fixes: 5db28905c952 ("cmd: Split 'bootz' and 'booti' out from 'bootm'") Signed-off-by: Caleb Connolly <caleb.connolly(a)linaro.org> --- cmd/booti.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cmd/booti.c b/cmd/booti.c index 62b19e834366..c4029a84e7a7 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -31,8 +31,9 @@ static int booti_start(struct bootm_info *bmi) ulong dest_end; unsigned long comp_len; unsigned long decomp_len; int ctype; + char *endp; ret = bootm_run_states(bmi, BOOTM_STATE_START); /* Setup Linux kernel Image entry point */ @@ -40,9 +41,14 @@ static int booti_start(struct bootm_info *bmi) ld = image_load_addr; debug("* kernel: default image load address = 0x%08lx\n", image_load_addr); } else { - ld = hextoul(bmi->addr_img, NULL); + ld = hextoul(bmi->addr_img, &endp); + if (*endp != '\0') { + printf("## Invalid kernel image address: %s\n", + bmi->addr_img); + return CMD_RET_USAGE; + } debug("* kernel: cmdline image address = 0x%08lx\n", ld); } temp = map_sysmem(ld, 0); @@ -108,8 +114,11 @@ int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) /* Consume 'booti' */ argc--; argv++; + if (argc && strcmp(argv[0], "-h") == 0) + return CMD_RET_USAGE; + bootm_init(&bmi); if (argc) bmi.addr_img = argv[0]; if (argc > 1) -- 2.45.0

2 1