June 2024 - U-Boot

[PATCH] arm: davinci: remove unused defines
by Emil Kronborg 27 Jun '24

27 Jun '24

The last usage of the DV_TIMER_ and DV_WDT_ definitions were removed in commits 8d7757637138 ("ARM: davinci: remove support for cam_enc_4xx") and cef443c1666c ("arm: davinci: remove leftover code for dm* SoCs"), respectively. Signed-off-by: Emil Kronborg <emil.kronborg(a)protonmail.com> --- arch/arm/mach-davinci/include/mach/timer_defs.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/arch/arm/mach-davinci/include/mach/timer_defs.h b/arch/arm/mach-davinci/include/mach/timer_defs.h index 110e67e454ce..38188dc699cf 100644 --- a/arch/arm/mach-davinci/include/mach/timer_defs.h +++ b/arch/arm/mach-davinci/include/mach/timer_defs.h @@ -20,22 +20,6 @@ struct davinci_timer { u_int32_t wdtcr; }; -#define DV_TIMER_TCR_ENAMODE_MASK 3 - -#define DV_TIMER_TCR_ENAMODE12_SHIFT 6 -#define DV_TIMER_TCR_CLKSRC12_SHIFT 8 -#define DV_TIMER_TCR_READRSTMODE12_SHIFT 10 -#define DV_TIMER_TCR_CAPMODE12_SHIFT 11 -#define DV_TIMER_TCR_CAPVTMODE12_SHIFT 12 -#define DV_TIMER_TCR_ENAMODE34_SHIFT 22 -#define DV_TIMER_TCR_CLKSRC34_SHIFT 24 -#define DV_TIMER_TCR_READRSTMODE34_SHIFT 26 -#define DV_TIMER_TCR_CAPMODE34_SHIFT 27 -#define DV_TIMER_TCR_CAPEVTMODE12_SHIFT 28 - -#define DV_WDT_ENABLE_SYS_RESET 0x00020000 -#define DV_WDT_TRIGGER_SYS_RESET 0x00020002 - #ifdef CONFIG_HW_WATCHDOG void davinci_hw_watchdog_enable(void); void davinci_hw_watchdog_reset(void); base-commit: 01a5d7547ed3a51a8ac5837c31a150f85bc475f8 -- 2.45.2

3 2

[PATCH v1 0/1] Adjust Tegra boot order
by Svyatoslav Ryhel 27 Jun '24

27 Jun '24

This ensures that the device can boot from a USB device prior to MMC. Useful cases are when installing a new OS from USB while MMC still has a working OS configuration or if the OS configuration is broken in late boot stages (kernel boots but the system does not start). Svyatoslav Ryhel (1): include: configs: tegra-common-post: make usb first boot target include/configs/tegra-common-post.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.43.0

3 6

[PATCH 1/3] cmd: mtd: add markbad command support
by Mikhail Kshevetskiy 27 Jun '24

27 Jun '24

Some nand flashes (like spi-nand one) are registered with mtd subsystem only, thus nand command can't be used to work with such flashes. As result some functionality is missing. This patch implements 'nand markbad' functionality for mtd command. Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy(a)iopsys.eu> --- cmd/Kconfig | 6 ++++++ cmd/mtd.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/cmd/Kconfig b/cmd/Kconfig index 6834bbd82f3..70c2d6a2dda 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1418,6 +1418,12 @@ config CMD_MTD_OTP help MTD commands for OTP access. +config CMD_MTD_MARKBAD + bool "mtd markbad" + depends on CMD_MTD + help + MTD markbad command support. + config CMD_MUX bool "mux" depends on MULTIPLEXER diff --git a/cmd/mtd.c b/cmd/mtd.c index 9189f45cabd..18f00493780 100644 --- a/cmd/mtd.c +++ b/cmd/mtd.c @@ -692,6 +692,57 @@ out_put_mtd: return ret; } +#ifdef CONFIG_CMD_MTD_MARKBAD +static int do_mtd_markbad(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + struct mtd_info *mtd; + loff_t off; + int ret = 0; + + if (argc < 3) + return CMD_RET_USAGE; + + mtd = get_mtd_by_name(argv[1]); + if (IS_ERR_OR_NULL(mtd)) + return CMD_RET_FAILURE; + + if (!mtd_can_have_bb(mtd)) { + printf("Only NAND-based devices can have bad blocks\n"); + goto out_put_mtd; + } + + argc -= 2; + argv += 2; + while (argc > 0) { + off = hextoul(argv[0], NULL); + if (!mtd_is_aligned_with_block_size(mtd, off)) { + printf("Offset not aligned with a block (0x%x)\n", + mtd->erasesize); + ret = CMD_RET_FAILURE; + goto out_put_mtd; + } + + ret = mtd_block_markbad(mtd, off); + if (ret) { + printf("block 0x%08llx NOT marked as bad! ERROR %d\n", + off, ret); + ret = CMD_RET_FAILURE; + } else { + printf("block 0x%08llx successfully marked as bad\n", + off); + } + --argc; + ++argv; + } + +out_put_mtd: + put_mtd_device(mtd); + + return ret; +} +#endif + static int do_mtd_bad(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { @@ -774,6 +825,9 @@ U_BOOT_LONGHELP(mtd, "mtd otpwrite <name> <off> <hex string>\n" "mtd otplock <name> <off> <size>\n" "mtd otpinfo <name> [u|f]\n" +#endif +#ifdef CONFIG_CMD_MTD_MARKBAD + "mtd markbad <name> <off> [<off> ...]\n" #endif "\n" "With:\n" @@ -808,5 +862,9 @@ U_BOOT_CMD_WITH_SUBCMDS(mtd, "MTD utils", mtd_help_text, mtd_name_complete), U_BOOT_SUBCMD_MKENT_COMPLETE(erase, 4, 0, do_mtd_erase, mtd_name_complete), +#ifdef CONFIG_CMD_MTD_MARKBAD + U_BOOT_SUBCMD_MKENT_COMPLETE(markbad, 20, 0, do_mtd_markbad, + mtd_name_complete), +#endif U_BOOT_SUBCMD_MKENT_COMPLETE(bad, 2, 1, do_mtd_bad, mtd_name_complete)); -- 2.43.0

