June 2023 - U-Boot

[PATCH v2 0/3] Add pcf2131 rtc support
by Joy Zou 02 Jun '23

02 Jun '23

The patchset supports pcf2131 rtc. For the details, please check the patch commit log. Joy Zou (3): drivers: rtc: add pcf2131 rtc driver imx: imx93_evk: add rtc pcf2131 configs: Enable RTC pcf2131 support arch/arm/dts/imx93-11x11-evk-u-boot.dtsi | 8 + arch/arm/dts/imx93-11x11-evk.dts | 25 +++ arch/arm/dts/imx93.dtsi | 2 +- configs/imx93_11x11_evk_defconfig | 2 +- drivers/rtc/Kconfig | 10 ++ drivers/rtc/Makefile | 1 + drivers/rtc/pcf2131.c | 184 +++++++++++++++++++++++ 7 files changed, 230 insertions(+), 2 deletions(-) create mode 100644 drivers/rtc/pcf2131.c -- 2.37.1

1 3

[PATCH v1 0/3] Add pcf2131 rtc support
by Joy Zou 02 Jun '23

02 Jun '23

The patchset supports pcf2131 rtc. For the details, please check the patch commit log. Joy Zou (3): configs: Enable RTC pcf2131 support imx: imx93_evk: add rtc pcf2131 drivers: rtc: add pcf2131 rtc driver arch/arm/dts/imx93-11x11-evk-u-boot.dtsi | 8 + arch/arm/dts/imx93-11x11-evk.dts | 25 +++ arch/arm/dts/imx93.dtsi | 2 +- configs/imx93_11x11_evk_defconfig | 2 +- drivers/rtc/Kconfig | 10 ++ drivers/rtc/Makefile | 1 + drivers/rtc/pcf2131.c | 189 +++++++++++++++++++++++ 7 files changed, 235 insertions(+), 2 deletions(-) create mode 100644 drivers/rtc/pcf2131.c -- 2.37.1

2 9

[PATCH 1/2] tpm: Add 'tpm autostart' shell command
by Ilias Apalodimas 02 Jun '23

02 Jun '23

