July 2023 - U-Boot

[bug report] bootcount: add a new driver with syscon as backend
by Dan Carpenter 27 Jul '23

27 Jul '23

Hello Nandor Han, The patch c50b21b70523: "bootcount: add a new driver with syscon as backend" from Jun 10, 2021 , leads to the following Smatch static checker warning: drivers/bootcount/bootcount_syscon.c:56 bootcount_syscon_set() warn: double left shift '(regval & 65535) << ((priv->size) << 3)' drivers/bootcount/bootcount_syscon.c 44 static int bootcount_syscon_set(struct udevice *dev, const u32 val) 45 { 46 struct bootcount_syscon_priv *priv = dev_get_priv(dev); 47 u32 regval; 48 49 if ((val & priv->magic_mask) != 0) 50 return -EINVAL; 51 52 regval = (priv->magic & priv->magic_mask) | (val & ~priv->magic_mask); 53 54 if (priv->size == 2) { 55 regval &= 0xffff; --> 56 regval |= (regval & 0xffff) << BYTES_TO_BITS(priv->size); I don't understand what's going on here but it doesn't look correct. The 0xffff mask is a no-op because we already masked it on the previous line. priv->size is either 2 or 4. So in bits that's 16 or 32. But regval is a u32 and so shifting by 32 is undefined. 57 } 58 59 debug("%s: Prepare to write reg value: 0x%08x with register mask: 0x%08x\n", 60 __func__, regval, priv->reg_mask); 61 62 return regmap_update_bits(priv->regmap, priv->reg_addr, priv->reg_mask, 63 regval); 64 } regards, dan carpenter

1 0

[PATCH V2 0/3] arm: dts: Sync k3-am62 with upstream
by Nishanth Menon 27 Jul '23

27 Jul '23

I have picked up part of Sjoerd's series[1] to keep it constrained just to dts sync at this point rather than adding newer functionality on top. You can find the full series in [2]. Attempting am625 as a start of a series of clean ups for device tree for u-boot, but will love to get any review comments to improve this series up. This series also depends on: https://lore.kernel.org/r/20230724-ti-mdio-pinmux-v4-1-18541f976501@kernel.… https://lore.kernel.org/r/20230722193151.117345-2-rogerq@kernel.org https://lore.kernel.org/r/20230722193151.117345-3-rogerq@kernel.org baseline: master 197aa22e6506 Merge branch 'master' of git://git.denx.de/u-boot-coldfire Boot log: https://gist.github.com/nmenon/a1705c385189c2367d8cad1debcf8155 Changes since V1: * Added dependency on CPSW cleanup patches. * Dropped the hack done in u-boot.dtsi to use kernel dts as is for cpsw V1: https://lore.kernel.org/all/20230725125856.1807742-1-nm@ti.com/ Changes since RFC: * dependencies are all merged on master now. * No new dependencies in this series, though the issue with uboot dtb not working for kernel is not a regression, it should probably be handled as a fixup part of RC Cycle. RFC: https://lore.kernel.org/u-boot/20230713072019.3153871-1-nm@ti.com/ Nishanth Menon (1): arm: dts: k3-am62: Bump dtsi from linux v6.5-rc1 Sjoerd Simons (2): omap: timer: add ti,am654-timer compatibility arm: mach-k3: am62: Add timer0 id to the dev list arch/arm/dts/k3-am62-main.dtsi | 389 +++++++++++++++++++++++-- arch/arm/dts/k3-am62-mcu.dtsi | 66 +++++ arch/arm/dts/k3-am62-thermal.dtsi | 33 +++ arch/arm/dts/k3-am62-wakeup.dtsi | 33 ++- arch/arm/dts/k3-am62.dtsi | 11 +- arch/arm/dts/k3-am625-r5-sk.dts | 92 +----- arch/arm/dts/k3-am625-sk-u-boot.dtsi | 33 +-- arch/arm/dts/k3-am625-sk.dts | 286 ++----------------- arch/arm/dts/k3-am625.dtsi | 54 +++- arch/arm/dts/k3-am62x-sk-common.dtsi | 412 +++++++++++++++++++++++++++ arch/arm/dts/k3-pinctrl.h | 53 ++++ arch/arm/mach-k3/am62x/dev-data.c | 1 + drivers/timer/omap-timer.c | 1 + 13 files changed, 1066 insertions(+), 398 deletions(-) create mode 100644 arch/arm/dts/k3-am62-thermal.dtsi create mode 100644 arch/arm/dts/k3-am62x-sk-common.dtsi create mode 100644 arch/arm/dts/k3-pinctrl.h [1] https://lore.kernel.org/all/20230406185542.1179073-1-sjoerd@collabora.com/ [2] https://github.com/nmenon/fix-k3-dt-u-boot/commits/fdt-fixup-s1-am625-rev3.2 -- 2.40.0

