January 2022 - U-Boot

[PATCH] arm: pdu001: Exend the list of maintained files
by Felix Brack 04 Feb '22

04 Feb '22

Add the PDU001 board specific DT files to MAINTAINERS. This should help for better tracking of changes to these files. Signed-off-by: Felix Brack <fb(a)ltec.ch> --- board/eets/pdu001/MAINTAINERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/board/eets/pdu001/MAINTAINERS b/board/eets/pdu001/MAINTAINERS index 95295ddea9..6997c8d63e 100644 --- a/board/eets/pdu001/MAINTAINERS +++ b/board/eets/pdu001/MAINTAINERS @@ -1,6 +1,8 @@ PDU001 BOARD M: Felix Brack <fb(a)ltec.ch> S: Maintained -F: board/eets/pdu001/ +F: board/eets/ F: include/configs/pdu001.h F: configs/am335x_pdu001_defconfig +F: arch/arm/dts/am335x-pdu001-u-boot.dtsi +F: arch/arm/dts/am335x-pdu001.dts -- 2.25.1

2 1

[PATCH] net: ti: am65-cpsw: Cleanup resources before jump to kernel
by Vignesh Raghavendra 04 Feb '22

04 Feb '22

In case fastboot over Ethernet, am65_cpsw_stop() is not called unless DM_FLAG_OS_PREPARE is set. Without call to am65_cpsw_stop(), DMA resources are not released thus leading to failures in kernel. Fix this by adding DM_FLAG_OS_PREPARE flag to am65_cpsw_nuss_port driver. Reported-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> Signed-off-by: Vignesh Raghavendra <vigneshr(a)ti.com> --- drivers/net/ti/am65-cpsw-nuss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c index 454986ff15..87f51b3b99 100644 --- a/drivers/net/ti/am65-cpsw-nuss.c +++ b/drivers/net/ti/am65-cpsw-nuss.c @@ -817,5 +817,5 @@ U_BOOT_DRIVER(am65_cpsw_nuss_port) = { .ops = &am65_cpsw_ops, .priv_auto = sizeof(struct am65_cpsw_priv), .plat_auto = sizeof(struct eth_pdata), - .flags = DM_FLAG_ALLOC_PRIV_DMA, + .flags = DM_FLAG_ALLOC_PRIV_DMA | DM_FLAG_OS_PREPARE, }; -- 2.35.0

3 2

[PATCH] scripts: Makefile: also clean subdir dtc
by Philippe Reynes 04 Feb '22

04 Feb '22

Since commit 93b196532254 ("Makefile: Only build dtc if needed"), the sub directory scripts/dtc is never cleaned. Adds the directory dtc to subdir to always clean it. Signed-off-by: Philippe Reynes <philippe.reynes(a)softathome.com> --- scripts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile b/scripts/Makefile index cfe9fef804..8731e6cecd 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -9,4 +9,4 @@ hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c always := $(hostprogs-y) # Let clean descend into subdirs -subdir- += basic kconfig +subdir- += basic kconfig dtc -- 2.17.1

3 2

[PATCH] armv8: start.S: remove CONFIG_SYS_RESET_SCTRL code
by Andre Przywara 04 Feb '22

04 Feb '22

