July 2024 - U-Boot

[PATCH 1/2] ext4: Fix integer overflow in ext4fs_read_symlink()
by Richard Weinberger 12 Jul '24

12 Jul '24

While zalloc() takes a size_t type, adding 1 to the le32 variable will overflow. A carefully crafted ext4 filesystem can exhibit an inode size of 0xffffffff and as consequence zalloc() will do a zero allocation. Later in the function the inode size is again used for copying data. So an attacker can overwrite memory. Avoid the overflow by using the __builtin_add_overflow() helper. Signed-off-by: Richard Weinberger <richard(a)nod.at> --- fs/ext4/ext4_common.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 2ff0dca249..32364b72fb 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -2183,13 +2183,18 @@ static char *ext4fs_read_symlink(struct ext2fs_node *node) struct ext2fs_node *diro = node; int status; loff_t actread; + size_t alloc_size; if (!diro->inode_read) { status = ext4fs_read_inode(diro->data, diro->ino, &diro->inode); if (status == 0) return NULL; } - symlink = zalloc(le32_to_cpu(diro->inode.size) + 1); + + if (__builtin_add_overflow(le32_to_cpu(diro->inode.size), 1, &alloc_size)) + return NULL; + + symlink = zalloc(alloc_size); if (!symlink) return NULL; -- 2.35.3

4 10

[GIT PULL] Please pull u-boot-dfu-20240711
by Mattijs Korpershoek 12 Jul '24

12 Jul '24

Hi Tom, Please find some new developments for master: Usb gadget: - A welcome cleanup: epautoconf workaround is dropped to use .match_ep() instead - Introduce handle_interrupts() op for USB_GADGET_GENERIC, which allows a per-driver interrupt handling Fastboot: - Fix mssing include when building with TCP only Thi CI job is at https://source.denx.de/u-boot/custodians/u-boot-dfu/-/pipelines/21552 Thanks, Mattijs The following changes since commit 7c9c5c0562347dccb8ac89148784a34de402ea9e: Merge patch series "xtensa: Enable qemu-xtensa board" (2024-07-04 16:11:08 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-dfu.git tags/u-boot-dfu-20240711 for you to fetch changes up to b091d3872833a4b8d088ee41348a2d4ff48067cc: include/fastboot.h: add missing types.h include (2024-07-09 09:15:37 +0200) ---------------------------------------------------------------- u-boot-dfu-20240711 Usb gadget: - A welcome cleanup: epautoconf workaround is dropped to use .match_ep() instead - Introduce handle_interrupts() op for USB_GADGET_GENERIC, which allows a per-driver interrupt handling Fastboot: - Fix mssing include when building with TCP only ---------------------------------------------------------------- Caleb Connolly (1): include/fastboot.h: add missing types.h include Marek Vasut (17): usb: gadget: g_dnl: Drop usb_gadget_controller_number() usb: gadget: ether: Drop usb_gadget_controller_number() usb: gadget: Drop usb_gadget_controller_number() usb: gadget: Drop all gadget_is_*() functions usb: gadget: Add full ep_matches() check past .match_ep() callback usb: dwc3: gadget: Convert epautoconf workaround to match_ep callback usb: gadget: Introduce handle_interrupts ops to USB_GADGET_GENERIC uclass usb: gadget: cdns3: Convert interrupt handling to usb_gadget_generic_ops usb: gadget: dwc2: Convert interrupt handling to usb_gadget_generic_ops usb: gadget: dwc3: Convert interrupt handling to usb_gadget_generic_ops usb: gadget: max3420: Convert interrupt handling to usb_gadget_generic_ops usb: gadget: mtu3: Convert interrupt handling to usb_gadget_generic_ops usb: gadget: omap2430: Convert interrupt handling to usb_gadget_generic_ops usb: gadget: musb: Convert interrupt handling to usb_gadget_generic_ops usb: gadget: ux500: Convert interrupt handling to usb_gadget_generic_ops usb: gadget: sandbox: Drop dm_usb_gadget_handle_interrupts() usb: gadget: Mark dm_usb_gadget_handle_interrupts as non-weak for DM_USB_GADGET drivers/usb/cdns3/core.c | 24 +++++ drivers/usb/cdns3/gadget-export.h | 2 + drivers/usb/cdns3/gadget.c | 11 +- drivers/usb/dwc3/dwc3-generic.c | 23 ++-- drivers/usb/dwc3/dwc3-layerscape.c | 21 ++-- drivers/usb/dwc3/gadget.c | 33 ++++++ drivers/usb/gadget/dwc2_udc_otg.c | 20 +++- drivers/usb/gadget/epautoconf.c | 81 +------------- drivers/usb/gadget/ether.c | 25 ++--- drivers/usb/gadget/g_dnl.c | 17 +-- drivers/usb/gadget/gadget_chips.h | 210 ------------------------------------ drivers/usb/gadget/max3420_udc.c | 19 ++-- drivers/usb/gadget/udc/udc-uclass.c | 24 +++++ drivers/usb/host/usb-sandbox.c | 7 +- drivers/usb/mtu3/mtu3_plat.c | 23 ++-- drivers/usb/musb-new/omap2430.c | 26 +++-- drivers/usb/musb-new/ti-musb.c | 23 ++-- drivers/usb/musb-new/ux500.c | 22 ++-- include/fastboot.h | 2 + include/linux/usb/gadget.h | 8 ++ 20 files changed, 219 insertions(+), 402 deletions(-) delete mode 100644 drivers/usb/gadget/gadget_chips.h

