February 2022 - U-Boot

[PATCH u-boot-marvell 1/2] arm: mvebu: spl: Add option to reset the board on DDR training failure
by Marek Behún 17 Feb '22

17 Feb '22

From: Marek Behún <marek.behun(a)nic.cz> Some boards may occacionally fail DDR training. Currently we hang() in this case. Add an option that makes the board do an immediate reset in such a case, so that a new training is tried as soon as possible, instead of hanging and possibly waiting for watchdog to reset the board. Signed-off-by: Marek Behún <marek.behun(a)nic.cz> --- arch/arm/mach-mvebu/Kconfig | 9 +++++++++ arch/arm/mach-mvebu/spl.c | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index d23cc0c760..ed957be6e1 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -213,6 +213,15 @@ config DDR_LOG_LEVEL At level 3, rovides the windows margin of each DQ as a results of DQS centeralization. +config DDR_RESET_ON_TRAINING_FAILURE + bool "Reset the board on DDR training failure instead of hanging" + depends on ARMADA_38X || ARMADA_XP + help + If DDR training fails in SPL, reset the board instead of hanging. + Some boards are known to fail DDR training occasionally and an + immediate reset may be preferable to waiting until the board is + reset by watchdog (if there even is one). + config SYS_BOARD default "clearfog" if TARGET_CLEARFOG default "helios4" if TARGET_HELIOS4 diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index 273ecb8bd6..d3c3bdc74d 100644 --- a/arch/arm/mach-mvebu/spl.c +++ b/arch/arm/mach-mvebu/spl.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <dm.h> #include <fdtdec.h> #include <hang.h> @@ -330,7 +331,10 @@ void board_init_f(ulong dummy) ret = ddr3_init(); if (ret) { printf("ddr3_init() failed: %d\n", ret); - hang(); + if (IS_ENABLED(CONFIG_DDR_RESET_ON_TRAINING_FAILURE)) + reset_cpu(); + else + hang(); } #endif -- 2.34.1

3 8

[PATCH] riscv: fix build with binutils 2.38
by Khem Raj 17 Feb '22

17 Feb '22

