September 2023 - U-Boot

[PATCH v2] binman: Fix SyntaxWarning: invalid escape sequence '\('
by Rong Tao 23 Sep '23

23 Sep '23

From: Rong Tao <rongtao(a)cestc.cn> Reproduct warning: $ git clean -dfx $ make CROSS_COMPILE="" qemu-x86_64_defconfig $ make -j8 ... u-boot/tools/binman/etype/section.py:25: SyntaxWarning: invalid escape sequence '\(' """Entry that contains other entries Signed-off-by: Rong Tao <rongtao(a)cestc.cn> --- tools/binman/etype/section.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index fb49e85a7634..30c1041c7e8d 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -40,7 +40,7 @@ class Entry_section(Entry): For example code, see etypes which subclass `Entry_section`, or `cbfs.py` for a more involved example:: - $ grep -l \(Entry_section tools/binman/etype/*.py + $ grep -l \\(Entry_section tools/binman/etype/*.py ReadNode() Call `super().ReadNode()`, then read any special properties for the -- 2.41.0

3 5

[PATCH] patman: Respect include directive on Git config lookup
by Fei Shao 23 Sep '23

23 Sep '23

People may put their user name and email in a local config file and reference it by the include.* directives, however `git config --global` doesn't look up the included configs by default. Enable the --includes option explicitly to support such use cases. Signed-off-by: Fei Shao <fshao(a)chromium.org> --- tools/patman/gitutil.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 6700057359fc..b0a12f2e8c06 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -651,7 +651,7 @@ def get_default_user_name(): Returns: User name found in .gitconfig file, or None if none """ - uname = command.output_one_line('git', 'config', '--global', 'user.name') + uname = command.output_one_line('git', 'config', '--global', '--includes', 'user.name') return uname @@ -661,7 +661,7 @@ def get_default_user_email(): Returns: User's email found in .gitconfig file, or None if none """ - uemail = command.output_one_line('git', 'config', '--global', 'user.email') + uemail = command.output_one_line('git', 'config', '--global', '--includes', 'user.email') return uemail -- 2.42.0.283.g2d96d420d3-goog

2 2

[PATCH v2] dt-bindings: mtd: Add a schema for binman
by Simon Glass 23 Sep '23

23 Sep '23

