April 2024 - U-Boot

Fwd: New Defects reported by Coverity Scan for Das U-Boot
by Tom Rini 23 Apr '24

23 Apr '24

Here's the latest report. ---------- Forwarded message --------- From: <scan-admin(a)coverity.com> Date: Mon, Apr 22, 2024 at 3:23 PM Subject: New Defects reported by Coverity Scan for Das U-Boot To: <tom.rini(a)gmail.com> Hi, Please find the latest report on new defect(s) introduced to Das U-Boot found with Coverity Scan. 2 new defect(s) introduced to Das U-Boot found with Coverity Scan. 7 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent build analyzed by Coverity Scan. New defect(s) Reported-by: Coverity Scan Showing 2 of 2 defect(s) ** CID 492766: Control flow issues (DEADCODE) /lib/efi_loader/efi_var_mem.c: 236 in efi_var_mem_init() ________________________________________________________________________________________________________ *** CID 492766: Control flow issues (DEADCODE) /lib/efi_loader/efi_var_mem.c: 236 in efi_var_mem_init() 230 memset(efi_var_buf, 0, EFI_VAR_BUF_SIZE); 231 efi_var_buf->magic = EFI_VAR_FILE_MAGIC; 232 efi_var_buf->length = (uintptr_t)efi_var_buf->var - 233 (uintptr_t)efi_var_buf; 234 235 if (ret != EFI_SUCCESS) >>> CID 492766: Control flow issues (DEADCODE) >>> Execution cannot reach this statement: "return ret;". 236 return ret; 237 ret = efi_create_event(EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE, TPL_CALLBACK, 238 efi_var_mem_notify_virtual_address_map, NULL, 239 NULL, &event); 240 if (ret != EFI_SUCCESS) 241 return ret; ** CID 492765: Uninitialized variables (UNINIT) ________________________________________________________________________________________________________ *** CID 492765: Uninitialized variables (UNINIT) /net/bootp.c: 888 in dhcp_process_options() 882 net_root_path[size] = 0; 883 break; 884 case 28: /* Ignore Broadcast Address Option */ 885 break; 886 case 40: /* NIS Domain name */ 887 if (net_nis_domain[0] == 0) { >>> CID 492765: Uninitialized variables (UNINIT) >>> Using uninitialized value "size" when calling "truncate_sz". 888 size = truncate_sz("NIS Domain Name", 889 sizeof(net_nis_domain), size); 890 memcpy(&net_nis_domain, popt + 2, size); 891 net_nis_domain[size] = 0; 892 } 893 break; -- Tom

2 1

BTRFS use-after-free bug at free_extent_buffer_internal
by Sachi King 23 Apr '24

23 Apr '24

