June 2023 - U-Boot

[PATCH] mtd: spi-nor-ids: add xtxtech part#
by Bruce Suen 19 Jun '23

19 Jun '23

adding xtxtech part numbers Signed-off-by: Bruce Suen <bruce_suen(a)163.com> --- drivers/mtd/spi/spi-nor-ids.c | 38 +++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c index 3f8b796789..9a079c851d 100644 --- a/drivers/mtd/spi/spi-nor-ids.c +++ b/drivers/mtd/spi/spi-nor-ids.c @@ -528,8 +528,42 @@ const struct flash_info spi_nor_ids[] = { { INFO("XM25QH128A", 0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, #endif #ifdef CONFIG_SPI_FLASH_XTX - /* XTX Technology (Shenzhen) Limited */ - { INFO("xt25f128b", 0x0b4018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + /* XTX Technology Limited */ + /* adding these 3V QSPI flash parts */ + { INFO("xt25f08", 0x0b4014, 0, 64 * 1024, 16, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { INFO("xt25f16", 0x0b4015, 0, 64 * 1024, 32, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { INFO("xt25f32", 0x0b4016, 0, 64 * 1024, 64, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { INFO("xt25f64", 0x0b4017, 0, 64 * 1024, 128, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { INFO("xt25f128", 0x0b4018, 0, 64 * 1024, 256, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { INFO("xt25f256", 0x0b4019, 0, 64 * 1024, 512, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, + /* adding these 1.8V QSPI flash parts */ + { INFO("xt25q08", 0x0b6014, 0, 64 * 1024, 16, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { INFO("xt25q16", 0x0b6015, 0, 64 * 1024, 32, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { INFO("xt25q32", 0x0b6016, 0, 64 * 1024, 64, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { INFO("xt25q64", 0x0b6017, 0, 64 * 1024, 128, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { INFO("xt25q128", 0x0b6018, 0, 64 * 1024, 256, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + { INFO("xt25q256", 0x0b6019, 0, 64 * 1024, 512, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, + { INFO("xt25q512", 0x0b601A, 0, 64 * 1024, 1024, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, + { INFO("xt25q01g", 0x0b601B, 0, 64 * 1024, 2048, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, + /* adding these wide voltage QSPI flash parts */ + { INFO("xt25w512", 0x0b651A, 0, 64 * 1024, 1024, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, + { INFO("xt25w01g", 0x0b651B, 0, 64 * 1024, 2048, + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, #endif { }, }; -- 2.25.1

2 8

[PATCH v2 1/1] efi_loader: simplify efi_uninstall_protocol()
by Heinrich Schuchardt 19 Jun '23

19 Jun '23

The call to efi_search_obj() is redundant as the function is called in efi_search_protocol() too. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v2: Use handle instead of efiobj to invoke efi_disconnect_all_drivers() --- lib/efi_loader/efi_boottime.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index d5065f296a..00f1dd0f56 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1336,24 +1336,17 @@ static efi_status_t efi_uninstall_protocol (efi_handle_t handle, const efi_guid_t *protocol, void *protocol_interface) { - struct efi_object *efiobj; struct efi_handler *handler; struct efi_open_protocol_info_item *item; struct efi_open_protocol_info_item *pos; efi_status_t r; - /* Check handle */ - efiobj = efi_search_obj(handle); - if (!efiobj) { - r = EFI_INVALID_PARAMETER; - goto out; - } /* Find the protocol on the handle */ r = efi_search_protocol(handle, protocol, &handler); if (r != EFI_SUCCESS) goto out; /* Disconnect controllers */ - efi_disconnect_all_drivers(efiobj, protocol, NULL); + efi_disconnect_all_drivers(handle, protocol, NULL); /* Close protocol */ list_for_each_entry_safe(item, pos, &handler->open_infos, link) { if (item->info.attributes == -- 2.40.1

2 2

[PATCH 1/5] efi_loader: check the status of disconnected drivers
by Ilias Apalodimas 19 Jun '23

19 Jun '23

efi_uninstall_protocol() calls efi_disconnect_all_drivers() but never checks the return value. Honor that and return an appropriate error if the associated controllers failed to disconnect Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/efi_boottime.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 5006c0e1e4af..68198e6b5ff6 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1353,7 +1353,11 @@ static efi_status_t efi_uninstall_protocol if (r != EFI_SUCCESS) goto out; /* Disconnect controllers */ - efi_disconnect_all_drivers(efiobj, protocol, NULL); + r = efi_disconnect_all_drivers(efiobj, protocol, NULL); + if (r != EFI_SUCCESS) { + r = EFI_DEVICE_ERROR; + goto out; + } /* Close protocol */ list_for_each_entry_safe(item, pos, &handler->open_infos, link) { if (item->info.attributes == -- 2.39.2

2 9

[PATCH] rockchip: allow env defines for SPL build
by Eugen Hristev 19 Jun '23

19 Jun '23

For environment in SPL, all these defines are required, otherwise build fails: [...] include/env_default.h:120:9: note: in expansion of macro ‘CFG_EXTRA_ENV_SETTINGS’ 120 | CFG_EXTRA_ENV_SETTINGS | ^~~~~~~~~~~~~~~~~~~~~~ In file included from env/common.c:32: [...] Environment in SPL is needed e.g. for DFU, as dfu_alt is kept as env variable. Signed-off-by: Eugen Hristev <eugen.hristev(a)collabora.com> --- include/configs/rockchip-common.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 9121bba37384..be20b135066e 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -11,8 +11,6 @@ #define CFG_CPUID_OFFSET 0x7 #endif -#ifndef CONFIG_SPL_BUILD - #define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi" #ifdef CONFIG_ARM64 @@ -28,6 +26,4 @@ "name=boot,size=112M,bootable,uuid=${uuid_gpt_boot};" \ "name=rootfs,size=-,uuid="ROOT_UUID -#endif - #endif /* _ROCKCHIP_COMMON_H_ */ -- 2.34.1

2 2

[PATCH v7 0/2] arm: dts: rockchip: rk3399: usb: ehci: Fix EHCI probe in rk3399 to access peripherals by USB 2
by Xavier Drudis Ferran 19 Jun '23

19 Jun '23

EHCI probing in Rock pi 4 currently fails. Add a clock driver for usb2phy so that probing EHCI does not fail when missing one of the clocks in the bundle for usb_host0_ehci, since usb2phy is UCLASS_PHY but not UCLASS_CLK. Xavier Drudis Ferran (2): phy: rockchip-inno-usb2: Add usb2phy clock provider of 480MHz clock phy: rockchip-inno-usb2: Implement clock operations for usb2phy clock drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 109 +++++++++++++++++- 1 file changed, 106 insertions(+), 3 deletions(-) Cc: Simon Glass <sjg(a)chromium.org> Cc: Philipp Tomsich <philipp.tomsich(a)vrull.eu> Cc: Kever Yang <kever.yang(a)rock-chips.com> Cc: Lukasz Majewski <lukma(a)denx.de> Cc: Sean Anderson <seanga2(a)gmail.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Christoph Fritz <chf.fritz(a)googlemail.com> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Signed-off-by: Xavier Drudis Ferran <xdrudis(a)tinet.cat> --- Changes: v7: Error handling. Remove unnecessary if. Adding config data for rk3568 (untested). v6: just retested over current next branch and some corrections to message and headers (no changes to code). v5: fixes a bug that Christoph Fritz discovered, consisting in the wrong eror code returned when enabling or disabling the clock because property_enable() returns an error code in linux but the modified register value in U-Boot. This caused the clk disable to abort before freeing the clock. v4: move v3 to one patch in the series and add a second patch to add operations to enable disable the usb2phy 480Mhz clock. Also, honour clock-output-names for what is worth. v3: implement option 5 (bind usb2phy as a clk driver too) instead of option 1 (ehci-generic.c tolerates missing clocks). v2: implement option 1 (ehci-generic.c tolerates missing clocks) instead of option 3 (change dts node to remove the missing clock). -- 2.20.1

4 12

[PATCH] doc: uefi: explicitly describe manual dtb update is required
by Masahisa Kojima 19 Jun '23

19 Jun '23

To enforce anti-rollback to any older version, dtb must be always update manually. This should be described in the documentation. Signed-off-by: Masahisa Kojima <masahisa.kojima(a)linaro.org> --- doc/develop/uefi/uefi.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/develop/uefi/uefi.rst b/doc/develop/uefi/uefi.rst index ffd13cebe9..d5f8c5f236 100644 --- a/doc/develop/uefi/uefi.rst +++ b/doc/develop/uefi/uefi.rst @@ -552,6 +552,9 @@ update using a capsule file with --fw-version of 5, the update will fail. When the --fw-version in the capsule file is updated, lowest-supported-version in the dtb might be updated accordingly. +If user needs to enroce anti-rollback to any older version, +the lowest-supported-version property in dtb must be always updated manually. + To insert the lowest supported version into a dtb .. code-block:: console base-commit: e350d0c60d413d441cbdfa9432ebadb56f625903 -- 2.34.1

3 4

[PATCH 0/1] virtio: add driver for virtio_console devices
by Ying-Chun Liu (PaulLiu) 19 Jun '23

19 Jun '23

This is an implementation of single-character virtio-console. Part of the patch is based on barebox implementations. To test the patch, we can build qemu_arm64_defconfig target. Enable CONFIG_VIRTIO_CONSOLE. And run qemu-system-aarch64 with -device virtio-serial-pci,id=virtio-serial0 \ -chardev file,id=charconsole0,path=/tmp/serialconsolelog \ -device virtconsole,chardev=charconsole0,id=console0 \ When in U-boot console, type "dm tree" and we should be able to see the virtio-console device. A. Cody Schuffelen (1): virtio: add driver for virtio_console devices drivers/virtio/Kconfig | 8 ++ drivers/virtio/Makefile | 1 + drivers/virtio/virtio-uclass.c | 1 + drivers/virtio/virtio_console.c | 158 ++++++++++++++++++++++++++++++++ include/virtio.h | 2 + 5 files changed, 170 insertions(+) create mode 100644 drivers/virtio/virtio_console.c -- 2.39.2

4 5

[PATCH 1/2] efi_loader: use efi_install_multiple_protocol_interfaces()
by Ilias Apalodimas 18 Jun '23

18 Jun '23

The tcg protocol currently adds and removes protocols with efi_(add/remove)_protocol(). Although this works fine protocol interfaces should be installed using the EFI API functions instead of the internal API ones Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/efi_tcg2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index a83ae7a46cf3..49f8a5e77cbf 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -1680,8 +1680,8 @@ void tcg2_uninit(void) if (!is_tcg2_protocol_installed()) return; - ret = efi_remove_protocol(efi_root, &efi_guid_tcg2_protocol, - (void *)&efi_tcg2_protocol); + ret = efi_uninstall_multiple_protocol_interfaces(efi_root, &efi_guid_tcg2_protocol, + &efi_tcg2_protocol, NULL); if (ret != EFI_SUCCESS) log_err("Failed to remove EFI TCG2 protocol\n"); } @@ -2507,8 +2507,8 @@ efi_status_t efi_tcg2_register(void) goto fail; } - ret = efi_add_protocol(efi_root, &efi_guid_tcg2_protocol, - (void *)&efi_tcg2_protocol); + ret = efi_install_multiple_protocol_interfaces(&efi_root, &efi_guid_tcg2_protocol, + &efi_tcg2_protocol, NULL); if (ret != EFI_SUCCESS) { tcg2_uninit(); goto fail; -- 2.39.2

2 4

[PATCH] xhci: Add soft retry mechanism for control transaction
by Роман Кузнецов 18 Jun '23

18 Jun '23

Hello! I have a problem with using the USB stick Transcend Jetflash 350. After entering the command "usb reset" were getting three different results: 1. [OK] USB stick was found. 2. [ERROR] Message: USB XHCI 1.10 scanning bus dwc3@10000000 for devices... usb_new_device: Cannot read configuration, skipping device 8564:1000 3. [ERROR] Message: USB XHCI 1.10 scanning bus dwc3@10000000 for devices... WARN halted endpoint, queueing URB anyway. Unexpected XHCI event TRB, skipping... (9fb69170 00000008 13000000 01008401) BUG at drivers/usb/host/xhci-ring.c:530/abort_td()! BUG! I tried to dump a USB transaction via Wireshark + USBPcap and noticed that several transactions were errors. After reading the docs "eXtensible Host Controller Interface for Universal Serial Bus" was realized the retry mechanism. It solved my problem. Best regards, Mark Smith --- >From b887f8bb547b56f6a0c0c7102a9d232df6f174c6 Mon Sep 17 00:00:00 2001 From: Mark Smith <zubastikiko(a)gmail.com> Date: Thu, 1 Jun 2023 23:20:03 +0300 Subject: [PATCH] xhci: Add soft retry mechanism for control transaction A Soft Retry may effectively be used to recover from a USB Transaction Error that was due to a temporary error condition. Software shall limit the number of unsuccessful Soft Retry attempts to prevent an infinite loop. For more details on Soft retry see xhci specs 4.6.8.1 Signed-off-by: Mark Smith <zubastikiko(a)gmail.com> --- drivers/usb/host/xhci-ring.c | 7 +++++++ drivers/usb/host/xhci.c | 12 +++++++++++- include/usb/xhci.h | 2 ++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index c8260cbdf9..10f5fe4d06 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -580,6 +580,9 @@ static void record_transfer_result(struct usb_device *udev, case COMP_SHORT_TX: udev->status = 0; break; + case COMP_TX_ERR: + udev->status = USB_ST_CRC_ERR; + break; case COMP_STALL: udev->status = USB_ST_STALLED; break; @@ -979,6 +982,10 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe, reset_ep(udev, ep_index); return -EPIPE; } + if (udev->status == USB_ST_CRC_ERR ) { + reset_ep(udev, ep_index); + return -EAGAIN; + } /* Invalidate buffer to make it available to usb-core */ if (length > 0) { diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 9e33c5d855..efb9fc2950 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1156,6 +1156,7 @@ static int _xhci_submit_control_msg(struct usb_device *udev, unsigned long pipe, { struct xhci_ctrl *ctrl = xhci_get_ctrl(udev); int ret = 0; + int soft_reset_attempt = SOFT_RESET_ATTEMPTS; if (usb_pipetype(pipe) != PIPE_CONTROL) { printf("non-control pipe (type=%lu)", usb_pipetype(pipe)); @@ -1178,7 +1179,16 @@ static int _xhci_submit_control_msg(struct usb_device *udev, unsigned long pipe, } } - return xhci_ctrl_tx(udev, pipe, setup, length, buffer); + while(soft_reset_attempt > 0) + { + ret = xhci_ctrl_tx(udev, pipe, setup, length, buffer); + if (ret == -EAGAIN) + soft_reset_attempt--; + else + return ret; + } + printf("control transfer is unsuccessful after %d attempts\n", SOFT_RESET_ATTEMPTS); + return ret; } static int xhci_lowlevel_init(struct xhci_ctrl *ctrl) diff --git a/include/usb/xhci.h b/include/usb/xhci.h index 4a4ac10229..9cc3bfaf3c 100644 --- a/include/usb/xhci.h +++ b/include/usb/xhci.h @@ -33,6 +33,8 @@ /* Section 5.3.3 - MaxPorts */ #define MAX_HC_PORTS 255 +#define SOFT_RESET_ATTEMPTS 3 + /* Up to 16 ms to halt an HC */ #define XHCI_MAX_HALT_USEC (16*1000) -- 2.38.0.windows.1

1 0

[PATCH v9 0/4] Boot variables management for removable media
by Raymond Mao 18 Jun '23

18 Jun '23

Major changes: 1.Rename and move bootorder and bootoption apis from cmd to lib for re-use between eficonfig and bootmgr 2.Fix incorrect return code of boot option update Correct the return code for out-of-memory and no boot option found 3.Changes for complying to EFI spec §3.5.1.1 'Removable Media Boot Behavior'. Boot variables can be automatically generated during a removable media is probed. At the same time, unused boot variables will be detected and removed. 4.The boot variables automatically generated for removable medias should be with short form of device path without device nodes. This is a requirement for the case that a removable media is plugged into a different port but is still able to work with the existing boot variables. Raymond Mao (4): Move bootorder and bootoption apis to lib Fix incorrect return code of boot option update Boot var automatic management for removable medias Load option with short device path for boot vars cmd/bootmenu.c | 4 +- cmd/eficonfig.c | 410 +---------------------------------- include/efi_config.h | 5 - include/efi_loader.h | 11 + lib/efi_loader/efi_bootmgr.c | 385 ++++++++++++++++++++++++++++++++ lib/efi_loader/efi_disk.c | 18 ++ lib/efi_loader/efi_helper.c | 25 +++ lib/efi_loader/efi_setup.c | 5 + 8 files changed, 453 insertions(+), 410 deletions(-) -- 2.25.1

2 6