2 1

[PATCH] board: raspberrypi: Fix format specifier for printing rev_scheme
by Francois Berder 12 Jul '24

12 Jul '24

rev_scheme is an unsigned integer and must not be printed as a signed integer. Signed-off-by: Francois Berder <fberder(a)outlook.fr> --- board/raspberrypi/rpi/rpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index d996eb0cf6..caa4483117 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -381,7 +381,7 @@ static void set_board_info(void) snprintf(s, sizeof(s), "0x%X", revision); env_set("board_revision", s); - snprintf(s, sizeof(s), "%d", rev_scheme); + snprintf(s, sizeof(s), "%u", rev_scheme); env_set("board_rev_scheme", s); /* Can't rename this to board_rev_type since it's an ABI for scripts */ snprintf(s, sizeof(s), "0x%X", rev_type); -- 2.34.1

2 1

[PATCH v2] amd: Enable the NFS command for Versal Gen 2
by Prasad Kummari 12 Jul '24

12 Jul '24

Enabled the default utilization of the NFS command on Versal Gen 2 platform to facilitate booting images through the network using the NFS protocol Signed-off-by: Prasad Kummari <prasad.kummari(a)amd.com> --- Changes in v2: - corrected commit description. configs/amd_versal2_virt_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/amd_versal2_virt_defconfig b/configs/amd_versal2_virt_defconfig index 2d611f84cd..bbe7db4fb3 100644 --- a/configs/amd_versal2_virt_defconfig +++ b/configs/amd_versal2_virt_defconfig @@ -46,6 +46,7 @@ CONFIG_CMD_USB=y CONFIG_BOOTP_MAY_FAIL=y CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_NFS=y CONFIG_CMD_CACHE=y CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_TIME=y -- 2.25.1

2 1

[PATCH v5 0/6] Add DFU and usb boot for TI am62x SK and beagleplay
by Martyn Welch 12 Jul '24

12 Jul '24