For a TPM device to be operational we need to initialize it and perform its startup sequence. The 'tpm init' command currently calls tpm_init() which ends up calling the ->open() per-device callback and performs the initial hardware configuration as well as requesting locality 0 for the caller. There no code that currently calls tpm_init() without following up with a tpm_startup() and tpm_self_test_full() or tpm_continue_self_test(). So let's add a 'tpm init' command and call tpm_auto_start() which leaves the device in an operational state. It's worth noting that calling tpm_init() only, doesn't allow a someone to use the TPM since the startup sequence is mandatory. We always repeat the pattern of calling - tpm_init() - tpm_startup() - tpm_self_test_full() or tpm_continue_self_test() Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- cmd/tpm-common.c | 16 ++++++++++++++++ cmd/tpm-user-utils.h | 1 + cmd/tpm-v1.c | 6 +++++- cmd/tpm-v2.c | 6 ++++++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/cmd/tpm-common.c b/cmd/tpm-common.c index d0c63cadf413..a7dc23d85d5d 100644 --- a/cmd/tpm-common.c +++ b/cmd/tpm-common.c @@ -11,6 +11,7 @@ #include <asm/unaligned.h> #include <linux/string.h> #include <tpm-common.h> +#include <tpm_api.h> #include "tpm-user-utils.h" static struct udevice *tpm_dev; @@ -367,6 +368,21 @@ int do_tpm_init(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return report_return_code(tpm_init(dev)); } +int do_tpm_autostart(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + struct udevice *dev; + int rc; + + if (argc != 1) + return CMD_RET_USAGE; + rc = get_tpm(&dev); + if (rc) + return rc; + + return report_return_code(tpm_auto_start(dev)); +} + int do_tpm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct cmd_tbl *tpm_commands, *cmd; diff --git a/cmd/tpm-user-utils.h b/cmd/tpm-user-utils.h index de4a934aab6c..dfa11353e122 100644 --- a/cmd/tpm-user-utils.h +++ b/cmd/tpm-user-utils.h @@ -20,6 +20,7 @@ int get_tpm(struct udevice **devp); int do_tpm_device(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_tpm_init(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +int do_tpm_autostart(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_tpm_info(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); int do_tpm_report_state(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); diff --git a/cmd/tpm-v1.c b/cmd/tpm-v1.c index 0efb079b0a9b..3b95c950cc96 100644 --- a/cmd/tpm-v1.c +++ b/cmd/tpm-v1.c @@ -655,6 +655,7 @@ TPM_COMMAND_NO_ARG(tpm_physical_disable) static struct cmd_tbl tpm1_commands[] = { U_BOOT_CMD_MKENT(device, 0, 1, do_tpm_device, "", ""), U_BOOT_CMD_MKENT(info, 0, 1, do_tpm_info, "", ""), + U_BOOT_CMD_MKENT(init, 0, 1, do_tpm_autostart, "", ""), U_BOOT_CMD_MKENT(init, 0, 1, do_tpm_init, "", ""), U_BOOT_CMD_MKENT(startup, 0, 1, do_tpm_startup, "", ""), @@ -733,9 +734,12 @@ U_BOOT_CMD(tpm, CONFIG_SYS_MAXARGS, 1, do_tpm, " device [num device]\n" " - Show all devices or set the specified device\n" " info - Show information about the TPM\n" +" autostart\n" +" - Initalize the tpm, perform a Startup(clear) and run a full selftest\n" +" sequence\n" " init\n" " - Put TPM into a state where it waits for 'startup' command.\n" -" startup mode\n" +" startup mode\n" " - Issue TPM_Starup command. <mode> is one of TPM_ST_CLEAR,\n" " TPM_ST_STATE, and TPM_ST_DEACTIVATED.\n" "Admin Testing Commands:\n" diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c index d93b83ada934..7e479b9dfe36 100644 --- a/cmd/tpm-v2.c +++ b/cmd/tpm-v2.c @@ -370,6 +370,7 @@ static struct cmd_tbl tpm2_commands[] = { U_BOOT_CMD_MKENT(dam_reset, 0, 1, do_tpm_dam_reset, "", ""), U_BOOT_CMD_MKENT(dam_parameters, 0, 1, do_tpm_dam_parameters, "", ""), U_BOOT_CMD_MKENT(change_auth, 0, 1, do_tpm_change_auth, "", ""), + U_BOOT_CMD_MKENT(autostart, 0, 1, do_tpm_autostart, "", ""), U_BOOT_CMD_MKENT(pcr_setauthpolicy, 0, 1, do_tpm_pcr_setauthpolicy, "", ""), U_BOOT_CMD_MKENT(pcr_setauthvalue, 0, 1, @@ -392,8 +393,13 @@ U_BOOT_CMD(tpm2, CONFIG_SYS_MAXARGS, 1, do_tpm, "Issue a TPMv2.x command", " Show information about the TPM.\n" "state\n" " Show internal state from the TPM (if available)\n" +"autostart\n" +" Initalize the tpm, perform a Startup(clear) and run a full selftest\n" +" sequence\n" "init\n" " Initialize the software stack. Always the first command to issue.\n" +" 'tpm startup' is the only acceptable command after a 'tpm init' has been\n" +" issued\n" "startup <mode>\n" " Issue a TPM2_Startup command.\n" " <mode> is one of:\n" -- 2.39.2

2 5

[PATCH 1/4] spi: pl022: Align compatible property with device tree binding
by Stefan Herbrechtsmeier 02 Jun '23

02 Jun '23

From: Lukas Funke <lukas.funke(a)weidmueller.com> Align the compatible property with the kernel device tree binding [1] by removing the '-spi' suffix. [1] https://www.kernel.org/doc/Documentation/devicetree/bindings/spi/spi-pl022.… Signed-off-by: Lukas Funke <lukas.funke(a)weidmueller.com> Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier(a)weidmueller.com> --- drivers/spi/pl022_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c index 828eab3d34..2986c4eb5a 100644 --- a/drivers/spi/pl022_spi.c +++ b/drivers/spi/pl022_spi.c @@ -307,7 +307,7 @@ static int pl022_spi_of_to_plat(struct udevice *bus) } static const struct udevice_id pl022_spi_ids[] = { - { .compatible = "arm,pl022-spi" }, + { .compatible = "arm,pl022" }, { } }; #endif -- 2.30.2

2 7

Loading from squashfs with zstd compression slower than ext4
by Jonathan Liu 02 Jun '23

02 Jun '23

Hi All, I noticed that loading from squashfs with zstd compression is significantly slower than ext4 on RK3399 using U-Boot 2022.01. The filesystem is located on eMMC. I have CONFIG_BLOCK_CACHE=y in .config and am using the generic load command. ext4: 15682578 bytes read in 366 ms (40.9 MiB/s) SquashFS with zstd compression: 15685001 bytes read in 2339 ms (6.4 MiB/s) Any suggestions on how to speed up loading from SquashFS with zstd compression? Thanks. Regards, Jonathan