Binman[1] is a tool for creating firmware images. It allows you to combine various binaries and place them in an output file. Binman uses a DT schema to describe an image, in enough detail that it can be automatically built from component parts, disassembled, replaced, listed, etc. Images are typically stored in flash, which is why this binding is targeted at mtd. Previous discussion is at [2] [3]. This is only a starting point, an attempt to align on the best way to add this to the schema. [1] https://u-boot.readthedocs.io/en/stable/develop/package/binman.html [2] https://lore.kernel.org/u-boot/20230821180220.2724080-3-sjg@chromium.org/ [3] https://www.spinics.net/lists/devicetree/msg626149.html Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - Use "binman" for compatible instead of "u-boot,binman" - Significantly rework the patch - Use make dt_binding_check DT_SCHEMA_FILES=Documentation/../partitions .../bindings/mtd/partitions/binman.yaml | 59 ++++++++++++++++++ .../mtd/partitions/binman/atf-bl31.yaml | 43 +++++++++++++ .../bindings/mtd/partitions/binman/entry.yaml | 62 +++++++++++++++++++ .../mtd/partitions/binman/u-boot.yaml | 43 +++++++++++++ .../bindings/mtd/partitions/partitions.yaml | 1 + MAINTAINERS | 5 ++ 6 files changed, 213 insertions(+) create mode 100644 Documentation/devicetree/bindings/mtd/partitions/binman.yaml create mode 100644 Documentation/devicetree/bindings/mtd/partitions/binman/atf-bl31.yaml create mode 100644 Documentation/devicetree/bindings/mtd/partitions/binman/entry.yaml create mode 100644 Documentation/devicetree/bindings/mtd/partitions/binman/u-boot.yaml diff --git a/Documentation/devicetree/bindings/mtd/partitions/binman.yaml b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml new file mode 100644 index 000000000000..31accab37055 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml @@ -0,0 +1,59 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2023 Google LLC + +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/partitions/binman.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binman firmware layout + +maintainers: + - Simon Glass <sjg(a)chromium.org> + +select: false + +description: | + The binman node provides a layout for firmware, used when packaging firmware + from multiple projects. For now it just supports a very simple set of + features, as a starting point for discussion. + + Documentation for Binman is available at: + + https://u-boot.readthedocs.io/en/latest/develop/package/binman.html + + with the current image-description format at: + + https://u-boot.readthedocs.io/en/latest/develop/package/binman.html#image-d… + +properties: + reg: + description: partition's offset and size within the flash + maxItems: 1 + + compatible: + const: binman + + "#address-cells": + enum: [ 1, 2 ] + + "#size-cells": + enum: [ 1, 2 ] + +required: + - compatible + +additionalProperties: false + +examples: + - | + binman { + compatible = "binman"; + #address-cells = <1>; + #size-cells = <1>; + + partition@100000 { + compatible = "brcm,bcm4908-firmware"; + reg = <0x100000 0xf00000>; + }; + }; diff --git a/Documentation/devicetree/bindings/mtd/partitions/binman/atf-bl31.yaml b/Documentation/devicetree/bindings/mtd/partitions/binman/atf-bl31.yaml new file mode 100644 index 000000000000..7d28e7e1d01d --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/binman/atf-bl31.yaml @@ -0,0 +1,43 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2023 Google LLC + +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/partitions/binman/atf-bl31.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: ARM Trusted Firmware BL31 + +maintainers: + - Simon Glass <sjg(a)chromium.org> + +description: + Holds a BL31 binary file from the ARM Trusted Firmware project. + +allOf: + - $ref: entry.yaml# + +properties: + compatible: + const: binman,atf-bl31 + +unevaluatedProperties: false + +examples: + - | + binman { + compatible = "binman"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x0 0xa0000>; + compatible = "binman,entry"; + }; + + partition@100000 { + reg = <0x100000 0x200000>; + compatible = "binman,atf-bl31"; + compression = "lz4"; + }; + }; diff --git a/Documentation/devicetree/bindings/mtd/partitions/binman/entry.yaml b/Documentation/devicetree/bindings/mtd/partitions/binman/entry.yaml new file mode 100644 index 000000000000..9991c83aa0cf --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/binman/entry.yaml @@ -0,0 +1,62 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2023 Google LLC + +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/partitions/binman/entry.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binman entry + +maintainers: + - Simon Glass <sjg(a)chromium.org> + +description: | + This node specifies a single, generic entry in the firmware. + + Entries have a specific type, indicated by the compatible string. + +properties: + reg: + description: partition's offset and size within the flash + maxItems: 1 + + compression: + $ref: /schemas/types.yaml#/definitions/string + description: + Compression algorithm to use, chosen from a list of well-known algorithms. + The contents are compressed using this algorithm. + + enum: + - none + - bzip2 + - gzip + - lzop + - lz4 + - lzma + - xz + - zstd + +required: + - compatible + +additionalProperties: true + +examples: + - | + binman { + compatible = "binman"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x0 0xa0000>; + compatible = "binman,entry"; + }; + + partition@100000 { + reg = <0x100000 0x200000>; + compatible = "binman,entry"; + compression = "lz4"; + }; + }; diff --git a/Documentation/devicetree/bindings/mtd/partitions/binman/u-boot.yaml b/Documentation/devicetree/bindings/mtd/partitions/binman/u-boot.yaml new file mode 100644 index 000000000000..e5f3583f746c --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/binman/u-boot.yaml @@ -0,0 +1,43 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2023 Google LLC + +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/partitions/binman/u-boot.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: U-Boot + +maintainers: + - Simon Glass <sjg(a)chromium.org> + +description: + Holds a binary file (u-boot.bin) from the U-Boot project. + +allOf: + - $ref: entry.yaml# + +properties: + compatible: + const: binman,u-boot + +unevaluatedProperties: false + +examples: + - | + binman { + compatible = "binman"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + reg = <0x0 0xa0000>; + compatible = "binman,u-boot"; + }; + + partition@100000 { + reg = <0x100000 0x200000>; + compatible = "binman,atf-bl31"; + compression = "lz4"; + }; + }; diff --git a/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml b/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml index 1dda2c80747b..849fd15d085c 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml @@ -15,6 +15,7 @@ maintainers: oneOf: - $ref: arm,arm-firmware-suite.yaml + - $ref: binman.yaml - $ref: brcm,bcm4908-partitions.yaml - $ref: brcm,bcm947xx-cfe-partitions.yaml - $ref: fixed-partitions.yaml diff --git a/MAINTAINERS b/MAINTAINERS index a4c30221eb30..ebcbfb4292e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3505,6 +3505,11 @@ F: Documentation/filesystems/bfs.rst F: fs/bfs/ F: include/uapi/linux/bfs_fs.h +BINMAN +M: Simon Glass <sjg(a)chromium.org> +S: Supported +F: Documentation/devicetree/bindings/mtd/partitions/binman* + BITMAP API M: Yury Norov <yury.norov(a)gmail.com> R: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> -- 2.42.0.515.g380fc7ccd1-goog