This series adds DFU support for TI AM62 SK and beagleplay boards. I have picked this series up from Sjoerd due to time constraints. Since the last revision: * Removed dwc3 mode setting in favour of reinstating forced peripheral mode for usb0 * Use of config fragments for both r5 and a53 DFU configuration to reduce duplication * Typographical improvements to documentation We plan to also submit the dts changes to linux so that those can be dropped again in the near future (hopefully) Changes in v5: - Forcing usb0 into peripheral mode reinstated - Switch to config fragment for a53 DFU configuration - Use existing config fragment for a53 DFU configuration - Typographical corrections Changes in v4: - Add config dependency on SYSCON - Move defines and constants outside out of function scope - Don't force usb0 into peripheral mode - Move R5 dfu config to a config fragment rather then a full defconfig - Don't enable XHCI for the R5 SPL, unneeded Change in v3: - Add dfu via environment rather then config headers - Enable usb nodes in all boot phases - Run savedefconfig to adjust to more recent u-boot Changes in v2: - Switch dwc3 glue to a seperate driver rather then in dwc-generic - Minimize config changes to just DFU configuration - Only enable usb port 0 DFU in SPL - Create a seperate defconfig for R5 Sjoerd Simons (6): usb: dwc3: Add dwc3 glue driver for am62 board: ti: am62x: am62x: include env for DFU arm: dts: k3-am625-sk: Enable usb port in u-boot configs: am62x_evm_*: Enable USB and DFU support beagleplay: Add DFU support doc: board: Add document for DFU boot on am62x SoCs arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 9 ++ arch/arm/dts/k3-am625-sk-u-boot.dtsi | 9 ++ board/beagle/beagleplay/beagleplay.env | 1 + board/ti/am62x/am62x.env | 1 + configs/am62x_a53_usbdfu.config | 29 +++++ configs/am62x_beagleplay_a53_defconfig | 2 + configs/am62x_evm_a53_defconfig | 3 + configs/am62x_r5_usbdfu.config | 28 +++++ doc/board/beagle/am62x_beagleplay.rst | 14 ++- doc/board/ti/am62x_sk.rst | 37 ++++++ drivers/usb/dwc3/Kconfig | 14 +++ drivers/usb/dwc3/Makefile | 1 + drivers/usb/dwc3/dwc3-am62.c | 125 +++++++++++++++++++ 13 files changed, 272 insertions(+), 1 deletion(-) create mode 100644 configs/am62x_a53_usbdfu.config create mode 100644 configs/am62x_r5_usbdfu.config create mode 100644 drivers/usb/dwc3/dwc3-am62.c -- 2.43.0

5 18

[PATCH] test/py/tests/test_fpga.py: Correct check for legacy image format support
by Tom Rini 11 Jul '24

11 Jul '24

The build option to support images of type 'IMAGE_FORMAT_LEGACY' is CONFIG_LEGACY_IMAGE_FORMAT so update the pytest to check for the correct option. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- test/py/tests/test_fpga.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/py/tests/test_fpga.py b/test/py/tests/test_fpga.py index ca7ef8ea40d6..460ff227f6f2 100644 --- a/test/py/tests/test_fpga.py +++ b/test/py/tests/test_fpga.py @@ -256,7 +256,7 @@ def test_fpga_loadbp(u_boot_console): @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('cmd_echo') -(a)pytest.mark.buildconfigspec('image_format_legacy') +(a)pytest.mark.buildconfigspec('legacy_image_format') def test_fpga_loadmk_fail(u_boot_console): f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_legacy') @@ -275,7 +275,7 @@ def test_fpga_loadmk_fail(u_boot_console): @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('cmd_echo') -(a)pytest.mark.buildconfigspec('image_format_legacy') +(a)pytest.mark.buildconfigspec('legacy_image_format') def test_fpga_loadmk_legacy(u_boot_console): f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_legacy') @@ -289,7 +289,7 @@ def test_fpga_loadmk_legacy(u_boot_console): @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('cmd_echo') -(a)pytest.mark.buildconfigspec('image_format_legacy') +(a)pytest.mark.buildconfigspec('legacy_image_format') def test_fpga_loadmk_legacy_variable_fpga(u_boot_console): f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_legacy') @@ -306,7 +306,7 @@ def test_fpga_loadmk_legacy_variable_fpga(u_boot_console): @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('cmd_echo') -(a)pytest.mark.buildconfigspec('image_format_legacy') +(a)pytest.mark.buildconfigspec('legacy_image_format') def test_fpga_loadmk_legacy_variable_fpgadata(u_boot_console): f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_legacy') @@ -323,7 +323,7 @@ def test_fpga_loadmk_legacy_variable_fpgadata(u_boot_console): @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('cmd_echo') -(a)pytest.mark.buildconfigspec('image_format_legacy') +(a)pytest.mark.buildconfigspec('legacy_image_format') def test_fpga_loadmk_legacy_variable(u_boot_console): f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_legacy') @@ -342,7 +342,7 @@ def test_fpga_loadmk_legacy_variable(u_boot_console): @pytest.mark.buildconfigspec('cmd_fpga') @pytest.mark.buildconfigspec('cmd_fpga_loadmk') @pytest.mark.buildconfigspec('cmd_echo') -(a)pytest.mark.buildconfigspec('image_format_legacy') +(a)pytest.mark.buildconfigspec('legacy_image_format') @pytest.mark.buildconfigspec('gzip') def test_fpga_loadmk_legacy_gz(u_boot_console): f, dev, addr, bit, bit_size = load_file_from_var(u_boot_console, 'mkimage_legacy_gz') -- 2.34.1