Hi, I've hit a bug with u-boot on my BTRFS filesystem, and I'm fairly certain it's a bug and not a corruption issue. A bit of history on the filesystem. It is a fairly new filesystem as it was being used to give me access to test a wayland application on a Raspberry Pi. The filesystem was about 3 days old when I hit the bug, and I'm fairly certain it never had an unclean shutdown. I have checked the filesystem with "btrfs check" which has found no errors. The filesystem mounts on Linux and is functional. > # btrfs check --check-data-csum /dev/sda2 > Opening filesystem to check... > Checking filesystem on /dev/sda2 > UUID: 18db6211-ac36-42c1-a22f-5e15e1486e0d > [1/7] checking root items > [2/7] checking extents > [3/7] checking free space tree > [4/7] checking fs roots > [5/7] checking csums against data > [6/7] checking root refs > [7/7] checking quota groups skipped (not enabled on this FS) > found 5070573568 bytes used, no error found > total csum bytes: 4451620 > total tree bytes: 370458624 > total fs tree bytes: 353124352 > total extent tree bytes: 10010624 > btree space waste bytes: 62303284 > file data blocks allocated: 6786519040 > referenced 6328619008 I've made an image of the filesystem so I could reproduce the bug in an environment that doesn't require the physical SBC, and have reproduced the issue using the head of the master branch with "qemu-x86_64_defconfig". My testing qemu was produced with the following: > # make qemu-x86_64_defconfig > # cat << EOF >> .config > CONFIG_AUTOBOOT=y > CONFIG_BOOTDELAY=1 > CONFIG_USE_BOOTCOMMAND=y > CONFIG_BOOTSTD_DEFAULTS=y > CONFIG_BOOTSTD_FULL=y > CONFIG_CMD_BOOTFLOW_FULL=y > CONFIG_BOOTCOMMAND="bootflow scan -lb" > CONFIG_ENV_IS_NOWHERE=y > CONFIG_LZ4=y > CONFIG_BZIP2=y > CONFIG_ZSTD=y > CONFIG_FS_BTRFS=y > CONFIG_CMD_BTRFS=y > CONFIG_GZIP=y > CONFIG_DEVICE_TREE_INCLUDES="bootstd.dtsi" > EOF > # make -j24 bootstd.dtsi is placed at "arch/x86/dts/bootstd.dtsi" and contains: > / { > bootstd { > compatible = "u-boot,boot-std"; > filename-prefixes = "/@boot/", "/boot/", "/"; > bootdev-order = "scsi"; > extlinux { > compatible = "u-boot,extlinux"; > }; > }; > }; The VM was run with > qemu-system-x86_64 -bios u-boot.rom -nographic -M q35 -action reboot=shutdown -drive file=/mnt/dbg/u-boot-debug.img The error message I recive on boot is > BUG at fs/btrfs/extent-io.c:629/free_extent_buffer_internal()! > BUG! > resetting ... I added a print statement to free_extent_buffer_internal that prints the start address of the extent_buffer as I'm not sure what to be looking for here. This print statement is before the decrement. > printf("free_extent_buffer_internal: eb->start[%llx] eb->refs[%i]\n", eb->start, eb->refs); The last message before the crash reported eb->start to be "0", with 0 refs. > free_extent_buffer_internal: eb->start[0] eb->refs[0] The extent at 0 struck me as odd, so I tried commenting out the freeing, by removing the call to free_extent_buffer_final, and this resulted in bootflow succeeding and showing me the boot menu, which suprised me. I expected to see the bug reproduce itself, with refs being zero, but eb->start pointing somewhere valid, but I instead got a valid address with refs at 2. I'm assuming that the order free_extent_buffer_internal is called is deterministic, so by counting the print outputs the line that prior held the extent_buffer with a 0 start was replaced with: > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] Interestingly, as can be seen in the full logs with my included print messages, 249c000 is being used just before this, with a ref count of 2. 249c000 does appear to reach a point where it should have been freed in the past, before it gets used again as seen in both logs. The failing boot log: > U-Boot SPL 2024.04-00949-g1dd659fd62-dirty (Apr 22 2024 - 11:32:37 +1000) > Trying to boot from SPI > Jumping to 64-bit U-Boot: Note many features are missing > > > U-Boot 2024.04-00949-g1dd659fd62-dirty (Apr 22 2024 - 11:32:37 +1000) > > CPU: QEMU Virtual CPU version 2.5+ > DRAM: 128 MiB > Core: 13 devices, 13 uclasses, devicetree: separate > Loading Environment from nowhere... OK > Model: QEMU x86 (I440FX) > Net: e1000: 00:00:00:00:00:00 > > Error: e1000#0 No valid MAC address found. > eth_initialize() No ethernet found. > > > Hit any key to stop autoboot: 0 > Scanning for bootflows in all bootdevs > Seq Method State Uclass Part Name Filename > --- ----------- ------ -------- ---- ------------------------ ---------------- > scanning bus for devices... > Target spinup took 0 ms. > SATA link 1 timeout. > Target spinup took 0 ms. > SATA link 3 timeout. > SATA link 4 timeout. > SATA link 5 timeout. > AHCI 0001.0000 32 slots 6 ports 1.5 Gbps 0x3f impl SATA mode > flags: 64bit ncq only > free_extent_buffer_internal: eb->start[10000] eb->refs[1] > free_extent_buffer_internal: eb->start[1548000] eb->refs[1] > free_extent_buffer_internal: eb->start[150c000] eb->refs[1] > free_extent_buffer_internal: eb->start[154c000] eb->refs[1] > free_extent_buffer_internal: eb->start[1544000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[2490000] eb->refs[1] > free_extent_buffer_internal: eb->start[6de0000] eb->refs[1] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[1] > free_extent_buffer_internal: eb->start[1544000] eb->refs[1] > Device 0: (0:0) Vendor: ATA Prod.: QEMU HARDDISK Rev: 2.5+ > Type: Hard Disk > Capacity: 58680.0 MB = 57.3 GB (120176640 x 512) > timeout exit! > Scanning bootdev 'ahci_scsi.id0lun0.bootdev': > free_extent_buffer_internal: eb->start[10000] eb->refs[1] > free_extent_buffer_internal: eb->start[1548000] eb->refs[1] > free_extent_buffer_internal: eb->start[150c000] eb->refs[1] > free_extent_buffer_internal: eb->start[154c000] eb->refs[1] > free_extent_buffer_internal: eb->start[1544000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[2490000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a0000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a0000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a4000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[2490000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[1] > free_extent_buffer_internal: eb->start[6de0000] eb->refs[1] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[1] > free_extent_buffer_internal: eb->start[1544000] eb->refs[1] > free_extent_buffer_internal: eb->start[10000] eb->refs[1] > free_extent_buffer_internal: eb->start[1548000] eb->refs[1] > free_extent_buffer_internal: eb->start[150c000] eb->refs[1] > free_extent_buffer_internal: eb->start[154c000] eb->refs[1] > free_extent_buffer_internal: eb->start[1544000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[2490000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a0000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a0000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[2490000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a0000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a0000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a4000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a4000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a4000] eb->refs[1] > free_extent_buffer_internal: eb->start[0] eb->refs[0] > BUG at fs/btrfs/extent-io.c:626/free_extent_buffer_internal()! > BUG! > resetting ... The succeeding log with the removed freeing: > U-Boot SPL 2024.04-00949-g1dd659fd62-dirty (Apr 22 2024 - 11:38:25 +1000) > Trying to boot from SPI > Jumping to 64-bit U-Boot: Note many features are missing > > > U-Boot 2024.04-00949-g1dd659fd62-dirty (Apr 22 2024 - 11:38:25 +1000) > > CPU: QEMU Virtual CPU version 2.5+ > DRAM: 128 MiB > Core: 13 devices, 13 uclasses, devicetree: separate > Loading Environment from nowhere... OK > Model: QEMU x86 (I440FX) > Net: e1000: 00:00:00:00:00:00 > > Error: e1000#0 No valid MAC address found. > eth_initialize() No ethernet found. > > > Hit any key to stop autoboot: 0 > Scanning for bootflows in all bootdevs > Seq Method State Uclass Part Name Filename > --- ----------- ------ -------- ---- ------------------------ ---------------- > scanning bus for devices... > Target spinup took 0 ms. > SATA link 1 timeout. > Target spinup took 0 ms. > SATA link 3 timeout. > SATA link 4 timeout. > SATA link 5 timeout. > AHCI 0001.0000 32 slots 6 ports 1.5 Gbps 0x3f impl SATA mode > flags: 64bit ncq only > free_extent_buffer_internal: eb->start[10000] eb->refs[1] > free_extent_buffer_internal: eb->start[1548000] eb->refs[1] > free_extent_buffer_internal: eb->start[150c000] eb->refs[1] > free_extent_buffer_internal: eb->start[154c000] eb->refs[1] > free_extent_buffer_internal: eb->start[1544000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[2490000] eb->refs[1] > free_extent_buffer_internal: eb->start[6de0000] eb->refs[1] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[1] > free_extent_buffer_internal: eb->start[1544000] eb->refs[1] > Device 0: (0:0) Vendor: ATA Prod.: QEMU HARDDISK Rev: 2.5+ > Type: Hard Disk > Capacity: 58680.0 MB = 57.3 GB (120176640 x 512) > timeout exit! > Scanning bootdev 'ahci_scsi.id0lun0.bootdev': > free_extent_buffer_internal: eb->start[10000] eb->refs[1] > free_extent_buffer_internal: eb->start[1548000] eb->refs[1] > free_extent_buffer_internal: eb->start[150c000] eb->refs[1] > free_extent_buffer_internal: eb->start[154c000] eb->refs[1] > free_extent_buffer_internal: eb->start[1544000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[2490000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a0000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a0000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a4000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[2490000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[1] > free_extent_buffer_internal: eb->start[6de0000] eb->refs[1] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[1] > free_extent_buffer_internal: eb->start[1544000] eb->refs[1] > free_extent_buffer_internal: eb->start[10000] eb->refs[1] > free_extent_buffer_internal: eb->start[1548000] eb->refs[1] > free_extent_buffer_internal: eb->start[150c000] eb->refs[1] > free_extent_buffer_internal: eb->start[154c000] eb->refs[1] > free_extent_buffer_internal: eb->start[1544000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[2490000] eb->refs[2] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a0000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a0000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[2490000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a0000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a0000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a4000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a4000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[24a4000] eb->refs[1] > free_extent_buffer_internal: eb->start[249c000] eb->refs[2] > free_extent_buffer_internal: eb->start[2490000] eb->refs[1] > free_extent_buffer_internal: eb->start[6de0000] eb->refs[1] > free_extent_buffer_internal: eb->start[28f4000] eb->refs[1] > free_extent_buffer_internal: eb->start[1544000] eb->refs[1] > 0 extlinux ready scsi 2 ahci_scsi.id0lun0.bootdev /(a)boot/extlinux/extlinux.conf > ** Booting bootflow 'ahci_scsi.id0lun0.bootdev.part_2' with extlinux > ------------------------------------------------------------ > 1: NixOS - Default > 2: NixOS - Configuration 5 (2024-03-04 11:00 - 24.05.20240205.faf912b) > 3: NixOS - Configuration 4 (2024-03-02 15:05 - 24.05.20240205.faf912b) > 4: NixOS - Configuration 3 (2024-03-02 14:26 - 24.05.20240205.faf912b) > 5: NixOS - Configuration 2 (2024-03-02 14:06 - 24.05.20240205.faf912b) > 6: NixOS - Configuration 1 (1970-01-01 10:00 - 24.05.20240205.faf912b) > Enter choice: 1: NixOS - Default > Retrieving file: /@boot/extlinux/../nixos/gq8jsgxnhq2wvsjrni3cjw1wb5540wjw-linux-6.1.63-stable_20231123-Image > free_extent_buffer_internal: eb->start[10000] eb->refs[1] I'm not sure where to go from here with the bug, so I'm hoping for some help in tracking it down so it can be fixed. Thanks, Sachi