3 6

[PATCH 0/4] net: ti: am65-cpsw-nuss: Fix DT binding handling of pinctrl
by Maxime Ripard 27 Jul '23

27 Jul '23

Hi, This series is based on: https://lore.kernel.org/all/20230713072019.3153871-1-nm@ti.com/ It fixes the issue of Linux booting from the DT embedded by U-boot. The main issue there is that U-Boot doesn't handle the MDIO child node that might have resources attached to it. Thus, any pinctrl configuration that could be attached to the MDIO child node is effectively ignored. Unfortunately, starting with 6.5-rc1, Linux does just that. This was solved by duplicating the pinctrl configuration onto the MAC device node. Unfortunately, this doesn't work for Linux since now it has two devices competing for the same pins. Let me know what you think, Maxime Signed-off-by: Maxime Ripard <mripard(a)kernel.org> --- Maxime Ripard (4): pinctrl: Create a select_state variant with the ofnode net: ti: am65-cpsw-nuss: Enforce pinctrl state on the MDIO child node fixup! arm: dts: k3-am62: Bump dtsi from linux v6.5-rc1 fixup! arm: dts: k3-am62: Bump dtsi from linux v6.5-rc1 arch/arm/dts/k3-am625-sk-u-boot.dtsi | 7 ++++-- drivers/net/ti/am65-cpsw-nuss.c | 49 ++++++++++++++++++++++++++++++++++++ drivers/pinctrl/pinctrl-uclass.c | 15 ++++++----- include/dm/pinctrl.h | 26 ++++++++++++++----- 4 files changed, 83 insertions(+), 14 deletions(-) --- base-commit: acff6e7c553d5a839e885730a4018465a34ba5a7 change-id: 20230720-ti-mdio-pinmux-a12525dba973 Best regards, -- Maxime Ripard <mripard(a)kernel.org>

4 23

[PATCH] xhci_register: Fix double free on failure
by Richard Habeeb 27 Jul '23

27 Jul '23

drivers/core/device.c will call `device_free()` after xhci_register already frees the private device data. This can cause a crash later during the boot process, observed on aarch64 RPi4b as a synchronous exception. All callers of xhci_register use priv_auto, so this won't lead to memory leaks. Signed-off-by: Richard Habeeb <richard.habeeb(a)gmail.com> --- drivers/usb/host/xhci.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 9e33c5d855..5cacf0769e 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1418,7 +1418,6 @@ int xhci_register(struct udevice *dev, struct xhci_hccr *hccr, return 0; err: - free(ctrl); debug("%s: failed, ret=%d\n", __func__, ret); return ret; } -- 2.17.1

4 4

[PATCH] riscv: Support riscv64 image type
by Rick Chen 27 Jul '23

27 Jul '23

Allow U-Boot to load 32 or 64 bits RISC-V Kernel Image distinguishly. It helps to avoid someone maybe make a mistake to run 32-bit U-Boot to load 64-bit kernel. Signed-off-by: Rick Chen <rick(a)andestech.com> --- The patchset is based on Simon's patch: riscv: Add a 64-bit image type --- --- arch/riscv/include/asm/u-boot.h | 4 ++++ cmd/booti.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/u-boot.h b/arch/riscv/include/asm/u-boot.h index d5e1d5f323..e3b4a0357c 100644 --- a/arch/riscv/include/asm/u-boot.h +++ b/arch/riscv/include/asm/u-boot.h @@ -23,6 +23,10 @@ #include <asm/u-boot-riscv.h> /* For image.h:image_check_target_arch() */ +#ifdef CONFIG_ARCH_RV64I +#define IH_ARCH_DEFAULT IH_ARCH_RISCV64 +#else #define IH_ARCH_DEFAULT IH_ARCH_RISCV +#endif #endif /* _U_BOOT_H_ */ diff --git a/cmd/booti.c b/cmd/booti.c index 6ac39193db..dc0b0ae41c 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -119,7 +119,7 @@ int do_booti(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) images.os.os = IH_OS_LINUX; #ifdef CONFIG_RISCV_SMODE - images.os.arch = IH_ARCH_RISCV; + images.os.arch = IH_ARCH_DEFAULT; #elif CONFIG_ARM64 images.os.arch = IH_ARCH_ARM64; #endif -- 2.17.1