2 2

[PATCH v1] mmc: am654_sdhci: Add the quirk to set TESTCD bit
by Emanuele Ghidoli 11 Jul '24

11 Jul '24

From: Emanuele Ghidoli <emanuele.ghidoli(a)toradex.com> The ARASAN MMC controller on Keystone 3 class of devices need the SDCD line to be connected for proper functioning. In cases where this can't be connected, add a quirk to force the controller into test mode and set the TESTCD bit. Use the flag "ti,fails-without-test-cd", to implement this above quirk when required. Additionally, this quirk also avoids waiting for the controller debounce time. This commit is similar to linux kernel commit c7666240ec76 ("drivers: mmc: sdhci_am654: Add the quirk to set TESTCD bit"). Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli(a)toradex.com> --- drivers/mmc/am654_sdhci.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/am654_sdhci.c b/drivers/mmc/am654_sdhci.c index fadab7d40bb7..43f890d269e9 100644 --- a/drivers/mmc/am654_sdhci.c +++ b/drivers/mmc/am654_sdhci.c @@ -106,6 +106,8 @@ struct am654_sdhci_plat { #define FREQSEL_2_BIT BIT(2) #define STRBSEL_4_BIT BIT(3) #define DLL_CALIB BIT(4) + u32 quirks; +#define SDHCI_AM654_QUIRK_FORCE_CDTEST BIT(0) }; struct timing_data { @@ -351,10 +353,8 @@ int am654_sdhci_init(struct am654_sdhci_plat *plat) } #define MAX_SDCD_DEBOUNCE_TIME 2000 -static int am654_sdhci_deferred_probe(struct sdhci_host *host) +static int am654_sdhci_cd_poll(struct mmc *mmc) { - struct udevice *dev = host->mmc->dev; - struct am654_sdhci_plat *plat = dev_get_plat(dev); unsigned long start; int val; @@ -369,12 +369,35 @@ static int am654_sdhci_deferred_probe(struct sdhci_host *host) if (get_timer(start) > MAX_SDCD_DEBOUNCE_TIME) return -ENOMEDIUM; - val = mmc_getcd(host->mmc); + val = mmc_getcd(mmc); } while (!val); + return 0; +} + +static int am654_sdhci_deferred_probe(struct sdhci_host *host) +{ + struct udevice *dev = host->mmc->dev; + struct am654_sdhci_plat *plat = dev_get_plat(dev); + int ret; + + if (!(plat->quirks & SDHCI_AM654_QUIRK_FORCE_CDTEST)) { + if (am654_sdhci_cd_poll(host->mmc)) + return -ENOMEDIUM; + } + am654_sdhci_init(plat); - return sdhci_probe(dev); + ret = sdhci_probe(dev); + + if (plat->quirks & SDHCI_AM654_QUIRK_FORCE_CDTEST) { + u8 hostctrlreg = sdhci_readb(host, SDHCI_HOST_CONTROL); + + hostctrlreg |= SDHCI_CTRL_CD_TEST_INS | SDHCI_CTRL_CD_TEST; + sdhci_writeb(host, hostctrlreg, SDHCI_HOST_CONTROL); + } + + return ret; } static void am654_sdhci_write_b(struct sdhci_host *host, u8 val, int reg) @@ -680,6 +703,9 @@ static int am654_sdhci_probe(struct udevice *dev) regmap_init_mem_index(dev_ofnode(dev), &plat->base, 1); + if (plat->quirks & SDHCI_AM654_QUIRK_FORCE_CDTEST) + am654_sdhci_deferred_probe(host); + return 0; } @@ -729,6 +755,8 @@ static int am654_sdhci_of_to_plat(struct udevice *dev) dev_read_u32(dev, "ti,strobe-sel", &plat->strb_sel); dev_read_u32(dev, "ti,clkbuf-sel", &plat->clkbuf_sel); + if (dev_read_bool(dev, "ti,fails-without-test-cd")) + plat->quirks |= SDHCI_AM654_QUIRK_FORCE_CDTEST; ret = mmc_of_parse(dev, cfg); if (ret) -- 2.34.1

2 1

[PATCH] board: phytec: k3: k3_ddrss_patch: Add ddr phy reg count
by Dominik Haller 11 Jul '24

11 Jul '24