There is some code that tries to "reset" the SCTLR_ELx register early in the boot process. The idea seems to be to guarantee some sane settings that U-Boot actually relies on, for instance running in little-endian mode, with the MMU off initially. However the current code has multiple problems: - For a start, no platform or config defines the symbol that would enable that code. - The code itself really only works if the bits that it tries to clear are already cleared: - If we run in big-endian mode initially, any previous loads would have been wrong already. That applies to the (optional) relocation code, but more prominently to the mask that it uses to clear those bits: "ldr x1, =0xfdfffffa" looks innocent, but actually involves a memory access to the literal pool, using the current endianess. - If we run with the MMU enabled, we are probably doomed already. We *could* hope that we are running with an identity mapping, but would need to do some cache maintenance to avoid losing dirty cache lines. - The idea of doing a read-modify-write of SCTLR is somewhat questionable to begin with, because as the owner of the current exception level we should initialise all bits of this register with a certain fixed value. - The code is unnecessarily complicated, and the function name is misspelled. While those problems *could* admittedly be fixed, the point that is does not seem to be used at all at the moment tells me we should just remove this code, and be it to not give a bad example. If people care, I could introduce some proper SCTLR initialisation code. We are about to work this out for the boot-wrapper[1] as we speak, but apparently we got away without doing this in U-Boot ever since, so it might not be worth the potential trouble. [1] https://lore.kernel.org/linux-arm-kernel/20220114105653.3003399-7-mark.rutl… Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> --- arch/arm/cpu/armv8/start.S | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index b3eef705a5..91b00a46cc 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -104,10 +104,6 @@ pie_skip_reloc: pie_fixup_done: #endif -#ifdef CONFIG_SYS_RESET_SCTRL - bl reset_sctrl -#endif - #if defined(CONFIG_ARMV8_SPL_EXCEPTION_VECTORS) || !defined(CONFIG_SPL_BUILD) .macro set_vbar, regname, reg msr \regname, \reg @@ -195,39 +191,6 @@ slave_cpu: master_cpu: bl _main -#ifdef CONFIG_SYS_RESET_SCTRL -reset_sctrl: - switch_el x1, 3f, 2f, 1f -3: - mrs x0, sctlr_el3 - b 0f -2: - mrs x0, sctlr_el2 - b 0f -1: - mrs x0, sctlr_el1 - -0: - ldr x1, =0xfdfffffa - and x0, x0, x1 - - switch_el x1, 6f, 5f, 4f -6: - msr sctlr_el3, x0 - b 7f -5: - msr sctlr_el2, x0 - b 7f -4: - msr sctlr_el1, x0 - -7: - dsb sy - isb - b __asm_invalidate_tlb_all - ret -#endif - /*-----------------------------------------------------------------------*/ WEAK(apply_core_errata) -- 2.25.1

3 2

[PATCH v5 0/4] Fix compiler warnings for 32-bit ARM
by Simon Glass 04 Feb '22

04 Feb '22

These were noticed when building sandbox on a Raspberry Pi 400, which uses 32-bit linux. To make this work, I enabled CONFIG_HOST_32BIT in 'make menuconfig'. It would be nice if that were automatic, since we have the logic already in arch/sandbox/config.mk So this series adds that. It also fixes the unicode warnings of the form: /usr/bin/ld: warning: arch/sandbox/cpu/start.o uses 2-byte wchar_t yet the output is to use 4-byte wchar_t; use of wchar_t values across objects may fail as suggested by Heinrich. Changes in v5: - Resync with upstream instead Changes in v4: - Rebase to master - Use $(HOSTCC) instead of gcc - Add proper Kconfig help Changes in v3: - Change some things EFI things missed (or new since) last time - Use 'bitness' instead of 'bit' - Add a new patch to change non-EFI occurences Changes in v2: - Drop patches previously applied - Put all the packages in gcc.rst Simon Glass (4): scripts/checkpatch.pl: Resync with v5.16 efi: Use 16-bit unicode strings sandbox: Detect the host bit size automatically treewide: Use 16-bit unicode strings Makefile | 11 +- arch/sandbox/Kconfig | 33 +- cmd/efidebug.c | 28 +- doc/develop/checkpatch.rst | 590 ++++++++++++++++-- include/efi_loader.h | 2 +- include/efi_selftest.h | 4 +- lib/efi_loader/efi_bootmgr.c | 12 +- lib/efi_loader/efi_boottime.c | 2 +- lib/efi_loader/efi_capsule.c | 22 +- lib/efi_loader/efi_helper.c | 2 +- lib/efi_loader/efi_image_loader.c | 8 +- lib/efi_loader/efi_setup.c | 14 +- lib/efi_loader/efi_string.c | 2 +- lib/efi_loader/efi_tcg2.c | 4 +- lib/efi_loader/efi_var_common.c | 12 +- lib/efi_loader/efi_variable.c | 6 +- lib/efi_loader/efi_variable_tee.c | 2 +- lib/efi_loader/helloworld.c | 40 +- lib/efi_selftest/dtbdump.c | 82 +-- lib/efi_selftest/efi_selftest.c | 2 +- lib/efi_selftest/efi_selftest_block_device.c | 6 +- lib/efi_selftest/efi_selftest_devicepath.c | 2 +- lib/efi_selftest/efi_selftest_exception.c | 2 +- lib/efi_selftest/efi_selftest_fdt.c | 6 +- lib/efi_selftest/efi_selftest_hii.c | 8 +- lib/efi_selftest/efi_selftest_load_file.c | 4 +- lib/efi_selftest/efi_selftest_loadimage.c | 4 +- .../efi_selftest_miniapp_exception.c | 4 +- lib/efi_selftest/efi_selftest_miniapp_exit.c | 8 +- .../efi_selftest_miniapp_return.c | 2 +- lib/efi_selftest/efi_selftest_reset.c | 2 +- lib/efi_selftest/efi_selftest_textoutput.c | 12 +- .../efi_selftest_unicode_collation.c | 38 +- lib/efi_selftest/efi_selftest_util.c | 106 ++-- lib/efi_selftest/efi_selftest_variables.c | 22 +- .../efi_selftest_variables_runtime.c | 4 +- lib/efi_selftest/initrddump.c | 60 +- lib/lzma/Types.h | 4 +- lib/vsprintf.c | 2 +- scripts/checkpatch.pl | 145 +++-- scripts/kconfig/Makefile | 14 +- scripts/spdxcheck.py | 2 +- test/print_ut.c | 2 +- test/unicode_ut.c | 22 +- 44 files changed, 974 insertions(+), 385 deletions(-) -- 2.35.0.rc0.227.g00780c9af4-goog