4 5

[PATCH 1/1] efi_loader: simplify dp_fill()
by Heinrich Schuchardt 27 Jul '23

27 Jul '23

Move the recursive dp_fill(dev->parent) call to a single location. Determine uclass_id only once. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_loader/efi_device_path.c | 45 +++++++++++++------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index 5b050fa17c..ed7214f3a3 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -548,14 +548,19 @@ __maybe_unused static unsigned int dp_size(struct udevice *dev) */ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) { + enum uclass_id uclass_id; + if (!dev || !dev->driver) return buf; - switch (device_get_uclass_id(dev)) { + uclass_id = device_get_uclass_id(dev); + if (uclass_id != UCLASS_ROOT) + buf = dp_fill(buf, dev->parent); + + switch (uclass_id) { #ifdef CONFIG_NETDEVICES case UCLASS_ETH: { - struct efi_device_path_mac_addr *dp = - dp_fill(buf, dev->parent); + struct efi_device_path_mac_addr *dp = buf; struct eth_pdata *pdata = dev_get_plat(dev); dp->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE; @@ -573,8 +578,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) switch (device_get_uclass_id(dev->parent)) { #ifdef CONFIG_IDE case UCLASS_IDE: { - struct efi_device_path_atapi *dp = - dp_fill(buf, dev->parent); + struct efi_device_path_atapi *dp = buf; struct blk_desc *desc = dev_get_uclass_plat(dev); dp->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE; @@ -590,8 +594,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) #endif #if defined(CONFIG_SCSI) case UCLASS_SCSI: { - struct efi_device_path_scsi *dp = - dp_fill(buf, dev->parent); + struct efi_device_path_scsi *dp = buf; struct blk_desc *desc = dev_get_uclass_plat(dev); dp->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE; @@ -604,8 +607,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) #endif #if defined(CONFIG_MMC) case UCLASS_MMC: { - struct efi_device_path_sd_mmc_path *sddp = - dp_fill(buf, dev->parent); + struct efi_device_path_sd_mmc_path *sddp = buf; struct blk_desc *desc = dev_get_uclass_plat(dev); sddp->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE; @@ -619,8 +621,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) #endif #if defined(CONFIG_AHCI) || defined(CONFIG_SATA) case UCLASS_AHCI: { - struct efi_device_path_sata *dp = - dp_fill(buf, dev->parent); + struct efi_device_path_sata *dp = buf; struct blk_desc *desc = dev_get_uclass_plat(dev); dp->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE; @@ -635,8 +636,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) #endif #if defined(CONFIG_NVME) case UCLASS_NVME: { - struct efi_device_path_nvme *dp = - dp_fill(buf, dev->parent); + struct efi_device_path_nvme *dp = buf; u32 ns_id; dp->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE; @@ -650,8 +650,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) #if defined(CONFIG_USB) case UCLASS_MASS_STORAGE: { struct blk_desc *desc = dev_get_uclass_plat(dev); - struct efi_device_path_controller *dp = - dp_fill(buf, dev->parent); + struct efi_device_path_controller *dp = buf; dp->dp.type = DEVICE_PATH_TYPE_HARDWARE_DEVICE; dp->dp.sub_type = DEVICE_PATH_SUB_TYPE_CONTROLLER; @@ -662,10 +661,9 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) #endif default: { /* UCLASS_BLKMAP, UCLASS_HOST, UCLASS_VIRTIO */ - struct efi_device_path_udevice *dp; + struct efi_device_path_udevice *dp = buf; struct blk_desc *desc = dev_get_uclass_plat(dev); - dp = dp_fill(buf, dev->parent); dp->dp.type = DEVICE_PATH_TYPE_HARDWARE_DEVICE; dp->dp.sub_type = DEVICE_PATH_SUB_TYPE_VENDOR; dp->dp.length = sizeof(*dp); @@ -680,8 +678,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) } #if defined(CONFIG_MMC) case UCLASS_MMC: { - struct efi_device_path_sd_mmc_path *sddp = - dp_fill(buf, dev->parent); + struct efi_device_path_sd_mmc_path *sddp = buf; struct mmc *mmc = mmc_get_mmc_dev(dev); struct blk_desc *desc = mmc_get_blk_desc(mmc); @@ -697,7 +694,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) #endif case UCLASS_MASS_STORAGE: case UCLASS_USB_HUB: { - struct efi_device_path_usb *udp = dp_fill(buf, dev->parent); + struct efi_device_path_usb *udp = buf; switch (device_get_uclass_id(dev->parent)) { case UCLASS_USB_HUB: { @@ -717,13 +714,7 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev) return &udp[1]; } default: { - struct efi_device_path_udevice *vdp; - enum uclass_id uclass_id = device_get_uclass_id(dev); - - if (uclass_id == UCLASS_ROOT) - vdp = buf; - else - vdp = dp_fill(buf, dev->parent); + struct efi_device_path_udevice *vdp = buf; vdp->dp.type = DEVICE_PATH_TYPE_HARDWARE_DEVICE; vdp->dp.sub_type = DEVICE_PATH_SUB_TYPE_VENDOR; -- 2.40.1

2 3

[PATCH v1] HSD #18028953892: usb: xhci-dwc3: Fix USB3.1 controller register access in reset state
by Jit Loon Lim 27 Jul '23

27 Jul '23

From: Teik Heng Chong <teik.heng.chong(a)intel.com> The controller registers should not be accessed while the controller's vcc_reset_n is asserted. Signed-off-by: Teik Heng Chong <teik.heng.chong(a)intel.com> --- drivers/usb/host/xhci-dwc3.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index 1dbd65dfaa..3172956bd6 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -227,6 +227,11 @@ static int xhci_dwc3_probe(struct udevice *dev) static int xhci_dwc3_remove(struct udevice *dev) { struct xhci_dwc3_plat *plat = dev_get_plat(dev); + int ret; + + ret = xhci_deregister(dev); + if (ret) + return ret; dwc3_shutdown_phy(dev, &plat->phys); @@ -234,7 +239,7 @@ static int xhci_dwc3_remove(struct udevice *dev) reset_release_bulk(&plat->resets); - return xhci_deregister(dev); + return 0; } static const struct udevice_id xhci_dwc3_ids[] = { -- 2.26.2

5 11

[RFC PATCH 00/10] Add RPMsg framework
by Tanmay Shah 27 Jul '23

27 Jul '23

Remote Processor Messaging (RPMsg) framework is used to communicate with remote processor. RPMsg is a virtio-based messaging bus that allows U-Boot drivers to communicate with remote processors available on the system. This patch also introduces new virtio transport layer driver. To keep things minimal for now hard-coded endpoint is used in U-Boot to communicate with remote processor using RPMsg protocol. This will be modified to use multiple endpoints in future. U-Boot can't receive interrupts from remote processor as per design. Hence, user has to know when the data will be available from remote processor and call rpmsg_recv accordingly. Mostly it will be called to receive response of query done using rpmsg_send. Some code is already available to allocate memory for RPMsg however, that framework is mostly TI platform specific and isn't used by any other platforms. This series makes sure it does not break previous code for other platforms. If platforms wants to use this new framework it is expected to set "support_rpmsg_virtio" flag in relative remoteproc device's platform data. Also the framework introduced by this series is ported from the Linux kernel so other platforms which already support RPMsg in the Linux kernel can easily use this framework in U-Boot as well. --- Tanmay Shah (10): remoteproc: move resource table definition firmware: zynqmp: move zynqmp_pm_request_node API remoteproc: add remoteproc virtio transport driver drivers: add RPMsg framework rpmsg: add sample client driver cmd: add rpmsg framework commands remoteproc: add attach/detach commands remoteproc: add zynqmp driver configs: zynqmp: enable remoteproc and rpmsg configs: sandbox: enable rpmsg MAINTAINERS | 15 + arch/sandbox/dts/test.dts | 8 + cmd/Kconfig | 6 + cmd/Makefile | 1 + cmd/remoteproc.c | 14 +- cmd/rpmsg.c | 61 +++ configs/sandbox_defconfig | 4 + configs/xilinx_zynqmp_virt_defconfig | 6 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/firmware/firmware-zynqmp.c | 27 ++ drivers/power/domain/zynqmp-power-domain.c | 7 - drivers/remoteproc/Kconfig | 20 + drivers/remoteproc/Makefile | 2 + drivers/remoteproc/rproc-elf-loader.c | 33 -- drivers/remoteproc/rproc-uclass.c | 125 +++++- drivers/remoteproc/rproc_virtio.c | 422 +++++++++++++++++++++ drivers/remoteproc/xlnx_rproc.c | 411 ++++++++++++++++++++ drivers/rpmsg/Kconfig | 39 ++ drivers/rpmsg/Makefile | 13 + drivers/rpmsg/rpmsg-uclass.c | 156 ++++++++ drivers/rpmsg/rpmsg_internal.h | 52 +++ drivers/rpmsg/rpmsg_sample_client.c | 63 +++ drivers/rpmsg/sandbox_test_rpmsg.c | 88 +++++ drivers/rpmsg/virtio_rpmsg_bus.c | 384 +++++++++++++++++++ drivers/virtio/virtio-uclass.c | 1 + drivers/virtio/virtio_ring.c | 16 + include/dm/uclass-id.h | 1 + include/remoteproc.h | 130 ++++++- include/rpmsg.h | 145 +++++++ include/rproc_virtio.h | 33 ++ include/virtio.h | 7 +- include/virtio_ring.h | 32 ++ include/zynqmp_firmware.h | 30 +- test/dm/Makefile | 1 + test/dm/rpmsg.c | 41 ++ 36 files changed, 2321 insertions(+), 76 deletions(-) create mode 100644 cmd/rpmsg.c create mode 100644 drivers/remoteproc/rproc_virtio.c create mode 100644 drivers/remoteproc/xlnx_rproc.c create mode 100644 drivers/rpmsg/Kconfig create mode 100644 drivers/rpmsg/Makefile create mode 100644 drivers/rpmsg/rpmsg-uclass.c create mode 100644 drivers/rpmsg/rpmsg_internal.h create mode 100644 drivers/rpmsg/rpmsg_sample_client.c create mode 100644 drivers/rpmsg/sandbox_test_rpmsg.c create mode 100644 drivers/rpmsg/virtio_rpmsg_bus.c create mode 100644 include/rpmsg.h create mode 100644 include/rproc_virtio.h create mode 100644 test/dm/rpmsg.c base-commit: 94e7cb181ad6bd25d36a11c58e0df64e9f815888 -- 2.25.1

2 17

Re: [PATCH 2/5] iot2050: Use binman in signing script
by Simon Glass 27 Jul '23

27 Jul '23

On Wed, 26 Jul 2023 at 09:21, Jan Kiszka <jan.kiszka(a)siemens.com> wrote: > > From: Jan Kiszka <jan.kiszka(a)siemens.com> > > The underlying issue was fixed in the meantime. Also signing the U-Boot > proper fit image now works. Just supporting custom cert templates > remains a todo. > > Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> > --- > CC: Simon Glass <sjg(a)chromium.org> > --- > tools/iot2050-sign-fw.sh | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > Reviewed-by: Simon Glass <sjg(a)chromium.org>

1 0

Re: [PATCH 18/18] riscv: qemu: Enable usb keyboard as an input device
by Rick Chen 27 Jul '23

27 Jul '23

> From: U-Boot <u-boot-bounces(a)lists.denx.de> On Behalf Of Bin Meng > Sent: Sunday, July 23, 2023 12:41 PM > To: Simon Glass <sjg(a)chromium.org>; u-boot(a)lists.denx.de > Cc: Bin Meng <bmeng.cn(a)gmail.com>; Heinrich Schuchardt <xypron.glpk(a)gmx.de> > Subject: [PATCH 18/18] riscv: qemu: Enable usb keyboard as an input device > > This brings PCI xHCI support to QEMU RISC-V and uses a usb keyboard as one of the input devices. > > Signed-off-by: Bin Meng <bmeng(a)tinylab.org> > > --- > > board/emulation/qemu-riscv/Kconfig | 5 +++++ > board/emulation/qemu-riscv/qemu-riscv.c | 5 +++++ > doc/board/emulation/qemu-riscv.rst | 5 +++++ > include/configs/qemu-riscv.h | 2 +- > 4 files changed, 16 insertions(+), 1 deletion(-) Reviewed-by: Rick Chen <rick(a)andestech.com>

2 1