Add and use the correct number of ddr phy registers to update the corresponding settings. Fixes: cbf5c99ef317 ("board: phytec: common: Introduce a method to inject DDR timings deltas") Signed-off-by: Dominik Haller <d.haller(a)phytec.de> --- board/phytec/common/k3/k3_ddrss_patch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/board/phytec/common/k3/k3_ddrss_patch.c b/board/phytec/common/k3/k3_ddrss_patch.c index 39f7be8dc922..5afe5a20c7f3 100644 --- a/board/phytec/common/k3/k3_ddrss_patch.c +++ b/board/phytec/common/k3/k3_ddrss_patch.c @@ -12,6 +12,7 @@ #ifdef CONFIG_K3_AM64_DDRSS #define LPDDR4_INTR_CTL_REG_COUNT (423U) #define LPDDR4_INTR_PHY_INDEP_REG_COUNT (345U) +#define LPDDR4_INTR_PHY_REG_COUNT (1406U) #endif static int fdt_setprop_inplace_idx_u32(void *fdt, int nodeoffset, @@ -54,7 +55,7 @@ int fdt_apply_ddrss_timings_patch(void *fdt, struct ddrss *ddrss) return ret; } - for (i = 0; i < LPDDR4_INTR_PHY_INDEP_REG_COUNT; i++) + for (i = 0; i < LPDDR4_INTR_PHY_REG_COUNT; i++) for (j = 0; j < ddrss->phy_regs_num; j++) if (i == ddrss->phy_regs[j].off) { ret = fdt_setprop_inplace_idx_u32(fdt, -- 2.25.1

3 2

[PATCH] omap3: igep0x00: Switch to the I2C driver model
by Javier Martinez Canillas 11 Jul '24

11 Jul '24

From: Javier Martinez Canillas <javierm(a)redhat.com> When building with the igep00x0_defconfig, the following warning is shown: $ make -j $(nproc) ... LD spl/u-boot-spl OBJCOPY spl/u-boot-spl-nodtb.bin SYM spl/u-boot-spl.sym CAT spl/u-boot-spl-dtb.bin COPY spl/u-boot-spl.bin MKIMAGE MLO ===================== WARNING ====================== This board does not use CONFIG_DM_I2C (Driver Model for I2C drivers). Please update the board to use CONFIG_DM_I2C before the v2022.04 release. Failure to update by the deadline may result in board removal. See doc/develop/driver-model/migration.rst for more info. ==================================================== The only reason why I2C is enabled for the IGEP boards is that the TWL4030 driver requires it. But both the TWL4034 and the OMAP I2C controller drivers were converted to the driver model by commits daa69ffe3d4d ("drivers: i2c: omap24xx_i2c: adopt omap_i2c driver to driver model") and fb1b7712ad3f power: make most tps drivers and the twl4030 driver compatible with DM_I2C") respectively. So there's no reason anymore to keep using the I2C legacy API and instead the DM_I2C option could just be enabled. Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> --- configs/igep00x0_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index 87fd2797eace..473891607b0f 100644 --- a/configs/igep00x0_defconfig +++ b/configs/igep00x0_defconfig @@ -68,8 +68,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_VERSION_VARIABLE=y # CONFIG_NET is not set CONFIG_SPL_DM=y -CONFIG_SYS_I2C_LEGACY=y -CONFIG_SPL_SYS_I2C_LEGACY=y +CONFIG_DM_I2C=y +CONFIG_I2C_SET_DEFAULT_BUS_NUM=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y CONFIG_SYS_MTDPARTS_RUNTIME=y -- 2.45.2

3 2

[PATCH] cmd: add resize for FDT in bootelf
by Maxim Moskalets 11 Jul '24

11 Jul '24

In some FDTs, there is not enough free memory to add nodes, so this operation fails. Signed-off-by: Maxim Moskalets <maximmosk4(a)gmail.com> --- cmd/elf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/elf.c b/cmd/elf.c index 32b7462f92..673c6c3051 100644 --- a/cmd/elf.c +++ b/cmd/elf.c @@ -68,6 +68,8 @@ int do_bootelf(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) log_debug("Setting up FDT at 0x%08lx ...\n", fdt_addr); flush(); + fdt_set_totalsize((void *)fdt_addr, + fdt_totalsize(fdt_addr) + CONFIG_SYS_FDT_PAD); if (image_setup_libfdt(&img, (void *)fdt_addr, NULL)) return 1; } -- 2.39.2

4 3