2 1

[PATCH] MAINTAINERS: Step up as maintainers of UniPhier SoC platform
by Kunihiko Hayashi 23 Sep '23

23 Sep '23

Update maintainers for UniPhier SoC platform. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> --- MAINTAINERS | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 0a10a436bcec..281a3f81f73a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -723,7 +723,10 @@ F: drivers/usb/musb-new/ux500.c F: drivers/video/mcde_simple.c ARM UNIPHIER -S: Orphan (Since 2020-09) +M: Kunihiko Hayashi <hayashi.kunihiko(a)socionext.com> +R: Dai Okamura <okamura.dai(a)socionext.com> +S: Maintained +F: arch/arm/dts/uniphier-* F: arch/arm/mach-uniphier/ F: configs/uniphier_*_defconfig N: uniphier -- 2.25.1

2 1

[PATCH] pico-imx7d: Remove Vanessa from MAINTAINERS
by Fabio Estevam 23 Sep '23

23 Sep '23

From: Fabio Estevam <festevam(a)denx.de> Vanessa's NXP e-mail is no longer active. Contacted her offline and she told me that she does not have access to the board anymore and it is OK to remove her from MAINTAINERS. Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- board/technexion/pico-imx7d/MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/board/technexion/pico-imx7d/MAINTAINERS b/board/technexion/pico-imx7d/MAINTAINERS index 325e1735c39a..5dccac4d55b4 100644 --- a/board/technexion/pico-imx7d/MAINTAINERS +++ b/board/technexion/pico-imx7d/MAINTAINERS @@ -1,5 +1,4 @@ TechNexion PICO-IMX7D board -M: Vanessa Maegima <vanessa.maegima(a)nxp.com> M: Otavio Salvador <otavio(a)ossystems.com.br> S: Maintained F: board/technexion/pico-imx7d/ -- 2.34.1

2 1

[PATCH] drivers: mediatek: Fix error handling in mtk_i2c_do_transfer
by Francois Berder 23 Sep '23

23 Sep '23