1 2

[PATCH 01/79] net/tftp: make tftpput working with servers that do not use OACK
by Mikhail Kshevetskiy 27 Jun '24

27 Jun '24

Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy(a)iopsys.eu> --- net/tftp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net/tftp.c b/net/tftp.c index 2e335413492..2534dec1c9f 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -494,8 +494,15 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, tftp_prev_block = tftp_cur_block; tftp_cur_block = (unsigned short)(block + 1); update_block_number(); - if (ack_ok) + if (ack_ok) { + if (block == 0 && + tftp_state == STATE_SEND_WRQ){ + /* connection's first ACK */ + tftp_state = STATE_DATA; + tftp_remote_port = src; + } tftp_send(); /* Send next data block */ + } } } #endif -- 2.43.0

1 0

[PATCH v5 00/16] Bug-fixes for a few boards
by Simon Glass 27 Jun '24

27 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). Note that since this series fixes bugs, it is targeted at -master Changes in v5: - Move setting of pmugrf into the probe() function Changes in v4: - Drop Fixes tag - Add new patch to set a board-size limit for chromebook_link - Fix 'stating' typo - Move Binman size feature to a separate series Changes in v3: - Use BLOBLIST instead of OF_BLOBLIST - Cut the patch down to bare bones - Split out the refactoring into a separate patch 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 (16): 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 nvidia: nyan-big: Disable debug UART tpm: Avoid code bloat when not using EFI_TCG2_PROTOCOL x86: Set a board-size limit for chromebook_link 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 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/chromebook_link_defconfig | 2 + 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 | 35 ++++---- lib/Kconfig | 4 - lib/fdtdec.c | 12 ++- tools/binman/btool/mkeficapsule.py | 3 +- tools/binman/etype/efi_capsule.py | 5 +- tools/mkeficapsule.c | 10 ++- 19 files changed, 80 insertions(+), 156 deletions(-) delete mode 100644 configs/am335x_boneblack_vboot_defconfig -- 2.34.1

3 22

[PATCH v6 0/8] Second part of bug-fixes series
by Simon Glass 27 Jun '24

27 Jun '24

This consists of some patches split ouf from an earlier series [1]. Apart from the fdt patch they are not needed for the upcoming release. The FDT patch fixes a boot problem on several Chromebooks. [1] https://patchwork.ozlabs.org/project/uboot/patch/20240626155945.278640-15-s… Changes in v6: Take account of ROCKCHIP_EXTERNAL_TPL in phase_sdram_init() Changes in v5: - Move setting of pmugrf into the probe() function Changes in v4: - Drop Fixes tag Changes in v3: - Use BLOBLIST instead of OF_BLOBLIST - Cut the patch down to bare bones - Split out the refactoring into a separate patch Changes in v2: - Use 'phase' instead of 'stage' - Add new patch to correct memory size in SPL Simon Glass (8): 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 fdt: Correct condition for bloblist existing rockchip: Ensure memory size is available in RK3399 SPL rockchip: Avoid #ifdefs in RK3399 SPL doc/mkeficapsule.1 | 4 ++++ drivers/ram/rockchip/sdram_rk3399.c | 37 +++++++++++++++-------------- lib/fdtdec.c | 12 ++++++++-- tools/binman/btool/mkeficapsule.py | 3 ++- tools/binman/etype/efi_capsule.py | 5 +++- tools/mkeficapsule.c | 10 ++++++-- 6 files changed, 47 insertions(+), 24 deletions(-) -- 2.34.1

1 8