>From version 2.38, binutils default to ISA spec version 20191213. This means that the csr read/write (csrr*/csrw*) instructions and fence.i instruction has separated from the `I` extension, become two standalone extensions: Zicsr and Zifencei. The fix is to specify those extensions explicitly in -march. However as older binutils version do not support this, we first need to detect that. Fixes arch/riscv/lib/cache.c: Assembler messages: arch/riscv/lib/cache.c:12: Error: unrecognized opcode `fence.i' Signed-off-by: Khem Raj <raj.khem(a)gmail.com> Cc: Rick Chen <rick(a)andestech.com> Cc: Leo <ycliang(a)andestech.com> --- arch/riscv/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 0b80eb8d86..e6fe1fc02b 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -24,7 +24,12 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y) CMODEL = medany endif -ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \ +# Newer binutils versions default to ISA spec version 20191213 which moves some +# instructions from the I extension to the Zicsr and Zifencei extensions. +toolchain-need-zicsr-zifencei := $(call cc-option-yn, -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C)_zicsr_zifencei) +zicsr_zifencei-$(toolchain-need-zicsr-zifencei) := _zicsr_zifencei + +ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C)$(zicsr_zifencei-y) -mabi=$(ABI) \ -mcmodel=$(CMODEL) PLATFORM_CPPFLAGS += $(ARCH_FLAGS) -- 2.35.1

2 1

Unable to select a different ENV location due env_get_location on zynqmp
by Ricardo Salveti 17 Feb '22

17 Feb '22

Hi Michal, This is a bit similar to the issue raised on iMX8-based targets a few days ago, which is forcing the environment location based on the boot mode and not allowing the user to use a different option via other CONFIG options. Should we really force the env location based on boot mode? Currently there is no way to boot out of QSPI and save the environment on emmc/fat/ext4, and removing CONFIG_ENV_IS_IN_SPI_FLASH causes the env location to be set as ENVL_NOWHERE, which is not ideal, especially when other env target locations are available at build time. diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index f0be9c022a7..08afb49570a 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -969,6 +969,10 @@ enum env_location env_get_location(enum env_operation op, int prio) case QSPI_MODE_32BIT: if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) return ENVL_SPI_FLASH; + if (IS_ENABLED(CONFIG_ENV_IS_IN_FAT)) + return ENVL_FAT; + if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)) + return ENVL_EXT4; return ENVL_NOWHERE; case JTAG_MODE: default: A change like this one would allow other locations to be set, and just use the boot mode to assign the priority instead. Since I couldn't really find out what is the expected behavior on functions defined at soc/board level (env.c sets based on priority, depending on what is enabled at build time), I was wondering if we shouldn't just drop this function entirely. While I agree the board should have a set of defaults, not allowing the user to change something like env location via CONFIGs seems wrong to me. Let me know what you think. Thanks, -- Ricardo Salveti

5 8

[PATCH] fdtdec.h: Remove gurads around fdtdec_resetup function
by Tom Rini 16 Feb '22

16 Feb '22

This function has not been conditionally compiled for some time, so remove the incorrect guards around the declaration. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- include/fdtdec.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/fdtdec.h b/include/fdtdec.h index 4b0b505773dd..12355afd7fa1 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -1169,7 +1169,6 @@ int fdtdec_setup(void); */ int fdtdec_board_setup(const void *fdt_blob); -#if CONFIG_IS_ENABLED(MULTI_DTB_FIT) /** * fdtdec_resetup() - Set up the device tree again * @@ -1188,7 +1187,6 @@ int fdtdec_board_setup(const void *fdt_blob); * Return: 0 if OK, -ve on error */ int fdtdec_resetup(int *rescan); -#endif /** * Board-specific FDT initialization. Returns the address to a device tree blob. -- 2.25.1

1 0

[PATCH] dm: core: fix uclass_get_by_name
by Tim Harvey 16 Feb '22

16 Feb '22

When calling uclass_get_by_name we want to do a full match on the uclass name, not a partial match. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- drivers/core/uclass.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index 2578803b7a4d..82efefae5265 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -196,7 +196,16 @@ enum uclass_id uclass_get_by_name_len(const char *name, int len) enum uclass_id uclass_get_by_name(const char *name) { - return uclass_get_by_name_len(name, strlen(name)); + int i; + + for (i = 0; i < UCLASS_COUNT; i++) { + struct uclass_driver *uc_drv = lists_uclass_lookup(i); + + if (uc_drv && !strcmp(uc_drv->name, name)) + return i; + } + + return UCLASS_INVALID; } int dev_get_uclass_index(struct udevice *dev, struct uclass **ucp) -- 2.17.1

2 2

make mrproper deletes lib/acpi/dsdt.c
by Marcel Ziswiler 16 Feb '22

16 Feb '22

Hi Simon Since a few days I noticed the following: ⬢[zim@toolbox u-boot.git]$ git status On branch master Your branch is up to date with 'origin/master'. ⬢[zim@toolbox u-boot.git]$ make mrproper ⬢[zim@toolbox u-boot.git]$ git status On branch master Your branch is up to date with 'origin/master'. Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) deleted: lib/acpi/dsdt.c So somehow cleaning with mrproper deletes that file. Do you know what could be the cause? Thanks! Cheers Marcel

2 2

[PATCH 0/2] Fixes for the dwc3 driver
by Angus Ainslie 16 Feb '22

16 Feb '22

dwc3 driver fixes to work better with the linux kernel. Angus Ainslie (2): usb: dwc3: dwc3-generic: check the parent nodes usb: dwc3: core: stop the core when it's removed drivers/usb/dwc3/core.c | 9 +++++++++ drivers/usb/dwc3/dwc3-generic.c | 25 ++++++++++++++++++++----- 2 files changed, 29 insertions(+), 5 deletions(-) -- 2.25.1

3 6

[PATCH] usb: xhci: reset endpoint on USB stall
by Stefan Agner 16 Feb '22

16 Feb '22

There are devices which cause a USB stall when trying to read strings. Specifically Arduino Mega R3 stalls when trying to read the product string. The stall currently remains unhandled, and subsequent retries submit new transfers on a stopped endpoint which ultimately cause a crash in abort_td(): WARN halted endpoint, queueing URB anyway. XHCI control transfer timed out, aborting... Unexpected XHCI event TRB, skipping... (3affe040 00000000 13000000 02008401) BUG at drivers/usb/host/xhci-ring.c:505/abort_td()! BUG! resetting ... Linux seems to be able to recover from the stall by issuing a TRB_RESET_EP command. Introduce reset_ep() which issues a TRB_RESET_EP followed by setting the transfer ring dequeue pointer via TRB_SET_DEQ. This allows to properly recover from a USB stall error and continue communicating with the USB device. Signed-off-by: Stefan Agner <stefan(a)agner.ch> --- This has been reported on the ML by Mike Hoogstraten a while ago: https://www.mail-archive.com/u-boot@lists.denx.de/msg390604.html FWIW, for the Arduino Mega R3 I also opened an issue: https://github.com/arduino/ArduinoCore-avr/issues/431 -- Stefan drivers/usb/host/xhci-ring.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 35bd5cd29e..1a9dff3b6c 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -481,6 +481,33 @@ union xhci_trb *xhci_wait_for_event(struct xhci_ctrl *ctrl, trb_type expected) BUG(); } +/* + * Send reset endpoint command for given endpoint. This recovers from a + * halted endpoint (e.g. due to a stall error). + */ +static void reset_ep(struct usb_device *udev, int ep_index) +{ + struct xhci_ctrl *ctrl = xhci_get_ctrl(udev); + struct xhci_ring *ring = ctrl->devs[udev->slot_id]->eps[ep_index].ring; + union xhci_trb *event; + u32 field; + + printf("Resetting EP %d...\n", ep_index); + xhci_queue_command(ctrl, NULL, udev->slot_id, ep_index, TRB_RESET_EP); + event = xhci_wait_for_event(ctrl, TRB_COMPLETION); + field = le32_to_cpu(event->trans_event.flags); + BUG_ON(TRB_TO_SLOT_ID(field) != udev->slot_id); + xhci_acknowledge_event(ctrl); + + xhci_queue_command(ctrl, (void *)((uintptr_t)ring->enqueue | + ring->cycle_state), udev->slot_id, ep_index, TRB_SET_DEQ); + event = xhci_wait_for_event(ctrl, TRB_COMPLETION); + BUG_ON(TRB_TO_SLOT_ID(le32_to_cpu(event->event_cmd.flags)) + != udev->slot_id || GET_COMP_CODE(le32_to_cpu( + event->event_cmd.status)) != COMP_SUCCESS); + xhci_acknowledge_event(ctrl); +} + /* * Stops transfer processing for an endpoint and throws away all unprocessed * TRBs by setting the xHC's dequeue pointer to our enqueue pointer. The next @@ -928,6 +955,10 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe, record_transfer_result(udev, event, length); xhci_acknowledge_event(ctrl); + if (udev->status == USB_ST_STALLED) { + reset_ep(udev, ep_index); + return -EPIPE; + } /* Invalidate buffer to make it available to usb-core */ if (length > 0) -- 2.33.0

3 6

[PATCH] dt-bindings: nvmem: add U-Boot environment variables binding
by Rafał Miłecki 16 Feb '22

16 Feb '22

From: Rafał Miłecki <rafal(a)milecki.pl> U-Boot uses environment variables for storing device setup data on flash. That data usually needs to be accessed by a bootloader, kernel and often user-space. This binding allows describing environment data location and its format clearly. In some/many cases it should be cleaner than hardcoding & duplicating that info in multiple places. Bootloader & kernel can share DTS and user-space can try reading it too or just have correct data exposed by a kernel. Signed-off-by: Rafał Miłecki <rafal(a)milecki.pl> --- .../devicetree/bindings/nvmem/u-boot,env.yaml | 58 +++++++++++++++++++ MAINTAINERS | 5 ++ 2 files changed, 63 insertions(+) create mode 100644 Documentation/devicetree/bindings/nvmem/u-boot,env.yaml diff --git a/Documentation/devicetree/bindings/nvmem/u-boot,env.yaml b/Documentation/devicetree/bindings/nvmem/u-boot,env.yaml new file mode 100644 index 000000000000..a2b3a9b88eb8 --- /dev/null +++ b/Documentation/devicetree/bindings/nvmem/u-boot,env.yaml @@ -0,0 +1,58 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/nvmem/u-boot,env.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: U-Boot environment variables + +description: | + U-Boot uses environment variables to store device parameters and + configuration. They may be used for booting process, setup or keeping end user + info. + + Data is stored on flash in a U-Boot specific format (header and NUL separated + key-value pairs). + + This binding allows specifying data location and used format. + +maintainers: + - Rafał Miłecki <rafal(a)milecki.pl> + +allOf: + - $ref: nvmem.yaml# + +properties: + compatible: + oneOf: + - description: A standalone env data block + const: u-boot,env + - description: Two redundant blocks with active one flagged + const: u-boot,env-redundant-bool + - description: Two redundant blocks with active having higher counter + const: u-boot,env-redundant-count + + reg: + maxItems: 1 + +unevaluatedProperties: false + +examples: + - | + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x40000>; + read-only; + }; + + partition@40000 { + compatible = "u-boot,env"; + label = "u-boot-env"; + reg = <0x40000 0x10000>; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index d20344ab7900..2f07f1d2290a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19905,6 +19905,11 @@ W: http://linuxtv.org T: git git://linuxtv.org/media_tree.git F: drivers/media/pci/tw686x/ +U-BOOT ENVIRONMENT VARIABLES +M: Rafał Miłecki <rafal(a)milecki.pl> +S: Maintained +F: Documentation/devicetree/bindings/nvmem/u-boot,env.yaml + UACCE ACCELERATOR FRAMEWORK M: Zhangfei Gao <zhangfei.gao(a)linaro.org> M: Zhou Wang <wangzhou1(a)hisilicon.com> -- 2.34.1

3 7

[PATCH] binman: Include also subnodes in generator nodes
by Jan Kiszka 16 Feb '22

16 Feb '22

From: Jan Kiszka <jan.kiszka(a)siemens.com> This allows to prefill fdt and config nodes with hash and signature subnodes. It's just important to place the child nodes last so that hashes do not come before the data - would be disliked by mkimage. Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> --- tools/binman/etype/fit.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py index a56b0564f9a..477d0156e48 100644 --- a/tools/binman/etype/fit.py +++ b/tools/binman/etype/fit.py @@ -214,6 +214,10 @@ class Entry_fit(Entry_section): if depth == 1 and in_images: fsw.property('data', tools.read_file(fname)) + + for child in subnode.subnodes: + with fsw.add_node(child.name): + _AddNode(subnode, depth + 1, child) else: if self._fdts is None: if self._fit_list_prop: -- 2.34.1

2 1