2 3

[PATCH] usb: dwc3: support USB 3.1 controllers
by Caleb Connolly 23 Apr '24

23 Apr '24

The revision is different for these, add the additional check as in xhci-dwc3 core_init code. Signed-off-by: Caleb Connolly <caleb.connolly(a)linaro.org> --- drivers/usb/dwc3/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 96e850b7170f..db045f5822d4 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -594,9 +594,10 @@ static int dwc3_core_init(struct dwc3 *dwc) int ret; reg = dwc3_readl(dwc->regs, DWC3_GSNPSID); /* This should read as U3 followed by revision number */ - if ((reg & DWC3_GSNPSID_MASK) != 0x55330000) { + if ((reg & DWC3_GSNPSID_MASK) != 0x55330000 && + (reg & DWC3_GSNPSID_MASK) != 0x33310000) { dev_err(dwc->dev, "this is not a DesignWare USB3 DRD Core\n"); ret = -ENODEV; goto err0; } -- 2.44.0

4 5

[PATCH] usb: dwc2: update reset method for host and device mode
by Kongyang Liu 23 Apr '24

23 Apr '24

Starting from version 4.20a, there has been a change in the reset method. A new bit, GRSTCTL_CSFTRST_DONE, has been introduced in the GRSTCTL register to indicate whether the reset has been completed. Signed-off-by: Kongyang Liu <seashell11234455(a)gmail.com> --- drivers/usb/gadget/dwc2_udc_otg.c | 18 ++++++++++++++++-- drivers/usb/gadget/dwc2_udc_otg_regs.h | 19 +++++++++++++------ drivers/usb/host/dwc2.c | 19 ++++++++++++++++--- drivers/usb/host/dwc2.h | 6 ++++++ 4 files changed, 51 insertions(+), 11 deletions(-) diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index 27082f5152..d1dd469a0f 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -42,7 +42,7 @@ #include <asm/unaligned.h> #include <asm/io.h> -#include <asm/mach-types.h> +#include <wait_bit.h> #include <power/regulator.h> @@ -464,12 +464,26 @@ static void reconfig_usbd(struct dwc2_udc *dev) { /* 2. Soft-reset OTG Core and then unreset again. */ int i; - unsigned int uTemp = writel(CORE_SOFT_RESET, &reg->grstctl); + unsigned int uTemp; uint32_t dflt_gusbcfg; uint32_t rx_fifo_sz, tx_fifo_sz, np_tx_fifo_sz; u32 max_hw_ep; int pdata_hw_ep; + u32 snpsid, greset; + + snpsid = readl(&reg->gsnpsid); + writel(CORE_SOFT_RESET, &reg->grstctl); + if ((snpsid & SNPSID_VER_MASK) < (SNPSID_VER_420a & SNPSID_VER_MASK)) { + wait_for_bit_le32(&reg->grstctl, CORE_SOFT_RESET, false, 1000, false); + } else { + wait_for_bit_le32(&reg->grstctl, CORE_SOFT_RESET_DONE, true, 1000, false); + greset = readl(&reg->grstctl); + greset &= ~CORE_SOFT_RESET; + greset |= CORE_SOFT_RESET_DONE; + writel(greset, &reg->grstctl); + } + debug("Resetting OTG controller\n"); dflt_gusbcfg = diff --git a/drivers/usb/gadget/dwc2_udc_otg_regs.h b/drivers/usb/gadget/dwc2_udc_otg_regs.h index 9ca6f42375..b3d9117033 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_regs.h +++ b/drivers/usb/gadget/dwc2_udc_otg_regs.h @@ -63,24 +63,26 @@ struct dwc2_usbotg_reg { u32 gnptxfsiz; /* Non-Periodic Transmit FIFO Size */ u8 res0[12]; u32 ggpio; /* 0x038 */ - u8 res1[20]; + u8 res1[4]; + u32 gsnpsid; + u8 res2[12]; u32 ghwcfg4; /* User HW Config4 */ - u8 res2[176]; + u8 res3[176]; u32 dieptxf[15]; /* Device Periodic Transmit FIFO size register */ - u8 res3[1728]; + u8 res4[1728]; /* Device Configuration */ u32 dcfg; /* Device Configuration Register */ u32 dctl; /* Device Control */ u32 dsts; /* Device Status */ - u8 res4[4]; + u8 res5[4]; u32 diepmsk; /* Device IN Endpoint Common Interrupt Mask */ u32 doepmsk; /* Device OUT Endpoint Common Interrupt Mask */ u32 daint; /* Device All Endpoints Interrupt */ u32 daintmsk; /* Device All Endpoints Interrupt Mask */ - u8 res5[224]; + u8 res6[224]; struct dwc2_dev_in_endp in_endp[16]; struct dwc2_dev_out_endp out_endp[16]; - u8 res6[768]; + u8 res7[768]; struct ep_fifo ep[16]; }; @@ -118,6 +120,7 @@ struct dwc2_usbotg_reg { /* DWC2_UDC_OTG_GRSTCTL */ #define AHB_MASTER_IDLE (1u<<31) #define CORE_SOFT_RESET (0x1<<0) +#define CORE_SOFT_RESET_DONE (0x1<<29) /* DWC2_UDC_OTG_GINTSTS/DWC2_UDC_OTG_GINTMSK core interrupt register */ #define INT_RESUME (1u<<31) @@ -285,6 +288,10 @@ struct dwc2_usbotg_reg { #define DAINT_IN_EP_INT(x) (x << 0) #define DAINT_OUT_EP_INT(x) (x << 16) +/* DWC2_UDC_OTG_GSNPSID */ +#define SNPSID_VER_420a 0x4f54420a +#define SNPSID_VER_MASK 0xffff + /* User HW Config4 */ #define GHWCFG4_NUM_IN_EPS_MASK (0xf << 26) #define GHWCFG4_NUM_IN_EPS_SHIFT 26 diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c index 637eb2dd06..1baeff96ee 100644 --- a/drivers/usb/host/dwc2.c +++ b/drivers/usb/host/dwc2.c @@ -159,6 +159,7 @@ static void dwc_otg_core_reset(struct udevice *dev, struct dwc2_core_regs *regs) { int ret; + u32 snpsid, greset; /* Wait for AHB master IDLE state. */ ret = wait_for_bit_le32(&regs->grstctl, DWC2_GRSTCTL_AHBIDLE, @@ -167,9 +168,20 @@ static void dwc_otg_core_reset(struct udevice *dev, dev_info(dev, "%s: Timeout!\n", __func__); /* Core Soft Reset */ + snpsid = readl(&regs->gsnpsid); writel(DWC2_GRSTCTL_CSFTRST, &regs->grstctl); - ret = wait_for_bit_le32(&regs->grstctl, DWC2_GRSTCTL_CSFTRST, - false, 1000, false); + if ((snpsid & DWC2_SNPSID_VER_MASK) < (DWC2_SNPSID_DEVID_VER_420a & DWC2_SNPSID_VER_MASK)) { + ret = wait_for_bit_le32(&regs->grstctl, DWC2_GRSTCTL_CSFTRST, + false, 1000, false); + } else { + ret = wait_for_bit_le32(&regs->grstctl, DWC2_GRSTCTL_GSFTRST_DONE, + true, 1000, false); + greset = readl(&regs->grstctl); + greset &= ~DWC2_GRSTCTL_CSFTRST; + greset |= DWC2_GRSTCTL_GSFTRST_DONE; + writel(greset, &regs->grstctl); + } + if (ret) dev_info(dev, "%s: Timeout!\n", __func__); @@ -1180,7 +1192,8 @@ static int dwc2_init_common(struct udevice *dev, struct dwc2_priv *priv) snpsid >> 12 & 0xf, snpsid & 0xfff); if ((snpsid & DWC2_SNPSID_DEVID_MASK) != DWC2_SNPSID_DEVID_VER_2xx && - (snpsid & DWC2_SNPSID_DEVID_MASK) != DWC2_SNPSID_DEVID_VER_3xx) { + (snpsid & DWC2_SNPSID_DEVID_MASK) != DWC2_SNPSID_DEVID_VER_3xx && + (snpsid & DWC2_SNPSID_DEVID_MASK) != DWC2_SNPSID_DEVID_VER_4xx) { dev_info(dev, "SNPSID invalid (not DWC2 OTG device): %08x\n", snpsid); return -ENODEV; diff --git a/drivers/usb/host/dwc2.h b/drivers/usb/host/dwc2.h index 6f022e33a1..e1f0f59b82 100644 --- a/drivers/usb/host/dwc2.h +++ b/drivers/usb/host/dwc2.h @@ -207,6 +207,8 @@ struct dwc2_core_regs { #define DWC2_GRSTCTL_TXFFLSH_OFFSET 5 #define DWC2_GRSTCTL_TXFNUM_MASK (0x1F << 6) #define DWC2_GRSTCTL_TXFNUM_OFFSET 6 +#define DWC2_GRSTCTL_GSFTRST_DONE (1 << 29) +#define DWC2_GRSTCTL_GSFTRST_DONE_OFFSET 29 #define DWC2_GRSTCTL_DMAREQ (1 << 30) #define DWC2_GRSTCTL_DMAREQ_OFFSET 30 #define DWC2_GRSTCTL_AHBIDLE (1 << 31) @@ -739,8 +741,12 @@ struct dwc2_core_regs { #define DWC2_PCGCCTL_DEEP_SLEEP_OFFSET 7 #define DWC2_SNPSID_DEVID_VER_2xx (0x4f542 << 12) #define DWC2_SNPSID_DEVID_VER_3xx (0x4f543 << 12) +#define DWC2_SNPSID_DEVID_VER_4xx (0x4f544 << 12) +#define DWC2_SNPSID_DEVID_VER_420a 0x4f54420a #define DWC2_SNPSID_DEVID_MASK (0xfffff << 12) #define DWC2_SNPSID_DEVID_OFFSET 12 +#define DWC2_SNPSID_VER_MASK 0xffff +#define DWC2_SNPSID_VER_OFFSET 0 /* Host controller specific */ #define DWC2_HC_PID_DATA0 0 -- 2.41.0

3 5

[PATCH 0/2] Generate all SR boot binaries
by Neha Malcom Francis 23 Apr '24

23 Apr '24

Add support for missing HS SRs in the build for J721E and J7200. Boot logs: https://gist.github.com/nehamalcom/e652752623537aced8cf31308015d7c9 Neha Malcom Francis (2): arm: dts: k3-j721e-binman: Add support for HSSE2.0 and HSFS1.1 arm: dts: k3-j7200-binman: Add support for HSSE1.0 and HSFS1.0 arch/arm/dts/k3-j7200-binman.dtsi | 95 +++++++++++++- arch/arm/dts/k3-j721e-binman.dtsi | 201 +++++++++++++++++++++++++++++- 2 files changed, 294 insertions(+), 2 deletions(-) -- 2.34.1

2 4

[ANN] U-Boot v2024.07-rc1 released
by Tom Rini 22 Apr '24

22 Apr '24

Hey all, It's release day and here is -rc1. Looking at my own queue, I think things are overall good. There's a few changes I want to pull in still (mainly moving more things to OF_UPSTREAM) but since they were recently posted I'll wait a little bit. In terms of a changelog, git log --merges v2024.04..v2024.07-rc1 contains what I've pulled but as always, better PR messages and tags will provide better results here. I hope to remain on schedule and that means the rest of the rcs every other Monday, and with final release on Monday, July 1st, 2024. Thanks all! -- Tom

1 0

[PATCH 1/1] doc: correct description of 'env print -e'
by Heinrich Schuchardt 22 Apr '24

22 Apr '24

If 'env print -e' is invoked without variable name, all UEFI variables are listed. Describe that 'env print -e' requires CONFIG_HEXDUMP=y to print content of UEFI variables. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- doc/usage/cmd/env.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/usage/cmd/env.rst b/doc/usage/cmd/env.rst index 040076bcc03..5478c541776 100644 --- a/doc/usage/cmd/env.rst +++ b/doc/usage/cmd/env.rst @@ -226,7 +226,7 @@ in UEFI variables. \-a all U-Boot environment, when 'name' is absent. \-e - print UEFI variables, all by default when 'name'. + print UEFI variables, all by default if 'name' is not provided. \-guid guid print only the UEFI variables matching this GUID (any by default) with guid format = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx". @@ -372,6 +372,10 @@ info load CONFIG_CMD_NVEDIT_LOAD +print + CONFIG_CMD_NVEDIT_EFI for UEFI variables support ('-e' option), + additionally CONFIG_HEXDUMP to display content of UEFI variables + run CONFIG_CMD_RUN @@ -381,5 +385,5 @@ save select CONFIG_CMD_NVEDIT_SELECT -set, print - CONFIG_CMD_NVEDIT_EFI for '-e' option +set + CONFIG_CMD_NVEDIT_EFI for UEFI variables support ('-e' option) -- 2.43.0

1 0

[PATCH v2 0/5] configs: apple: Switch to standard boot + small adjustments
by Janne Grunau via B4 Relay 22 Apr '24

22 Apr '24

This series contains a few misc config changes for Apple silicon systems: - switch from the deprecated distro boot scripts to standard boot - allows EFI console resizing based on the video console size - enables 16x32 bitmap fonts as Apple devices come with high DPI displays - enables 64-bit LBA addressing Signed-off-by: Janne Grunau <j(a)jannau.net> --- Changes in v2: - added Reviewed-by: tags - switched to BOOTSTD_FULL to enable efi_bootmgr and make interactive use easier - override BOOTCOMMAND to not list the bootflows - rebased onto v2024.04 - Link to v1: https://lore.kernel.org/r/20240317-apple_config-v1-0-1b862bc140a9@jannau.net --- Hector Martin (1): apple_m1_defconfig: Turn on CONFIG_SYS_64BIT_LBA Janne Grunau (4): configs: apple: Use "vidconsole,serial" as stdout/stderr configs: apple: Enable CMD_SELECT_FONT and FONT_16X32 arm: apple: Switch to standard boot arm: apple: Do not list bootflows on boot arch/arm/Kconfig | 2 +- configs/apple_m1_defconfig | 4 ++++ include/configs/apple.h | 24 ++++-------------------- 3 files changed, 9 insertions(+), 21 deletions(-) --- base-commit: 25049ad560826f7dc1c4740883b0016014a59789 change-id: 20240317-apple_config-981fcd9028b9 Best regards, -- Janne Grunau <j(a)jannau.net>

4 10

Pull request: u-boot-sunxi/master for v2024.07
by Andre Przywara 22 Apr '24

22 Apr '24

Hi Tom, as per the usual late ;-) please pull the sunxi/master branch, containing some 2024.07 changes for Allwinner. Not many and nothing really exciting this time: there are more patches in fly, but they are not ready yet. I will also send some DT updates and new board defconfig files later, once they have seen the list. I am aware of the USB rebasing repo efforts, but would like to see how this plays out, also we have one compatibility issue that I painstakingly work around in the U-Boot tree for the last three years or so. So for now I stick to the previous approach. So now just some easy changes: support for USB peripheral mode on the Allwinner F1C100s, T113-s3 SPI boot support, and some SPL cleanup patches. The branch passed the gitlab CI run, and brief boot testing on some boards didn't turn up any issues. Please pull! Cheers, Andre ================== The following changes since commit c08685289171e68afd4bae2eb2e279cdc49a407d: Merge tag 'u-boot-imx-master-20240420' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx (2024-04-20 15:16:17 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-sunxi.git master for you to fetch changes up to 192c5c9e51c1ef100c3d027d253ffad26ff75a68: sunxi: sun9i: make more clock functions SPL only (2024-04-22 01:12:26 +0100) ---------------------------------------------------------------- Andre Przywara (9): usb: musb-new: add Allwinner F1C100s support sunxi: move #ifdef guards around tzpc_init() to header file sunxi: remove unneeded i2c_init_board() call for U-Boot proper sunxi: compile clock.c for SPL only sunxi: sun4i: make more clock functions SPL only sunxi: sun6i: make more clock functions SPL only sunxi: sun50i_h6: make more clock functions SPL only sunxi: sun8i_a83t: make more clock functions SPL only sunxi: sun9i: make more clock functions SPL only Maksim Kiselev (1): sunxi: SPL SPI: Add SPI boot support for the Allwinner R528/T113 SoCs arch/arm/include/asm/arch-sunxi/clock_sun9i.h | 3 - arch/arm/include/asm/arch-sunxi/tzpc.h | 6 ++ arch/arm/mach-sunxi/Kconfig | 2 +- arch/arm/mach-sunxi/Makefile | 2 +- arch/arm/mach-sunxi/board.c | 2 - arch/arm/mach-sunxi/clock.c | 2 - arch/arm/mach-sunxi/clock_sun4i.c | 5 +- arch/arm/mach-sunxi/clock_sun50i_h6.c | 57 ++++++++-------- arch/arm/mach-sunxi/clock_sun6i.c | 3 +- arch/arm/mach-sunxi/clock_sun8i_a83t.c | 5 +- arch/arm/mach-sunxi/clock_sun9i.c | 97 +++++++++++++-------------- arch/arm/mach-sunxi/spl_spi_sunxi.c | 78 +++++++++++++++------ board/sunxi/board.c | 9 +-- drivers/usb/musb-new/sunxi.c | 16 +++++ 14 files changed, 163 insertions(+), 124 deletions(-)