3 7

[PATCH 1/2] efi_loader: delete handle from events when a protocol is uninstalled
by Ilias Apalodimas 01 Jun '23

01 Jun '23

When a notification event is registered for a protocol the handle of the protocol is added in our event notification list. When all the protocols of the handle are uninstalled we delete the handle but we do not remove it from the event notification list. Clean up the protocol removal functions and add a wrapper which - Removes the to-be deleted handle from any lists it participates - Remove the handle if no more protocols are present It's worth noting that all our variants of efi_uninstall_protocol_*() and uninstall_multiple_protocol_*() end up calling efi_uninstall_protocol(). We could add the cleanup in that function only, however efi_reinstall_protocol_interface() expects the handle not to be removed. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/efi_boottime.c | 45 +++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index d5065f296aee..450524ddca2f 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -197,6 +197,35 @@ static bool efi_event_is_queued(struct efi_event *event) return !!event->queue_link.next; } +/** + * efi_handle_cleanup() - Clean the deleted handle from the various lists + * @handle: handle to remove + * @force: force removal even if protocols are still installed on the handle + * + * Return: status code + */ +static void efi_handle_cleanup(efi_handle_t handle, bool force) +{ + struct efi_register_notify_event *item, *next; + + if (!list_empty(&handle->protocols) || force) + return; + /* The handle is about to be freed. Remove it from events */ + list_for_each_entry_safe(item, next, &efi_register_notify_events, link) { + struct efi_protocol_notification *hitem, *hnext; + + list_for_each_entry_safe(hitem, hnext, &item->handles, link) { + if (handle == hitem->handle) { + list_del(&hitem->link); + free(hitem); + } + } + } + /* The last protocol has been removed, delete the handle. */ + list_del(&handle->link); + free(handle); +} + /** * efi_process_event_queue() - process event queue */ @@ -627,8 +656,7 @@ void efi_delete_handle(efi_handle_t handle) return; } - list_del(&handle->link); - free(handle); + efi_handle_cleanup(handle, true); } /** @@ -1396,11 +1424,8 @@ static efi_status_t EFIAPI efi_uninstall_protocol_interface if (ret != EFI_SUCCESS) goto out; - /* If the last protocol has been removed, delete the handle. */ - if (list_empty(&handle->protocols)) { - list_del(&handle->link); - free(handle); - } + /* Check if we have to purge the handle from various lists */ + efi_handle_cleanup(handle, false); out: return EFI_EXIT(ret); } @@ -2777,11 +2802,7 @@ efi_uninstall_multiple_protocol_interfaces_int(efi_handle_t handle, i++; } if (ret == EFI_SUCCESS) { - /* If the last protocol has been removed, delete the handle. */ - if (list_empty(&handle->protocols)) { - list_del(&handle->link); - free(handle); - } + efi_handle_cleanup(handle, false); goto out; } -- 2.39.2

2 7

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

01 Jun '23

>From b887f8bb547b56f6a0c0c7102a9d232df6f174c6 Mon Sep 17 00:00:00 2001 From: cidlik <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 --- 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] efi_loader: explicitly return EFI_UNSUPPORTED for TCG 1.0 compatibility
by Ilias Apalodimas 01 Jun '23

01 Jun '23

In the EFI TCG spec EFI_TCG2_BOOT_SERVICE_CAPABILITY struct is versioned -- there are 1.0 and 1.1 versions of that struct. The spec [0] describes: "Version of the EFI_TCG2_BOOT_SERVICE_CAPABILITY structure itself. For this version of the protocol, the Major version SHALL be set to 1 and the Minor version SHALL be set to 1." which is what we currently support. The SCT tests perfromed By Arms SIE(Security interface extensions) [1] perform a check for clients supporting the older 1.0 version of the spec (Test 30.1.1.4). Given than this spec is 7 years old, there should be no need for the older 1.0 version support. Instead of returning EFI_BUFFER_TOO_SMALLL switch to EFI_UNSUPPORTED which is more appropriate. It's worth noting that the spec doesn't explicitly describe the return value at the moment. [0] https://trustedcomputinggroup.org/wp-content/uploads/EFI-Protocol-Specifica… [1] https://github.com/stuyod01/edk2-test/blob/master/uefi-sct/Doc/UEFI-SCT-Cas… Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- Heinrich, Stuart is investigating the chance of the spec getting updated adding EFI_UNSUPPORTED. In any case I think the patch should be aplied since the new return code makes more sense. If for some reason the spec change is rejected, I can go back and add support for 1.0 structure versions. lib/efi_loader/efi_tcg2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index a83ae7a46cf3..220c442bdf93 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -750,7 +750,7 @@ efi_tcg2_get_capability(struct efi_tcg2_protocol *this, if (capability->size < sizeof(*capability)) { capability->size = sizeof(*capability); - efi_ret = EFI_BUFFER_TOO_SMALL; + efi_ret = EFI_UNSUPPORTED; goto out; } -- 2.39.2