3 10

[PATCH V3] usb: ehci-mx6: Enable OTG detection on imx8mm and imx8mn
by Adam Ford 03 Feb '22

03 Feb '22

The imx8mm and imx8mn appear compatible with imx7d-usb flags in the OTG driver. If the dr_mode is defined as host or peripheral, the device appears to operate correctly, however the auto host/peripheral detection results in an error. The solution isn't just adding checks for imx8mm and imx8mn to the check for imx7, because the USB clock needs to be running to read from the USBNC_PHY_STATUS_OFFSET register or it will hang. Marek requested that I not enable the clocks in ehci_usb_of_to_plat, so I modified that function to return an unknown state if the device tree does not explicitly state whether it is a host or a peripheral. When the driver probes, it looks to see if it's in the unknown state, and only then will it read the register to auto-detect. Signed-off-by: Adam Ford <aford173(a)gmail.com> --- V3: Keep ehci_usb_of_to_plat but add the ability to return and unknown state instead of reading the register. If the probe determines the states is unknown, it will query the register after the clocks have been enabled. Because of the slight behavior change, I removed any review or tested tags. V2: Rename ehci_usb_of_to_plat to ehci_usb_dr_mode and call it from the probe after the clocks are enabled, but before the data is needed. diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 1bd6147c76..cf44e53ff7 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -543,7 +543,7 @@ static int ehci_usb_phy_mode(struct udevice *dev) plat->init_type = USB_INIT_DEVICE; else plat->init_type = USB_INIT_HOST; - } else if (is_mx7()) { + } else if (is_mx7() || is_imx8mm() || is_imx8mn()) { phy_status = (void __iomem *)(addr + USBNC_PHY_STATUS_OFFSET); val = readl(phy_status); @@ -573,9 +573,8 @@ static int ehci_usb_of_to_plat(struct udevice *dev) case USB_DR_MODE_PERIPHERAL: plat->init_type = USB_INIT_DEVICE; break; - case USB_DR_MODE_OTG: - case USB_DR_MODE_UNKNOWN: - return ehci_usb_phy_mode(dev); + default: + plat->init_type = USB_INIT_UNKNOWN; }; return 0; @@ -677,6 +676,20 @@ static int ehci_usb_probe(struct udevice *dev) mdelay(1); #endif + /* + * If the device tree didn't specify host or device, + * the default is USB_INIT_UNKNOWN, so we need to check + * the register. For imx8mm and imx8mn, the clocks need to be + * running first, so we defer the check until they are. + */ + if (priv->init_type == USB_INIT_UNKNOWN) { + ret = ehci_usb_phy_mode(dev); + if (ret) + goto err_clk; + else + priv->init_type = plat->init_type; + } + #if CONFIG_IS_ENABLED(DM_REGULATOR) ret = device_get_supply_regulator(dev, "vbus-supply", &priv->vbus_supply); diff --git a/include/usb.h b/include/usb.h index b3851fdb4f..47d738a786 100644 --- a/include/usb.h +++ b/include/usb.h @@ -163,7 +163,8 @@ struct int_queue; */ enum usb_init_type { USB_INIT_HOST, - USB_INIT_DEVICE + USB_INIT_DEVICE, + USB_INIT_UNKNOWN, }; /********************************************************************** -- 2.32.0

