August 2024 - U-Boot

[PATCH 00/14] event: Replace some more init hooks
by Simon Glass 07 Aug '24

07 Aug '24

This series replaces some more of the init hooks in board_f.c and board_r.c with events. Notably it converts last_state_init() over. It also provides a 'simple' event spy, which takes no arguments. It turns out that this is quite a common case, so it is worth optimising for this, to reduce code size, before events become too commonly used. Finally, it introduces a way of emitting an event in an initcall, instead of calling a function. This is likely to be used at least as often as the functions, as we convert more of these initcalls. As part of this, the initcall code is brought back into a C file. Somehow the compiler has changed or something else, so that this does not confer any benefits now. For boards with EVENT enabled, this unfortunately results in small growth, e.g. for firefly: aarch64: (for 1/1 boards) all +114.0 data +16.0 rodata +22.0 text +76.0 arm: (for 1/1 boards) all +82.0 rodata +18.0 text +64.0 For boards without EVENT enabled the growth is smaller, e.g. nokia_rx51: arm: (for 1/1 boards) all +32.0 data +8.0 rodata -8.0 text +32.0 I cannot find a good way to avoid the latter, other than macro magic with an embedded comma (to completely remove an event entry), which seems nasty. Simon Glass (14): event: Support a simple spy record Revert "initcall: Move to inline function" initcall: Factor out reloc_off calculation initcall: Adjust the loop logic initcall: Adjust the failure message and return value event: Export event_type_name() initcall: Support emitting events initcall: Support manual relocation event: Convert existing spy records to simple event: Rename EVENT_SPY to EVENT_SPY_FULL event: Update documentation for simple spy x86: Convert arch_fsp_init() to use events freescale: Drop call to init_func_vid() in the init sequence event: Use an event to replace last_stage_init() arch/Kconfig | 1 + arch/arm/cpu/armv8/fsl-layerscape/spl.c | 5 + arch/arm/mach-imx/imx8/cpu.c | 4 +- arch/arm/mach-imx/imx8m/soc.c | 4 +- arch/arm/mach-imx/imx8ulp/soc.c | 7 +- arch/arm/mach-imx/imx9/soc.c | 4 +- arch/arm/mach-omap2/am33xx/board.c | 4 +- arch/arm/mach-omap2/hwinit-common.c | 12 +- arch/mips/mach-mtmips/cpu.c | 6 +- arch/mips/mach-pic32/cpu.c | 12 +- arch/nios2/cpu/cpu.c | 4 +- arch/riscv/cpu/cpu.c | 4 +- arch/riscv/include/asm/system.h | 2 +- arch/riscv/lib/spl.c | 2 +- arch/sandbox/cpu/start.c | 7 +- arch/x86/cpu/baytrail/cpu.c | 4 +- arch/x86/cpu/broadwell/cpu.c | 4 +- arch/x86/cpu/coreboot/coreboot.c | 7 +- arch/x86/cpu/cpu.c | 10 +- arch/x86/cpu/efi/payload.c | 4 +- arch/x86/cpu/ivybridge/cpu.c | 4 +- arch/x86/cpu/quark/quark.c | 30 +++-- arch/x86/lib/fsp1/fsp_common.c | 1 + arch/x86/lib/fsp2/fsp_common.c | 5 - arch/x86/lib/fsp2/fsp_init.c | 4 +- board/CZ.NIC/turris_mox/turris_mox.c | 4 +- board/Marvell/mvebu_armada-37xx/board.c | 5 +- board/Marvell/octeon_nic23/board.c | 4 +- board/Marvell/octeontx2/board.c | 4 +- board/cortina/presidio-asic/presidio.c | 4 +- board/emulation/qemu-ppce500/qemu-ppce500.c | 4 +- board/freescale/ls1088a/ls1088a.c | 3 +- board/freescale/lx2160a/lx2160a.c | 2 + board/gdsys/a38x/controlcenterdc.c | 31 +++-- board/gdsys/mpc8308/gazerbeam.c | 4 +- board/ge/bx50v3/bx50v3.c | 4 +- board/google/chromebook_coral/coral.c | 4 +- board/keymile/km83xx/km83xx.c | 4 +- board/keymile/kmcent2/kmcent2.c | 7 +- .../keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 10 +- board/phytium/durian/durian.c | 4 +- board/phytium/pomelo/pomelo.c | 4 +- board/starfive/visionfive2/spl.c | 2 +- boot/vbe_request.c | 2 +- boot/vbe_simple_os.c | 2 +- common/Kconfig | 1 + common/board_f.c | 21 +--- common/board_r.c | 20 ++-- common/event.c | 13 ++- configs/bayleybay_defconfig | 1 - configs/cherryhill_defconfig | 1 - configs/chromebook_coral_defconfig | 1 - configs/chromebook_link64_defconfig | 1 - configs/chromebook_link_defconfig | 1 - configs/chromebook_samus_defconfig | 1 - configs/chromebook_samus_tpl_defconfig | 1 - configs/chromebox_panther_defconfig | 1 - ...-qeval20-qa3-e3845-internal-uart_defconfig | 1 - configs/conga-qeval20-qa3-e3845_defconfig | 1 - configs/coreboot64_defconfig | 1 - configs/coreboot_defconfig | 1 - configs/cougarcanyon2_defconfig | 1 - configs/crownbay_defconfig | 1 - configs/dfi-bt700-q7x-151_defconfig | 1 - configs/edison_defconfig | 1 - configs/efi-x86_app32_defconfig | 1 - configs/efi-x86_app64_defconfig | 1 - configs/efi-x86_payload32_defconfig | 1 - configs/efi-x86_payload64_defconfig | 1 - configs/galileo_defconfig | 1 - configs/minnowmax_defconfig | 1 - configs/qemu-x86_64_defconfig | 3 +- configs/qemu-x86_defconfig | 1 - configs/som-db5800-som-6867_defconfig | 1 - ...able-x86-conga-qa3-e3845-pcie-x4_defconfig | 1 - .../theadorable-x86-conga-qa3-e3845_defconfig | 1 - configs/theadorable-x86-dfi-bt700_defconfig | 1 - doc/develop/event.rst | 23 +++- drivers/cpu/microblaze_cpu.c | 4 +- include/event.h | 72 +++++++++++- include/init.h | 15 --- include/initcall.h | 72 +++++------- lib/Makefile | 1 + lib/fwu_updates/fwu.c | 4 +- lib/initcall.c | 109 ++++++++++++++++++ scripts/event_dump.py | 12 +- test/common/event.c | 22 ++++ test/py/tests/test_event_dump.py | 3 +- test/py/tests/test_trace.py | 11 +- 89 files changed, 431 insertions(+), 261 deletions(-) create mode 100644 lib/initcall.c -- 2.42.0.rc1.204.g551eb34607-goog