3 13

[PATCH v1 0/2] arm64: Fix building failure for Xen target
by Leo Yan 01 Jun '23

01 Jun '23

This patch series is for building Xen target with Clang. The first patch is to fix building failure for Xen target, the second patch is to add info for a linkage known issue when use Clang as compiler. Leo Yan (2): arm64: Remove duplicated symbols doc: Add info for building Xen target with Clang .../include/asm/boot0-linux-kernel-header.h | 2 -- doc/build/clang.rst | 36 +++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) -- 2.39.2

2 5

[PATCH 1/1] axi: fix definition of axi_sandbox_get_emul()
by Heinrich Schuchardt 01 Jun '23

01 Jun '23

Compiling with gcc 13 results in an error: drivers/axi/axi-emul-uclass.c:16:5: warning: conflicting types for ‘axi_sandbox_get_emul’ due to enum/integer mismatch; have ‘int(struct udevice *, ulong, enum axi_size_t, struct udevice **)’ {aka ‘int(struct udevice *, long unsigned int, enum axi_size_t, struct udevice **)’} [-Wenum-int-mismatch] 16 | int axi_sandbox_get_emul(struct udevice *bus, ulong address, | ^~~~~~~~~~~~~~~~~~~~ In file included from drivers/axi/axi-emul-uclass.c:14: ./arch/sandbox/include/asm/axi.h:48:5: note: previous declaration of ‘axi_sandbox_get_emul’ with type ‘int(struct udevice *, ulong, uint, struct udevice **)’ {aka ‘int(struct udevice *, long unsigned int, unsigned int, struct udevice **)’} 48 | int axi_sandbox_get_emul(struct udevice *bus, ulong address, uint length, | ^~~~~~~~~~~~~~~~~~~~ Adjust the header definition to match the implementation. Define the size parameter as constant. Fixes: 9a8bcabd8ada ("axi: Add AXI sandbox driver and simple emulator") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- arch/sandbox/include/asm/axi.h | 8 ++++---- drivers/axi/axi-emul-uclass.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/sandbox/include/asm/axi.h b/arch/sandbox/include/asm/axi.h index d483f7b65a..5b94beda0a 100644 --- a/arch/sandbox/include/asm/axi.h +++ b/arch/sandbox/include/asm/axi.h @@ -14,8 +14,8 @@ * @bus: The AXI bus from which to retrieve a emulation device * @address: The address of a transfer that should be handled by a emulation * device - * @length: The data width of a transfer that should be handled by a emulation - * device + * @size: A constant indicating the data width of the transfer that + * should be handled by an emulation device * @emulp: Pointer to a buffer receiving the emulation device that handles * the transfer specified by the address and length parameters * @@ -45,8 +45,8 @@ * Return: 0 of OK, -ENODEV if no device capable of handling the specified * transfer exists or the device could not be retrieved */ -int axi_sandbox_get_emul(struct udevice *bus, ulong address, uint length, - struct udevice **emulp); +int axi_sandbox_get_emul(struct udevice *bus, ulong address, + const enum axi_size_t size, struct udevice **emulp); /** * axi_get_store() - Get address of internal storage of a emulated AXI device * @dev: Emulated AXI device to get the pointer of the internal storage diff --git a/drivers/axi/axi-emul-uclass.c b/drivers/axi/axi-emul-uclass.c index 793336d8c4..e6f3ef0720 100644 --- a/drivers/axi/axi-emul-uclass.c +++ b/drivers/axi/axi-emul-uclass.c @@ -14,7 +14,7 @@ #include <asm/axi.h> int axi_sandbox_get_emul(struct udevice *bus, ulong address, - enum axi_size_t size, struct udevice **emulp) + const enum axi_size_t size, struct udevice **emulp) { struct udevice *dev; u32 reg[2]; -- 2.39.2

3 2