5 8

[RFC 0/2] A/B firmware update based in eMMC boot partition.
by Ying-Chun Liu 03 Feb '22

03 Feb '22

From: "Ying-Chun Liu (PaulLiu)" <paul.liu(a)linaro.org> Hi all, I've implemented A/B firmware update based on eMMC hw partitions. Normally we have 2 boot partitions on eMMC. One is active and another is inactive. We can then flash the firmware to the inactive one and make it active. Also when booting we can write protect the current active one. And left the inactive partition still writable. So I make 2 commits that implements the following features: 1. Write protect "active" boot area when board init. 2. flash firmware to inactive boot area. 3. Change the inactive boot area after firmware update. Thanks. Ying-Chun Liu (PaulLiu) (2): drivers: mmc: write protect active boot area after mmc init. drivers: dfu: flash firmware to inactive boot area and active it drivers/dfu/dfu_mmc.c | 32 +++++++++++++++++++++--- drivers/mmc/Kconfig | 10 ++++++++ drivers/mmc/mmc.c | 58 +++++++++++++++++++++++++++++++++++++++++++ include/dfu.h | 1 + 4 files changed, 98 insertions(+), 3 deletions(-) -- 2.34.1

6 8

[PATCH] sandbox: fix build failure with musl and SDL
by Heinrich Schuchardt 03 Feb '22

03 Feb '22

sdl.c is compiled against the SDL library. Trying to redefine wchar_t with -fshort-wchar is not necessary and leads to build failures when compiling against musl. Cc: Milan P. Stanić <mps(a)arvanta.net> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- arch/sandbox/Makefile | 7 +++++++ arch/sandbox/cpu/Makefile | 11 ++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile index f6cf859f24..0bdd322f12 100644 --- a/arch/sandbox/Makefile +++ b/arch/sandbox/Makefile @@ -4,3 +4,10 @@ head-y := arch/sandbox/cpu/start.o arch/sandbox/cpu/os.o head-$(CONFIG_SANDBOX_SDL) += arch/sandbox/cpu/sdl.o libs-y += arch/sandbox/cpu/ libs-y += arch/sandbox/lib/ + +# sdl.c fails to compile with -fshort-wchar using musl. +cmd_cc_sdl.o = $(CC) $(filter-out -nostdinc -fshort-wchar, \ + $(patsubst -I%,-idirafter%,$(c_flags))) -c -o $@ $< + +$(obj)/sdl.o: $(src)/sdl.c FORCE + $(call if_changed_dep,cc_sdl.o) diff --git a/arch/sandbox/cpu/Makefile b/arch/sandbox/cpu/Makefile index de7fe7f391..b74c866e56 100644 --- a/arch/sandbox/cpu/Makefile +++ b/arch/sandbox/cpu/Makefile @@ -7,7 +7,7 @@ obj-y := cache.o cpu.o state.o extra-y := start.o os.o -extra-$(CONFIG_SANDBOX_SDL) += sdl.o +extra-$(CONFIG_SANDBOX_SDL) += sdl.o obj-$(CONFIG_SPL_BUILD) += spl.o obj-$(CONFIG_ETH_SANDBOX_RAW) += eth-raw-os.o @@ -19,8 +19,6 @@ cmd_cc_os.o = $(CC) $(filter-out -nostdinc, \ $(obj)/os.o: $(src)/os.c FORCE $(call if_changed_dep,cc_os.o) -$(obj)/sdl.o: $(src)/sdl.c FORCE - $(call if_changed_dep,cc_os.o) # eth-raw-os.c is built in the system env, so needs standard includes # CFLAGS_REMOVE_eth-raw-os.o cannot be used to drop header include path @@ -30,3 +28,10 @@ cmd_cc_eth-raw-os.o = $(CC) $(filter-out -nostdinc, \ $(obj)/eth-raw-os.o: $(src)/eth-raw-os.c FORCE $(call if_changed_dep,cc_eth-raw-os.o) + +# sdl.c fails to build with -fshort-wchar using musl +cmd_cc_sdl.o = $(CC) $(filter-out -nostdinc -fshort-wchar, \ + $(patsubst -I%,-idirafter%,$(c_flags))) -c -o $@ $< + +$(obj)/sdl.o: $(src)/sdl.c FORCE + $(call if_changed_dep,cc_sdl.o) -- 2.33.1