Errors were handled only if an I2C transfer timed out and received a NACK which is very unlikely. This commit changes the condition such that errors are handled if an I2C transfer times out or received a NACK. Signed-off-by: Francois Berder <fberder(a)outlook.fr> --- drivers/i2c/mtk_i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/mtk_i2c.c b/drivers/i2c/mtk_i2c.c index 2f331d32..5592fe91 100644 --- a/drivers/i2c/mtk_i2c.c +++ b/drivers/i2c/mtk_i2c.c @@ -621,7 +621,7 @@ static int mtk_i2c_do_transfer(struct mtk_i2c_priv *priv, i2c_writel(priv, REG_INTR_MASK, ~(restart_flag | I2C_HS_NACKERR | I2C_ACKERR | I2C_TRANSAC_COMP)); - if (!tmo && trans_error != 0) { + if (tmo || trans_error != 0) { if (tmo) { ret = -ETIMEDOUT; if (!priv->filter_msg) -- 2.34.1

3 3

[PATCH] configs: am65x_evm_r5_usbmsc_defconfig: Enable DWC3 wrapper for SPL
by Ravi Gunasekaran 23 Sep '23

23 Sep '23

commit 280f45d23977 ("configs: get rid of build warnings due to SPL_USB_DWC3_GENERIC") missed enabling DWC3 glue layer for usbmsc_defconfig and this broke boot from USB mass storage. Fix this by enabling DWC3 glue layer. Fixes: 280f45d23977 ("configs: get rid of build warnings due to SPL_USB_DWC3_GENERIC") Signed-off-by: Ravi Gunasekaran <r-gunasekaran(a)ti.com> --- configs/am65x_evm_r5_usbmsc_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/am65x_evm_r5_usbmsc_defconfig b/configs/am65x_evm_r5_usbmsc_defconfig index 8da49c78c8..733a1c1874 100644 --- a/configs/am65x_evm_r5_usbmsc_defconfig +++ b/configs/am65x_evm_r5_usbmsc_defconfig @@ -85,6 +85,7 @@ CONFIG_SYS_I2C_OMAP24XX=y CONFIG_DM_MAILBOX=y CONFIG_K3_SEC_PROXY=y CONFIG_MISC=y +CONFIG_SPL_MISC=y CONFIG_K3_AVS0=y # CONFIG_MMC is not set CONFIG_PHY=y @@ -122,6 +123,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GENERIC=y +CONFIG_SPL_USB_DWC3_GENERIC=y CONFIG_USB_STORAGE=y CONFIG_SPL_USB_STORAGE=y CONFIG_USB_GADGET=y -- 2.17.1

2 1

[PATCH 0/1] Workaround for timeout error in NETSEC driver
by Ryosuke Saito 23 Sep '23

23 Sep '23

This patch adds the workaround for the timeout error in the NETSEC driver when sending packets. The NETSEC driver occasionally shows a "netsec_wait_while_busy" error and fails to send packets like the below: ==================== U-Boot 2023.01 (Jan 09 2023 - 16:07:33 +0000) CPU: SC2A11:Cortex-A53 MPCore 24cores Model: Socionext Developer Box DRAM: 1.9 GiB (effective 63.9 GiB) optee optee: OP-TEE: revision 3.20 (8e74d476) I/TC: Reserved shared memory is enabled I/TC: Dynamic shared memory is enabled I/TC: Normal World virtualization support is disabled I/TC: Asynchronous notifications are disabled Core: 24 devices, 19 uclasses, devicetree: separate MMC: sdhci@52300000: 0 Loading Environment from nowhere... OK PCI: Failed autoconfig bar 14 In: uart@2a400000 Out: uart@2a400000 Err: uart@2a400000 Net: SF: Detected mx25u51245g with page size 256 Bytes, erase size 4 KiB, total 64 MiB eth0: ethernet@522d0000 starting USB... Bus xhci_pci: Register 8000820 NbrPorts 8 Starting the controller USB XHCI 1.00 scanning bus xhci_pci for devices... 1 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found scanning bus for devices... SATA link 0 timeout. SATA link 1 timeout. AHCI 0001.0200 32 slots 2 ports 6 Gbps 0x3 impl SATA mode flags: 64bit ncq stag led clo pmp pio slum part ccc sxs Hit any key to stop autoboot: 2 0 => setenv serverip 192.168.1.109 => dhcp BOOTP broadcast 1 BOOTP broadcast 2 BOOTP broadcast 3 BOOTP broadcast 4 *** Unhandled DHCP Option in OFFER/ACK: 125 *** Unhandled DHCP Option in OFFER/ACK: 125 DHCP client bound to address 192.168.1.111 (2131 ms) *** Warning: no boot file name; using 'C0A8016F.img' Using ethernet@522d0000 device TFTP from server 192.168.1.109; our IP address is 192.168.1.111 Filename 'C0A8016F.img'. Load address: 0x80000000 Loading: * TFTP error: 'File not found' (1) Not retrying... => ping 192.168.1.1 Using ethernet@522d0000 device host 192.168.1.1 is alive => ping 192.168.1.1 ethernet@522d0000 Waiting for PHY auto negotiation to complete... done Using ethernet@522d0000 device host 192.168.1.1 is alive => ping 192.168.1.1 (...skipping...) => ping 192.168.1.1 ethernet@522d0000 Waiting for PHY auto negotiation to complete... done netsec_wait_while_busy: timeout Using ethernet@522d0000 device ARP Retry count exceeded; starting again ping failed; host 192.168.1.1 is not alive ==================== This could be occurred by, e.g., tftp and dhcp as well. After investigation, it turns out it's waiting for MAC_REG_DESC_SOFT_RST to be cleared to 0 after writing 1. The NETSEC firmware normally clears it, but sometimes it seems to enter a weird state where it's never been cleared until the next NETSEC software reset. The reproducibility seems to vary on the environment (for example, 100 ping tries would cause the issue in my environment.); however, we faced the issue on at least three different boards in three different networking environments. We have already reported the issue to Socionext, the supplier of NETSEC firmware, but it will take longer to find the root cause and fix the issue. Meanwhile, we can add a workaround for the problematic state by software resetting NETSEC. Ryosuke Saito (1): net: sni_netsec: Add workaround for timeout error drivers/net/sni_netsec.c | 50 ++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 9 deletions(-) -- 2.41.0

3 3

[PATCH] net: wget: Avoid packet queue overflow
by Richard Weinberger 23 Sep '23

23 Sep '23

Make sure to stay within bounds, as a misbehaving HTTP server can trigger a buffer overflow if not properly handled. Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> Signed-off-by: Richard Weinberger <richard(a)nod.at> --- net/wget.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net/wget.c b/net/wget.c index 2dbfeb1a1d5b..8bb4d72db1ae 100644 --- a/net/wget.c +++ b/net/wget.c @@ -35,7 +35,8 @@ struct pkt_qd { * The actual packet bufers are in the kernel space, and are * expected to be overwritten by the downloaded image. */ -static struct pkt_qd pkt_q[PKTBUFSRX / 4]; +#define PKTQ_SZ (PKTBUFSRX / 4) +static struct pkt_qd pkt_q[PKTQ_SZ]; static int pkt_q_idx; static unsigned long content_length; static unsigned int packets; @@ -202,6 +203,13 @@ static void wget_connected(uchar *pkt, unsigned int tcp_seq_num, pkt_q[pkt_q_idx].tcp_seq_num = tcp_seq_num; pkt_q[pkt_q_idx].len = len; pkt_q_idx++; + + if (pkt_q_idx >= PKTQ_SZ) { + printf("wget: Fatal error, queue overrun!\n"); + net_set_state(NETLOOP_FAIL); + + return; + } } else { debug_cond(DEBUG_WGET, "wget: Connected HTTP Header %p\n", pkt); /* sizeof(http_eom) - 1 is the string length of (http_eom) */ -- 2.26.2

2 4

[Question] TI's u-boot.img is built twice
by Masahiro Yamada 22 Sep '23

22 Sep '23

Hi. Since the TI platform migrated to binman, u-boot.img is built twice. It is created by "mkimage -E", then overwritten by binman. So, the data are embedded in the FIT structure instead of being appended. Is this intentional? To me, it looks weird. To confirm it, apply the following hack. Since u-boot.img is overwritten by binman, copy it to u-boot.img.backup. diff --git a/Makefile b/Makefile index 87f9fc786e..4cffa8a061 100644 --- a/Makefile +++ b/Makefile @@ -1112,6 +1112,7 @@ endef # Timestamp file to make sure that binman always runs .binman_stamp: $(INPUTS-y) FORCE ifeq ($(CONFIG_BINMAN),y) + cp u-boot.img u-boot.img.backup $(call if_changed,binman) endif @touch $@ Then, build it for the main core. make -j$(nproc) CROSS_COMPILE=aarch64-linux-gnu- am64x_evm_a53_defconfig all TEE=~/ref/OP-TEE/optee_os/out/arm-plat-k3/core/tee-raw.bin BL31=~/ref/trusted-firmware-a/build/k3/lite/release/bl31.bin BINMAN_INDIRS=~/ref/ti-linux-firmware Compare the two files. Run fdtdump to see what happened to them. $ diff -u u-boot.img u-boot.img.backup Binary files u-boot.img and u-boot.img.backup differ $ fdtdump u-boot.img => u-boot and dt are embedded. $ fdtdump u-boot.img.backup => u-boot and dt are appended after the FIT structure -- Best Regards Masahiro Yamada

4 12