4 19

[PATCH 1/1] ata: sata_rescan must scan for block devices
by Heinrich Schuchardt 07 Aug '24

07 Aug '24

A system may have multiple SATA controller. Removing the controller with the lowest sequence number before probing all SATA controllers makes no sense. In sata_rescan we remove all block devices which are children of SATA controllers. We also have to remove the bootdev devices as they will be created when scanning for block devices. After probing all SATA controllers we must scan for block devices otherwise we end up without any SATA block device. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- drivers/ata/sata.c | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c index 84437d3d346..2139ae9903e 100644 --- a/drivers/ata/sata.c +++ b/drivers/ata/sata.c @@ -49,38 +49,40 @@ int sata_scan(struct udevice *dev) int sata_rescan(bool verbose) { + struct uclass *uc; + struct udevice *dev; /* SATA controller */ int ret; - struct udevice *dev; if (verbose) - printf("Removing devices on SATA bus...\n"); - - blk_unbind_all(UCLASS_AHCI); - - ret = uclass_find_first_device(UCLASS_AHCI, &dev); - if (ret || !dev) { - printf("Cannot find SATA device (err=%d)\n", ret); - return -ENOENT; - } - - ret = device_remove(dev, DM_REMOVE_NORMAL); - if (ret) { - printf("Cannot remove SATA device '%s' (err=%d)\n", dev->name, ret); - return -ENOSYS; + printf("scanning bus for devices...\n"); + + ret = uclass_get(UCLASS_AHCI, &uc); + if (ret) + return ret; + + /* Remove all children of SATA devices (blk and bootdev) */ + uclass_foreach_dev(dev, uc) { + log_debug("unbind %s\n", dev->name); + ret = device_chld_remove(dev, NULL, DM_REMOVE_NORMAL); + if (!ret) + ret = device_chld_unbind(dev, NULL); + if (ret) { + if (verbose) + printf("unable to unbind devices (%dE)\n", ret); + return log_msg_ret("unb", ret); + } } if (verbose) printf("Rescanning SATA bus for devices...\n"); - ret = uclass_probe_all(UCLASS_AHCI); - - if (ret == -ENODEV) { - if (verbose) - printf("No SATA block device found\n"); - return 0; + uclass_foreach_dev(dev, uc) { + ret = sata_scan(dev); + if (ret) + return ret; } - return ret; + return 0; } static unsigned long sata_bread(struct udevice *dev, lbaint_t start, -- 2.45.2

1 0

[PATCH v2 1/3] aes: Allow to store randomly generated IV in the FIT
by Paul HENRYS 06 Aug '24

06 Aug '24

When the initialisation vector is randomly generated, its value shall be stored in the FIT together with the encrypted data. The changes allow to store the IV in the FIT also in the case where the key is not stored in the DTB but retrieved somewhere else at runtime. Signed-off-by: Paul HENRYS <paul.henrys_ext(a)softathome.com> --- lib/aes/aes-encrypt.c | 7 +++++++ tools/image-host.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/aes/aes-encrypt.c b/lib/aes/aes-encrypt.c index e74e35eaa28..90e1407b4f0 100644 --- a/lib/aes/aes-encrypt.c +++ b/lib/aes/aes-encrypt.c @@ -84,6 +84,13 @@ int image_aes_add_cipher_data(struct image_cipher_info *info, void *keydest, char name[128]; int ret = 0; + if (!keydest && !info->ivname) { + /* At least, store the IV in the FIT image */ + ret = fdt_setprop(fit, node_noffset, "iv", + info->iv, info->cipher->iv_len); + goto done; + } + /* Either create or overwrite the named cipher node */ parent = fdt_subnode_offset(keydest, 0, FIT_CIPHER_NODENAME); if (parent == -FDT_ERR_NOTFOUND) { diff --git a/tools/image-host.c b/tools/image-host.c index 49ce7436bb9..3424b8d9a1d 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -535,7 +535,7 @@ fit_image_process_cipher(const char *keydir, void *keydest, void *fit, * size values * And, if needed, write the iv in the FIT file */ - if (keydest) { + if (keydest || (!keydest && !info.ivname)) { ret = info.cipher->add_cipher_data(&info, keydest, fit, node_noffset); if (ret) { fprintf(stderr, -- 2.25.1

2 5

[PATCH 1/1] Makefile: don't use CFLAGS for environment text file
by Heinrich Schuchardt 06 Aug '24

06 Aug '24

We use KCPPFLAGS to let the user set flags when invoking the C precompiler. These should also be used when generating the environment text file. Reported-by: Dave Jones <dave.jones(a)canonical.com> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f0e6f07178f..4c469b9ce2b 100644 --- a/Makefile +++ b/Makefile @@ -1839,7 +1839,7 @@ ENV_FILE := $(if $(ENV_SOURCE_FILE),$(ENV_FILE_CFG),$(wildcard $(ENV_FILE_BOARD) quiet_cmd_gen_envp = ENVP $@ cmd_gen_envp = \ if [ -s "$(ENV_FILE)" ]; then \ - $(CPP) -P $(CFLAGS) -x assembler-with-cpp -undef \ + $(CPP) -P $(cpp_flags) -x assembler-with-cpp -undef \ -D__ASSEMBLY__ \ -D__UBOOT_CONFIG__ \ -I . -I include -I $(srctree)/include \ -- 2.45.2

2 1

Pull request: u-boot-sunxi/master for v2024.10
by Andre Przywara 06 Aug '24

06 Aug '24

Hi Tom, please pull the sunxi/master branch, containing some more changes for 2024.10. This updates the "old style" DTs to that of Linux v6.10, matching what OF_UPSTREAM is at now. Hopefully we won't need to do this (manually) anymore. Since this brings in the DT for a new board (Tanix TX1), also add the defconfig for that, which has just been waiting for that sync. There are three more fixes: two for the SPI clock setup, which avoids too high frequencies in some cases, and one fix to avoid a build warning with GCC 14 for the sunxi TOC0 part of the mkimage tool. The gitlab CI passed, and I tested the SPI flash on the OrangePi Zero 3 and also booted that into Linux. Please pull! Cheers, Andre ============================================================ The following changes since commit 6becf9ba1ab82af6f4fcf9f4d0da38f9c75212d2: Merge tag 'u-boot-imx-master-20240802' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx (2024-08-02 14:40:59 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-sunxi.git master for you to fetch changes up to 541a1649e74787682902d820d0b79e16bad69a4f: spi: sunxi: fix clock divider calculation for max frequency setting (2024-08-06 11:20:10 +0100) ---------------------------------------------------------------- Andre Przywara (2): sunxi: dts: arm/arm64: update devicetree files from Linux-v6.10 sunxi: h616: add Tanix TX1 support Michael Walle (2): spi: sunxi: fix CDR2 calculation spi: sunxi: fix clock divider calculation for max frequency setting Seung-Woo Kim (1): tools: imagetool: Remove unnecessary check from toc0_verify_cert_item() arch/arm/dts/Makefile | 1 + arch/arm/dts/sun50i-a64-bananapi-m64.dts | 2 +- arch/arm/dts/sun50i-a64-nanopi-a64.dts | 2 +- arch/arm/dts/sun50i-a64-olinuxino.dts | 2 +- arch/arm/dts/sun50i-a64-orangepi-win.dts | 2 +- arch/arm/dts/sun50i-a64-pinebook.dts | 2 +- arch/arm/dts/sun50i-a64-pinephone.dtsi | 16 +- arch/arm/dts/sun50i-a64-pinetab.dts | 2 +- arch/arm/dts/sun50i-a64-teres-i.dts | 2 +- arch/arm/dts/sun50i-a64.dtsi | 18 +- arch/arm/dts/sun50i-h313-tanix-tx1.dts | 183 ++++++++++++ arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 2 +- arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts | 4 +- arch/arm/dts/sun50i-h5-orangepi-prime.dts | 2 +- arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts | 2 +- arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts | 2 +- arch/arm/dts/sun50i-h6-beelink-gs1.dts | 2 +- arch/arm/dts/sun50i-h6-orangepi-3.dts | 2 +- arch/arm/dts/sun50i-h6-orangepi-lite2.dts | 2 +- arch/arm/dts/sun50i-h6-orangepi.dtsi | 2 +- arch/arm/dts/sun50i-h6-pine-h64-model-b.dts | 6 +- arch/arm/dts/sun50i-h6-pine-h64.dts | 2 +- arch/arm/dts/sun50i-h6.dtsi | 2 +- arch/arm/dts/sun50i-h616-bigtreetech-cb1.dtsi | 5 + arch/arm/dts/sun50i-h616-cpu-opp.dtsi | 115 ++++++++ arch/arm/dts/sun50i-h616-orangepi-zero2.dts | 5 + arch/arm/dts/sun50i-h616-x96-mate.dts | 5 + arch/arm/dts/sun50i-h616.dtsi | 19 +- arch/arm/dts/sun50i-h618-longan-module-3h.dtsi | 5 + arch/arm/dts/sun50i-h618-orangepi-zero2w.dts | 5 + arch/arm/dts/sun50i-h618-orangepi-zero3.dts | 5 + arch/arm/dts/sun50i-h618-transpeed-8k618-t.dts | 7 +- arch/arm/dts/sun50i-h64-remix-mini-pc.dts | 2 +- arch/arm/dts/sun50i-h700-anbernic-rg35xx-2024.dts | 327 ++++++++++++++++++++++ arch/arm/dts/sun50i-h700-anbernic-rg35xx-h.dts | 36 +++ arch/arm/dts/sun50i-h700-anbernic-rg35xx-plus.dts | 53 ++++ arch/arm/dts/sun5i-a13.dtsi | 4 +- arch/arm/dts/sun5i-gr8-chip-pro.dts | 2 +- arch/arm/dts/sun5i-r8-chip.dts | 2 +- arch/arm/dts/sun6i-a31-hummingbird.dts | 4 +- arch/arm/dts/sun6i-a31.dtsi | 16 +- arch/arm/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 2 +- arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts | 2 +- arch/arm/dts/sun7i-a20-cubietruck.dts | 2 +- arch/arm/dts/sun7i-a20-hummingbird.dts | 4 +- arch/arm/dts/sun7i-a20-olimex-som-evb-emmc.dts | 2 +- arch/arm/dts/sun7i-a20-olimex-som204-evb-emmc.dts | 2 +- arch/arm/dts/sun7i-a20-olimex-som204-evb.dts | 4 +- arch/arm/dts/sun7i-a20-olinuxino-lime2.dts | 2 +- arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts | 2 +- arch/arm/dts/sun7i-a20.dtsi | 4 +- arch/arm/dts/sun8i-a23-a33.dtsi | 14 +- arch/arm/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 4 +- arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 4 +- arch/arm/dts/sun8i-a33-ga10h-v1.1.dts | 2 +- arch/arm/dts/sun8i-a33-inet-d978-rev2.dts | 2 +- arch/arm/dts/sun8i-a33.dtsi | 10 +- arch/arm/dts/sun8i-a83t-bananapi-m3.dts | 2 +- arch/arm/dts/sun8i-a83t-cubietruck-plus.dts | 2 +- arch/arm/dts/sun8i-a83t-tbs-a711.dts | 2 +- arch/arm/dts/sun8i-a83t.dtsi | 8 +- arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 2 +- arch/arm/dts/sun8i-h2-plus-orangepi-r1.dts | 5 +- arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts | 6 +- arch/arm/dts/sun8i-h3-beelink-x2.dts | 4 +- arch/arm/dts/sun8i-h3-nanopi-duo2.dts | 4 +- arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts | 4 +- arch/arm/dts/sun8i-h3-nanopi-neo-air.dts | 2 +- arch/arm/dts/sun8i-h3-nanopi-r1.dts | 2 +- arch/arm/dts/sun8i-h3-orangepi-2.dts | 4 +- arch/arm/dts/sun8i-h3-orangepi-lite.dts | 2 +- arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts | 2 +- arch/arm/dts/sun8i-h3-orangepi-zero-plus2.dts | 2 +- arch/arm/dts/sun8i-q8-common.dtsi | 4 +- arch/arm/dts/sun8i-r16-bananapi-m2m.dts | 2 +- arch/arm/dts/sun8i-r16-parrot.dts | 2 +- arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts | 2 +- arch/arm/dts/sun8i-r40-oka40i-c.dts | 2 +- arch/arm/dts/sun8i-s3-pinecube.dts | 2 +- arch/arm/dts/sun8i-v3s.dtsi | 4 +- arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts | 2 +- arch/arm/dts/sun9i-a80.dtsi | 4 +- arch/arm/dts/sunxi-bananapi-m2-plus.dtsi | 2 +- arch/arm/dts/sunxi-h3-h5-emlid-neutis.dtsi | 2 +- arch/arm/dts/sunxi-h3-h5.dtsi | 4 +- board/sunxi/MAINTAINERS | 6 + configs/tanix_tx1_defconfig | 25 ++ drivers/spi/spi-sunxi.c | 16 +- tools/sunxi_toc0.c | 2 +- 89 files changed, 939 insertions(+), 136 deletions(-) create mode 100644 arch/arm/dts/sun50i-h313-tanix-tx1.dts create mode 100644 arch/arm/dts/sun50i-h616-cpu-opp.dtsi create mode 100644 arch/arm/dts/sun50i-h700-anbernic-rg35xx-2024.dts create mode 100644 arch/arm/dts/sun50i-h700-anbernic-rg35xx-h.dts create mode 100644 arch/arm/dts/sun50i-h700-anbernic-rg35xx-plus.dts create mode 100644 configs/tanix_tx1_defconfig

2 1

[GIT PULL] xilinx patches for v2024.07-rc3
by Michal Simek 06 Aug '24

06 Aug '24

Hi Tom, please pull these patches to your tree. I created tag yesterday and push it to gitlab to see issues and rc2 has been created that's why apologize that my tag is using rc2. There are new mini defconfigs but they can't break anything. I am aware about one issue which is in the tree for a while. Please take a look at https://lore.kernel.org/all/CAHTX3d+qAMKgL9T5Fo6y=rvXDiMS_mCiCEGazHt07eiVN3… but I didn't get any reaction from Simon about it yet. Thanks, Michal The following changes since commit 6becf9ba1ab82af6f4fcf9f4d0da38f9c75212d2: Merge tag 'u-boot-imx-master-20240802' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx (2024-08-02 14:40:59 -0600) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-microblaze.git tags/xilinx-for-v2024.10-rc2 for you to fetch changes up to 81b28310628fdfde5e4cbee7a947dad0fc717eb8: soc: zynqmp: Add support for zu1eg_lr device (2024-08-05 16:14:10 +0200) ---------------------------------------------------------------- AMD/Xilinx changes for v2024.10-rc2 amd/xilinx: - Enable CONFIG_MMC_SPEED_MODE_SET env: - support overriding spi dev from board code clk: - Add set_rate support for display clocks spi: - Describe is25lp01gg flash zynq: - Add support for 7z010_lr and 7z020_lr zynqmp: - Add support for zu1eg_lr - Enable NFS for Kria - DT changes - Cleanup firmware handling in board_init() versal-net: - Setup spi seq number based on boot device - dt-schema update for mini configurations versal2: - Disable uartlite driver - Add support for mini configurations - Enable NFS ---------------------------------------------------------------- Manikanta Guntupalli (2): arm64: zynqmp: Add resets property for UART nodes arm64: zynqmp: dts: Add rts delay property for rs485 mode on KD240 Michal Simek (7): arm64: versal2: Remove UARTLITE from defconfig arm64: versal-net: Align node names with dt-schema arm64: versal: Remove undocumented cadence,qspi compatible arm64: xilinx: Describe TPM reset for Kria CCs arm64: zynqmp: Remove PM firmware checking ARM: zynq: Add support for 7z010_lr and 7z020_lr soc: zynqmp: Add support for zu1eg_lr device Prasad Kummari (3): mtd: spi-nor: ids: Add IS25LP01GG flash support xilinx: Enable the NFS command for zynqmp_kria amd: Enable the NFS command for Versal Gen 2 Venkatesh Yadav Abbarapu (8): clk: zynqmp: Add set_rate support for display clocks config: Enable the config CONFIG_MMC_SPEED_MODE_SET env_spi: support overriding spi dev from board code xilinx: versal-net: Handle spi seq number based on boot device arm64: versal2: Add support for mini configuration arm64: Add versal2 mini qspi support arm64: Add versal2 mini ospi support arm64: config: Add versal2 mini emmc defconfig Vishal Patel (1): arm64: zynqmp: Fix pwm-fan polarity arch/arm/dts/amd-versal2-mini.dts | 11 +++ arch/arm/dts/versal-mini-ospi.dtsi | 2 +- arch/arm/dts/versal-net-mini-emmc.dts | 4 +- arch/arm/dts/versal-net-mini-ospi.dtsi | 4 +- arch/arm/dts/versal-net-mini-qspi.dtsi | 2 +- arch/arm/dts/zynqmp-sck-kd-g-revA.dtso | 1 + arch/arm/dts/zynqmp-sm-k26-revA.dts | 2 +- arch/arm/dts/zynqmp.dtsi | 2 + arch/arm/mach-zynq/cpu.c | 2 + board/xilinx/versal-net/board.c | 45 +++++++++++ board/xilinx/zynqmp/zynqmp.c | 13 --- board/xilinx/zynqmp/zynqmp_kria.env | 9 ++- configs/amd_versal2_mini_defconfig | 77 ++++++++++++++++++ configs/amd_versal2_mini_emmc_defconfig | 69 ++++++++++++++++ configs/amd_versal2_mini_ospi_defconfig | 84 ++++++++++++++++++++ configs/amd_versal2_mini_qspi_defconfig | 79 ++++++++++++++++++ configs/amd_versal2_virt_defconfig | 3 +- configs/xilinx_versal_net_virt_defconfig | 1 + configs/xilinx_versal_virt_defconfig | 1 + configs/xilinx_zynq_virt_defconfig | 2 +- configs/xilinx_zynqmp_kria_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 1 + drivers/clk/clk_zynqmp.c | 1 + drivers/mtd/spi/spi-nor-ids.c | 2 + drivers/soc/soc_xilinx_zynqmp.c | 8 ++ env/sf.c | 12 ++- include/configs/amd_versal2_mini.h | 20 +++++ include/spi.h | 2 + include/zynqpl.h | 6 ++ 29 files changed, 440 insertions(+), 26 deletions(-) create mode 100644 arch/arm/dts/amd-versal2-mini.dts create mode 100644 configs/amd_versal2_mini_defconfig create mode 100644 configs/amd_versal2_mini_emmc_defconfig create mode 100644 configs/amd_versal2_mini_ospi_defconfig create mode 100644 configs/amd_versal2_mini_qspi_defconfig create mode 100644 include/configs/amd_versal2_mini.h -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP/Versal ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal/Versal NET SoCs TF-A maintainer - Xilinx ZynqMP/Versal/Versal NET SoCs

2 1

[PATCH v4 0/7] usb: gadget: atmel: Code refactor and DM_USB_GADGET support
by Zixun LI 06 Aug '24

06 Aug '24

Changes in v4: - Release clocks if probe failed - Add missing endpoint data free - Addressed comments Changes in v3: - Separate code refactor into individual commits - Extract the controller point from udevice private data in DM functions Changes in v2: - Fix null pointer deference in driver unbinding - Separate code refactor into 2 parts - Remove dead code Changes in v1: - Based on [PATCH RFC] usb: gadget: atmel: Add DM_USB_GADGET support: https://lists.denx.de/pipermail/u-boot/2024-July/559503.html - Addressed comments, moved the refactoring to a preparatory patch. Zixun LI (7): usb: gadget: atmel: Sort includes usb: gadget: atmel: Replace printf() and pr_err() by log_err() usb: gadget: atmel: Fix typo in usb gadget driver register and unregister usb: gadget: atmel: Move usba_udc_pdata() with other static functions usb: gadget: atmel: Rename atmel_usba_start()/_stop() to usba_udc_enable()/_disable() usb: gadget: atmel: Add attach/detach support usb: gadget: atmel: Add DM_USB_GADGET support drivers/usb/gadget/atmel_usba_udc.c | 256 +++++++++++++++++++++++----- drivers/usb/gadget/atmel_usba_udc.h | 3 + include/linux/usb/atmel_usba_udc.h | 2 + 3 files changed, 214 insertions(+), 47 deletions(-) -- 2.45.2

3 13

[PATCH 0/2] rockchip: Remove files that can be included from dts/upstream
by Jonas Karlman 06 Aug '24

06 Aug '24

Most Rockchip aarch64 targets have now migrated to use OF_UPSTREAM, however a few of the old dtsi and dt-bindings files still remain. This series remove remaining dtsi and header files that can be included directly from dts/upstream. No changes is expected with this series. Jonas Karlman (2): rockchip: px30/rk3326: Use soc dtsi files from dts/upstream rockchip: Use files from dts/upstream arch/arm/dts/px30-firefly.dts | 4 + arch/arm/dts/px30-u-boot.dtsi | 4 + arch/arm/dts/px30.dtsi | 2415 ------------------ arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi | 4 + arch/arm/dts/rk3326.dtsi | 15 - arch/arm/dts/rockchip-pinconf.dtsi | 344 --- include/dt-bindings/clock/px30-cru.h | 389 --- include/dt-bindings/clock/rockchip,rk808.h | 11 - include/dt-bindings/power/px30-power.h | 27 - include/dt-bindings/soc/rockchip,boot-mode.h | 16 - include/dt-bindings/soc/rockchip,vop2.h | 18 - 11 files changed, 12 insertions(+), 3235 deletions(-) delete mode 100644 arch/arm/dts/px30.dtsi delete mode 100644 arch/arm/dts/rk3326.dtsi delete mode 100644 arch/arm/dts/rockchip-pinconf.dtsi delete mode 100644 include/dt-bindings/clock/px30-cru.h delete mode 100644 include/dt-bindings/clock/rockchip,rk808.h delete mode 100644 include/dt-bindings/power/px30-power.h delete mode 100644 include/dt-bindings/soc/rockchip,boot-mode.h delete mode 100644 include/dt-bindings/soc/rockchip,vop2.h -- 2.45.2

2 4

[PATCH v2 1/2] spi: sunxi: fix CDR2 calculation
by Michael Walle 06 Aug '24

06 Aug '24

The CDR2 divider calculation always yield a frequency greater than the requested one. Use DIV_ROUND_UP() to keep the frequency equal or below the requested one. This way, we can also drop the "if div > 0" check because we know for a fact that div cannot be zero. FWIW, this aligns the CDR2 calculation with the linux driver. Suggested-by: Andre Przywara <andre.przywara(a)arm.com> Signed-off-by: Michael Walle <mwalle(a)kernel.org> --- drivers/spi/spi-sunxi.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c index bfb402902b8..f110a8b7658 100644 --- a/drivers/spi/spi-sunxi.c +++ b/drivers/spi/spi-sunxi.c @@ -233,7 +233,7 @@ err_ahb: static void sun4i_spi_set_speed_mode(struct udevice *dev) { struct sun4i_spi_priv *priv = dev_get_priv(dev); - unsigned int div; + unsigned int div, div_cdr2; u32 reg; /* @@ -259,15 +259,12 @@ static void sun4i_spi_set_speed_mode(struct udevice *dev) */ div = DIV_ROUND_UP(SUNXI_INPUT_CLOCK, priv->freq); + div_cdr2 = DIV_ROUND_UP(div, 2); reg = readl(SPI_REG(priv, SPI_CCR)); - if ((div / 2) <= (SUN4I_CLK_CTL_CDR2_MASK + 1)) { - div /= 2; - if (div > 0) - div--; - + if (div_cdr2 <= (SUN4I_CLK_CTL_CDR2_MASK + 1)) { reg &= ~(SUN4I_CLK_CTL_CDR2_MASK | SUN4I_CLK_CTL_DRS); - reg |= SUN4I_CLK_CTL_CDR2(div) | SUN4I_CLK_CTL_DRS; + reg |= SUN4I_CLK_CTL_CDR2(div_cdr2 - 1) | SUN4I_CLK_CTL_DRS; } else { div = fls(div - 1); /* The F1C100s encodes the divider as 2^(n+1) */ -- 2.39.2

2 3

[PATCH v2] boot: android: fix booting without a ramdisk
by Michael Walle 06 Aug '24

06 Aug '24

android_image_get_ramdisk() will return an error if there is no ramdisk. Using the android image without a ramdisk worked until commit 1ce8e10f3b4b ("image: Fix up ANDROID_BOOT_IMAGE ramdisk code") because the return code wasn't checked until then. Return -ENOENT in case there is no ramdisk and translate that into -ENOPKG in the calling code, which will then indicate "no ramdisk" to its caller (boot_get_ramdisk()). This way, we can get rid of the "*rd_data = *rd_len = 0;" in the error path, too. With this, I'm able to boot a linux kernel using fastboot again: fastboot --base 0x41000000 --header-version 2 --dtb /path/to/dtb \ --cmdline "root=/dev/mmcblk0p1 rootwait" boot path/to/Image Signed-off-by: Michael Walle <mwalle(a)kernel.org> --- boot/image-android.c | 7 +++---- boot/image-board.c | 4 +++- include/image.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/boot/image-android.c b/boot/image-android.c index 09c7a44e058..774565fd1fe 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -393,10 +393,9 @@ int android_image_get_ramdisk(const void *hdr, const void *vendor_boot_img, if (!android_image_get_data(hdr, vendor_boot_img, &img_data)) return -EINVAL; - if (!img_data.ramdisk_size) { - *rd_data = *rd_len = 0; - return -1; - } + if (!img_data.ramdisk_size) + return -ENOENT; + if (img_data.header_version > 2) { ramdisk_ptr = img_data.ramdisk_addr; memcpy((void *)(ramdisk_ptr), (void *)img_data.vendor_ramdisk_ptr, diff --git a/boot/image-board.c b/boot/image-board.c index f2124013046..eca1b1d2bff 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -427,7 +427,9 @@ static int select_ramdisk(struct bootm_headers *images, const char *select, u8 a unmap_sysmem(ptr); } - if (ret) + if (ret == -ENOENT) + return -ENOPKG; + else if (ret) return ret; done = true; } diff --git a/include/image.h b/include/image.h index dd4042d1bd9..2ab17075287 100644 --- a/include/image.h +++ b/include/image.h @@ -1858,7 +1858,7 @@ int android_image_get_kernel(const void *hdr, * @vendor_boot_img : Pointer to vendor boot image header * @rd_data: Pointer to a ulong variable, will hold ramdisk address * @rd_len: Pointer to a ulong variable, will hold ramdisk length - * Return: 0 if succeeded, -1 if ramdisk size is 0 + * Return: 0 if OK, -ENOPKG if no ramdisk, -EINVAL if invalid image */ int android_image_get_ramdisk(const void *hdr, const void *vendor_boot_img, ulong *rd_data, ulong *rd_len); -- 2.39.2

3 5