4 5

Raw Kernel Image Support for Falcon Mode Boot Via SPI Devices
by Nathan Barrett-Morrison 02 Feb '22

02 Feb '22

Hi All, While trying to bring up Falcon Mode boot on an ARM64 board, I've discovered that the SPL+SPI(spl_spi.c) driver does not allow us to load a raw kernel image and subsequently call the bootz_setup() function which resides in spl_parse_image_header(). I've added a new config option (CONFIG_SYS_SPI_KERNEL_SKIP_HEADER) which will skip the mkimage header check, allowing the subsequent spl_parse_image_header() call to successfully fall through to bootz_setup() and load/boot a raw kernel image. Sincerely, Nathan Barrett-Morrison

2 4

[PATCH 00/10] board: sl28: add sl28cpld support and board cleanups
by Michael Walle 02 Feb '22

02 Feb '22

Add support for the sl28cpld management controller found on this board. This is especially useful, because of the integrated watchdog in this controller. It is used to supervise the bootup of the bootloader and will automatically switch to the failsafe bootloader if u-boot didn't start. Up until now, we had to disable this feature, leaving a gap in the failsafe boot concept of this board. Now, with this driver in place, this watchdog can be enabled at reset and u-boot will disable it late during its startup. Additionally, add support for the GPIOs which are connected to this controller. Besides this support, there are various cleanups, like DRAM output fix, printing the version of the management controller and disabling the random MAC address generation. Implementationwise, the MFD driver is implemented as UCLASS_NOP which provides basic access functions and will enumerate its child nodes. The device tree binding is the same as already acked by the linux kernel. Michael Walle (10): misc: add sl28cpld base driver watchdog: add sl28cpld watchdog driver gpio: add sl28cpld driver board: sl28: fix DRAM pretty print board: sl28: print CPLD version on bootup board: sl28: enable sl28cpld support board: sl28: enable SoC watchdog support board: sl28: disable recovery watchdog board: sl28: remove "Useful I2C tricks" section from docs board: sl28: disable random MAC address generation MAINTAINERS | 7 ++ board/kontron/sl28/sl28.c | 59 +++++++++++- configs/kontron_sl28_defconfig | 11 ++- doc/board/kontron/sl28.rst | 66 +++++++------ drivers/gpio/Kconfig | 6 ++ drivers/gpio/Makefile | 1 + drivers/gpio/sl28cpld-gpio.c | 165 ++++++++++++++++++++++++++++++++ drivers/misc/Kconfig | 8 ++ drivers/misc/Makefile | 1 + drivers/misc/sl28cpld.c | 105 ++++++++++++++++++++ drivers/watchdog/Kconfig | 7 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/sl28cpld-wdt.c | 109 +++++++++++++++++++++ include/sl28cpld.h | 17 ++++ 14 files changed, 528 insertions(+), 35 deletions(-) create mode 100644 drivers/gpio/sl28cpld-gpio.c create mode 100644 drivers/misc/sl28cpld.c create mode 100644 drivers/watchdog/sl28cpld-wdt.c create mode 100644 include/sl28cpld.h -- 2.30.2

3 18