[PATCH] doc: fit: Make data-size a conditionally mandatory property
by Bastian Germann 27 Jun '24

27 Jun '24

Before 9d0750064e (doc: Move external FIT docs into the main body), the FIT property data-size was not a mandatory property and still it is not expected to be set alongside the data property. Move the data-size property to the "Conditionally mandatory property" section, where it actually belongs. Signed-off-by: Bastian Germann <bage(a)debian.org> --- doc/usage/fit/source_file_format.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/usage/fit/source_file_format.rst b/doc/usage/fit/source_file_format.rst index 7727ab77c5..15990e3ff5 100644 --- a/doc/usage/fit/source_file_format.rst +++ b/doc/usage/fit/source_file_format.rst @@ -254,9 +254,6 @@ compression zstd zstd compressed ==================== ================== -data-size - size of the data in bytes - Conditionally mandatory property ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -276,6 +273,9 @@ data-position not relative to the loading of the FIT. This is mandatory if external data used with a fixed address. +data-size + Size of the data in bytes. This is mandatory if external data is used. + os OS name, mandatory for types "kernel". Valid OS names are: -- 2.45.2

2 3

[PATCH v4 00/16] Bug-fixes for a few boards
by Simon Glass 26 Jun '24

26 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). Note that since this series fixes bugs, it is targeted at -master Changes in v4: - Drop Fixes tag - Add new patch to set a board-size limit for chromebook_link - Drop the non-dcache optimisation, since the cache should normally be on - Move Binman size feature to a separate series Changes in v3: - Use BLOBLIST instead of OF_BLOBLIST - Cut the patch down to bare bones - Split out the refactoring into a separate patch 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 (16): 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 nvidia: nyan-big: Disable debug UART tpm: Avoid code bloat when not using EFI_TCG2_PROTOCOL x86: Set a board-size limit for chromebook_link 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 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/chromebook_link_defconfig | 2 + 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 | 44 +++++----- lib/Kconfig | 4 - lib/fdtdec.c | 12 ++- tools/binman/btool/mkeficapsule.py | 3 +- tools/binman/etype/efi_capsule.py | 5 +- tools/mkeficapsule.c | 10 ++- 19 files changed, 86 insertions(+), 159 deletions(-) delete mode 100644 configs/am335x_boneblack_vboot_defconfig -- 2.34.1

3 23

[PATCH v3 0/3] arm64: add a software pagetable walker
by Caleb Connolly 26 Jun '24

26 Jun '24

MMU issues are some of the most frustrating to debug. To make this slightly less unbearable, introduce a software pagetable walker for ARMv8. This can be called to dump a pagetable with the default formatter, or a custom callback can be provided to implement more complicated parsing. This can also be useful to dump the pagetable used by a previous bootloader stage (by reading out the ttbr register). Here is an example of the output when walking U-Boot's own memory map on a Qualcomm RB3 board: Walking pagetable at 000000017df90000, va_bits: 36. Using 3 levels [0x17df91000] | Table | | [0x17df92000] | Table | | [0x000001000 - 0x000200000] | Pages | Device-nGnRnE | Non-shareable [0x000200000 - 0x040000000] | Block | Device-nGnRnE | Non-shareable [0x040000000 - 0x080000000] | Block | Device-nGnRnE | Non-shareable [0x080000000 - 0x140000000] | Block | Normal | Inner-shareable [0x17df93000] | Table | | [0x140000000 - 0x17de00000] | Block | Normal | Inner-shareable [0x17df94000] | Table | | [0x17de00000 - 0x17dfa0000] | Pages | Normal | Inner-shareable --- Changes in v3: - Add doc comments to __pagetable_walk() - Include doc comments in documentation with kernel-doc:: - Link to v2: https://lore.kernel.org/r/20240607-caleb-upstreaming-v2-0-bae407f51f22@lina… Changes in v2: - Document the MMU debugging features in doc/arch/arm64.rst - Mention that functions are stripped out when unused. - Link to v1: https://lore.kernel.org/r/20240607-caleb-upstreaming-v1-0-99094dabb3d9@lina… --- Caleb Connolly (3): arm64: mmu.h: fix PTE_TABLE_AP arm64: add software pagetable walker doc: arch: arm64: describe pagetable debugging arch/arm/cpu/armv8/cache_v8.c | 245 +++++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/armv8/mmu.h | 58 ++++++++- doc/arch/arm64.rst | 49 ++++++++ 3 files changed, 351 insertions(+), 1 deletion(-) --- change-id: 20240607-caleb-upstreaming-82744a2786b3 base-commit: 5cff71259b26b73ed0e9e9acd12d16a4d8ede04b // Caleb (they/them)

2 4

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

26 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> --- Changes in v2: - Update commit message in patch 1 to specify why we use _ in the set_mode callback - Link to v1: https://lore.kernel.org/r/20240618-u-boot-usb-gxl-phy-set-mode-v1-0-6b41efa… --- 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 13