2 1

[PATCH v2 0/5] Kconfig: some cleanups
by Michal Simek 22 Apr '24

22 Apr '24

I looked as cleaning up some dependencies and I found that qconfig is reporting some issues. This series is fixing some of them. But there are still some other pending. That's why please go and fix them if they are related to your board. UTF-8: I am using uni2ascii -B < file to do conversion. When you run it in a loop you will find some other issue with copyright chars or some issues in files taken from the Linux kernel like DTs. They should be likely fixed in the kernel first. Based on discussion I am ignoring names too. Thanks, Michal drivers/pinctrl/intel/Kconfig:12: warning: style: quotes recommended around 'n' in 'bool n' warning: the choice symbol CPU_ARCEM6 (defined at arch/arc/Kconfig:46) is selected by the following symbols, but select/imply has no effect on choice symbols - TARGET_EMSDP (defined at arch/arc/Kconfig:173) - TARGET_IOT_DEVKIT (defined at arch/arc/Kconfig:180) warning: the choice symbol ARC_MMU_ABSENT (defined at arch/arc/Kconfig:77) is selected by the following symbols, but select/imply has no effect on choice symbols - CPU_ARCEM6 (defined at arch/arc/Kconfig:46) - CPU_ARCHS36 (defined at arch/arc/Kconfig:53) warning: the choice symbol ARC_MMU_V2 (defined at arch/arc/Kconfig:82) is selected by the following symbols, but select/imply has no effect on choice symbols - CPU_ARC750D (defined at arch/arc/Kconfig:32) warning: the choice symbol ARC_MMU_V3 (defined at arch/arc/Kconfig:89) is selected by the following symbols, but select/imply has no effect on choice symbols - CPU_ARC770D (defined at arch/arc/Kconfig:39) warning: the choice symbol ARC_MMU_V4 (defined at arch/arc/Kconfig:97) is selected by the following symbols, but select/imply has no effect on choice symbols - CPU_ARCHS38 (defined at arch/arc/Kconfig:60) warning: the choice symbol FSP_VERSION2 (defined at arch/x86/Kconfig:396) is selected by the following symbols, but select/imply has no effect on choice symbols - INTEL_APOLLOLAKE (defined at arch/x86/cpu/apollolake/Kconfig:6) warning: the choice symbol SPL_RISCV_MMODE (defined at arch/riscv/Kconfig:184) is implied by the following symbols, but select/imply has no effect on choice symbols - BOARD_SPECIFIC_OPTIONS (defined at board/bsh/imx8mn_smm_s2/Kconfig:21, board/bsh/imx8mn_smm_s2/Kconfig:41, board/engicam/px30_core/Kconfig:12, board/theobroma-systems/ringneck_px30/Kconfig:12, board/radxa/rockpi4-rk3399/Kconfig:12, board/theobroma-systems/puma_rk3399/Kconfig:12, board/theobroma-systems/jaguar_rk3588/Kconfig:12, board/edgeble/neural-compute-module-2/Kconfig:12, board/itead/sonoff-ihost/Kconfig:12, board/emulation/qemu-arm/Kconfig:6, board/emulation/qemu-arm/Kconfig:22, board/freescale/ls1012aqds/Kconfig:27, board/freescale/ls1012ardb/Kconfig:27, board/freescale/ls1012ardb/Kconfig:76, board/freescale/ls1012afrdm/Kconfig:27, board/advantech/som-db5800-som-6867/Kconfig:18, board/congatec/conga-qeval20-qa3-e3845/Kconfig:17, board/coreboot/coreboot/Kconfig:15, board/dfi/dfi-bt700/Kconfig:17, board/efi/efi-x86_app/Kconfig:12, board/efi/efi-x86_payload/Kconfig:15, board/emulation/qemu-x86/Kconfig:16, board/google/chromebook_coral/Kconfig:18, board/google/chromebook_link/Kconfig:19, board/google/chromebox_panther/Kconfig:19, board/google/chromebook_samus/Kconfig:19, board/intel/bayleybay/Kconfig:15, board/intel/cherryhill/Kconfig:15, board/intel/cougarcanyon2/Kconfig:15, board/intel/crownbay/Kconfig:15, board/intel/edison/Kconfig:24, board/intel/galileo/Kconfig:15, board/intel/minnowmax/Kconfig:15, board/intel/slimbootloader/Kconfig:19, board/AndesTech/ae350/Kconfig:34, board/emulation/qemu-riscv/Kconfig:32, board/microchip/mpfs_icicle/Kconfig:19, board/openpiton/riscv64/Kconfig:26, board/sifive/unleashed/Kconfig:26, board/sifive/unmatched/Kconfig:26, board/sipeed/maix/Kconfig:30, board/sophgo/milkv_duo/Kconfig:24, board/starfive/visionfive2/Kconfig:26, board/thead/th1520_lpi4a/Kconfig:30, board/xilinx/mbv/Kconfig:22, board/keymile/km83xx/Kconfig:34, board/keymile/km83xx/Kconfig:54, board/keymile/km83xx/Kconfig:74, board/keymile/km83xx/Kconfig:93, board/keymile/km83xx/Kconfig:112, board/keymile/km83xx/Kconfig:131, board/keymile/km83xx/Kconfig:150, board/keymile/kmcent2/Kconfig:12, board/keymile/pg-wcom-ls102xa/Kconfig:15, board/keymile/pg-wcom-ls102xa/Kconfig:35) warning: the choice symbol SYS_BIG_ENDIAN (defined at arch/Kconfig:528) is selected by the following symbols, but select/imply has no effect on choice symbols - ARC (defined at arch/Kconfig:53) warning: the choice symbol SYS_LITTLE_ENDIAN (defined at arch/Kconfig:532) is selected by the following symbols, but select/imply has no effect on choice symbols - ARC (defined at arch/Kconfig:53) warning: the choice symbol OF_SEPARATE (defined at dts/Kconfig:108) is selected by the following symbols, but select/imply has no effect on choice symbols - ARCH_MVEBU (defined at arch/arm/Kconfig:620) - ARCH_SNAPDRAGON (defined at arch/arm/Kconfig:1074) - ARCH_SUNXI (defined at arch/arm/Kconfig:1143) - ARCH_S5P4418 (defined at arch/arm/mach-nexell/Kconfig:3) warning: the choice symbol MULTI_DTB_FIT_USER_DEFINED_AREA (defined at dts/Kconfig:242) is implied by the following symbols, but select/imply has no effect on choice symbols - RZG2L (defined at arch/arm/mach-renesas/Kconfig:70) - TARGET_BEACON_RZG2M (defined at arch/arm/mach-renesas/Kconfig.rcar3:82) - TARGET_HIHOPE_RZG2 (defined at arch/arm/mach-renesas/Kconfig.rcar3:130) - TARGET_SALVATOR_X (defined at arch/arm/mach-renesas/Kconfig.rcar3:149) - TARGET_ULCB (defined at arch/arm/mach-renesas/Kconfig.rcar3:160) warning: the choice symbol SYS_NAND_SOFT_ECC (defined at drivers/mtd/nand/raw/Kconfig:184) is selected by the following symbols, but select/imply has no effect on choice symbols - NAND_SANDBOX (defined at drivers/mtd/nand/raw/Kconfig:450) warning: the choice symbol USB_ULPI_VIEWPORT (defined at drivers/usb/ulpi/Kconfig:11) is selected by the following symbols, but select/imply has no effect on choice symbols - USB_EHCI_MSM (defined at drivers/usb/host/Kconfig:263) warning: the choice symbol LIB_RAND (defined at lib/Kconfig:275) is selected by the following symbols, but select/imply has no effect on choice symbols - CMD_LINK_LOCAL (defined at cmd/Kconfig:1994) warning: the choice symbol EFI_APP (defined at lib/efi/Kconfig:15) is selected by the following symbols, but select/imply has no effect on choice symbols - TARGET_EFI_APP32 (defined at board/efi/Kconfig:7) - TARGET_EFI_APP64 (defined at board/efi/Kconfig:16) Changes in v2: - Describe temperature as deg C instead of just C - Update commit message to explain the reason - New patch in series Michal Simek (5): Kconfig: Remove trailing whitespace in its prompt Kconfig: Add missing quotes around source file Kconfig: Add missing quotes around default string value Kconfig: Make all Kconfig encoding ascii common: Convert *.c/h from UTF-8 to ASCII enconfing .../armv8/fsl-layerscape/fsl_lsch2_serdes.c | 2 +- .../armv8/fsl-layerscape/fsl_lsch3_serdes.c | 2 +- arch/arm/mach-imx/ddrmc-vf610-calibration.c | 12 +++++----- arch/arm/mach-imx/mx6/clock.c | 8 +++---- arch/arm/mach-imx/mx7/psci-mx7.c | 4 ++-- arch/arm/mach-rockchip/px30/Kconfig | 4 ++-- arch/arm/mach-rockchip/rk3588/Kconfig | 24 +++++++++---------- arch/arm/mach-rockchip/rv1108/Kconfig | 4 ++-- arch/arm/mach-rockchip/rv1126/Kconfig | 8 +++---- arch/mips/mach-mscc/include/mach/ddr.h | 2 +- .../include/mach/cvmx-helper-pki.h | 2 +- arch/mips/mach-octeon/include/mach/cvmx-pki.h | 6 ++--- .../mips/mach-octeon/include/mach/cvmx-pko3.h | 2 +- board/CZ.NIC/turris_mox/turris_mox.c | 2 +- board/amlogic/vim3/vim3.c | 2 +- board/bosch/acc/acc.c | 2 +- board/bosch/shc/board.c | 2 +- board/bosch/shc/board.h | 2 +- board/congatec/cgtqmx8/cgtqmx8.c | 4 ++-- board/freescale/common/i2c_mux.c | 2 +- board/siemens/capricorn/board.c | 8 +++---- board/st/common/cmd_stboard.c | 2 +- .../visionfive2/visionfive2-i2c-eeprom.c | 4 ++-- cmd/Kconfig | 2 +- drivers/clk/Kconfig | 10 ++++---- drivers/clk/renesas/rzg2l-cpg.c | 6 ++--- drivers/clk/stm32/clk-stm32-core.h | 22 ++++++++--------- drivers/crypto/Kconfig | 8 +++---- drivers/ddr/imx/imx8ulp/Kconfig | 2 +- drivers/led/led_lp5562.c | 4 ++-- drivers/mtd/nand/raw/nand_ids.c | 2 +- drivers/mtd/spi/Kconfig | 2 +- drivers/rng/stm32_rng.c | 6 ++--- drivers/soc/ti/k3-navss-ringacc.c | 2 +- drivers/thermal/thermal_sandbox.c | 2 +- drivers/video/renesas-r61307.c | 2 +- drivers/video/renesas-r69328.c | 2 +- drivers/xen/pvblock.c | 2 +- include/acpi/acpigen.h | 6 ++--- include/linux/mtd/mtd.h | 2 +- lib/Kconfig | 18 +++++++------- lib/crypto/x509_cert_parser.c | 2 +- lib/efi_loader/Kconfig | 2 +- 43 files changed, 107 insertions(+), 107 deletions(-) -- 2.44.0

5 13