February 2022 - U-Boot

[PATCH 0/3] save prev bootloader data, when u-boot chainloaded
by Dzmitry Sankouski 13 Feb '22

13 Feb '22

When u-boot is used as a chain-loaded bootloader (replacing OS kernel), previous bootloader leaves data in RAM, that can be reused. For example, on recent arm linux system, when chainloading u-boot, there are initramfs and fdt in RAM prepared for OS booting. Initramfs may be modified to store u-boot's payload, thus providing the ability to use chainloaded u-boot to boot OS without any storage support. Two config options added: - SAVE_PREV_BL_INITRAMFS_START_ADDR saves initramfs start address to 'prevbl_initrd_start_addr' environment variable - SAVE_PREV_BL_FDT_ADDR saves fdt address to 'prevbl_fdt_addr' environment variable This feature will be used for axy17lte and starqltechn boards for now, and more phones in future. Dzmitry Sankouski (3): arm: init: save previous bootloader data board: starqltechn: get board usable - add bootcmd and docs board: axy17lte: get board usable - add bootcmd and docs arch/arm/dts/starqltechn-uboot.dtsi | 9 ++- arch/arm/dts/starqltechn.dts | 13 ++++- arch/arm/lib/Makefile | 5 ++ arch/arm/lib/save_prev_bl_data.c | 91 +++++++++++++++++++++++++++++ boot/Kconfig | 79 ++++++++++++++++--------- common/board_r.c | 5 ++ configs/a3y17lte_defconfig | 12 ++-- configs/a5y17lte_defconfig | 13 +++-- configs/a7y17lte_defconfig | 13 +++-- configs/starqltechn_defconfig | 18 +++++- doc/board/qualcomm/sdm845.rst | 47 ++++++++++++++- doc/board/samsung/axy17lte.rst | 15 +---- include/configs/exynos78x0-common.h | 4 ++ include/configs/sdm845.h | 8 +++ include/init.h | 13 +++++ 15 files changed, 282 insertions(+), 63 deletions(-) create mode 100644 arch/arm/lib/save_prev_bl_data.c -- 2.20.1

1 3

Problem IMX8MN booting legacy kernel and mipi display
by Michael Nazzareno Trimarchi 13 Feb '22

13 Feb '22

Hi all I have now able to pack those combination and all of them look ok - mainline uboot - optee 3.15.0 - atf 2.5 - mainline kernel - mainline uboot - optee 3.15.0 - imx-atf rel_imx_5.4.70_2.3.2 - Linux rel_imx_5.4.70_2.3.2 I have a setup where I can test some peripherals. I can run an optee test on both combinations The big issue I have it's the DSIM display it's not working and crashes the kernel using the rel_imx_5.4.70_2.3.2 nxp version. The mipi randomly deadlock the booting. If I don't register the mipi part it's ok. Can someone have an idea? All of them can be test using a buildroot setup Michael

3 8

[PATCH v3 00/18] pxe: Refactoring to tidy up and prepare for bootflow
by Simon Glass 12 Feb '22

12 Feb '22

This collects together the patches previously sent relating to PXE. Firstly, it moves the boot code out of common/ and into a new boot/ directory. This helps to collect these related files in one place, as common/ is quite large. Secondly, it provides patache so clean up the PXE code and refactor it into something closer to a module that can be called, teasing apart its reliance on the command-line interpreter to access filesystems and the like. Also it now uses function arguments and its own context struct internally rather than environment variables, which is very hard to follow. No core functional change is intended. Changes in v3: - Rebase to -master Changes in v2: - Rebase to -next - Split out from the bootmethod patches Simon Glass (18): Create a new boot/ directory pxe: Move API comments to the header files pxe: Use a context pointer pxe: Move do_getfile() into the context pxe: Add a userdata field to the context pxe: Tidy up the is_pxe global pxe: Move pxe_utils files pxe: Tidy up some comments in pxe_utils pxe: Tidy up code style a little in pxe_utils pxe: Move common parsing coding into pxe_util pxe: Clean up the use of bootfile pxe: Drop get_bootfile_path() lib: Add tests for simple_itoa() lib: Add a function to convert a string to a hex value pxe: Return the file size from the getfile() function pxe: Refactor sysboot to have one helper doc: Move distro boot doc to rST pxe: Allow calling the pxe_get logic directly Kconfig | 2 + Makefile | 3 +- README | 1 + common/Kconfig.boot => boot/Kconfig | 0 boot/Makefile | 37 ++ {common => boot}/android_ab.c | 0 {common => boot}/boot_fit.c | 0 {common => boot}/bootm.c | 0 {common => boot}/bootm_os.c | 0 {common => boot}/bootretry.c | 0 {common => boot}/common_fit.c | 0 {common => boot}/fdt_region.c | 0 {common => boot}/image-android-dt.c | 0 {common => boot}/image-android.c | 0 {common => boot}/image-board.c | 0 {common => boot}/image-cipher.c | 0 {common => boot}/image-fdt.c | 0 {common => boot}/image-fit-sig.c | 0 {common => boot}/image-fit.c | 0 {common => boot}/image-host.c | 0 {common => boot}/image-sig.c | 0 {common => boot}/image.c | 0 {cmd => boot}/pxe_utils.c | 512 +++++++++++----------- cmd/Makefile | 4 +- cmd/pxe.c | 136 +++--- cmd/pxe_utils.h | 91 ---- cmd/sysboot.c | 114 +++-- common/Kconfig | 2 - common/Makefile | 22 - doc/android/boot-image.rst | 2 +- doc/{README.distro => develop/distro.rst} | 177 ++++---- doc/develop/index.rst | 1 + include/pxe_utils.h | 253 +++++++++++ include/vsprintf.h | 25 +- lib/vsprintf.c | 20 +- scripts/Makefile.spl | 4 +- test/print_ut.c | 41 ++ tools/Makefile | 18 +- 38 files changed, 874 insertions(+), 591 deletions(-) rename common/Kconfig.boot => boot/Kconfig (100%) create mode 100644 boot/Makefile rename {common => boot}/android_ab.c (100%) rename {common => boot}/boot_fit.c (100%) rename {common => boot}/bootm.c (100%) rename {common => boot}/bootm_os.c (100%) rename {common => boot}/bootretry.c (100%) rename {common => boot}/common_fit.c (100%) rename {common => boot}/fdt_region.c (100%) rename {common => boot}/image-android-dt.c (100%) rename {common => boot}/image-android.c (100%) rename {common => boot}/image-board.c (100%) rename {common => boot}/image-cipher.c (100%) rename {common => boot}/image-fdt.c (100%) rename {common => boot}/image-fit-sig.c (100%) rename {common => boot}/image-fit.c (100%) rename {common => boot}/image-host.c (100%) rename {common => boot}/image-sig.c (100%) rename {common => boot}/image.c (100%) rename {cmd => boot}/pxe_utils.c (74%) delete mode 100644 cmd/pxe_utils.h rename doc/{README.distro => develop/distro.rst} (76%) create mode 100644 include/pxe_utils.h -- 2.33.0.1079.g6e70778dc9-goog

7 89

[PATCH] arm: apple: Disable debug UART
by Mark Kettenis 11 Feb '22

11 Feb '22

The address of the debug UART varies differs between the M1 and the M1 Pro/Max SoCs. So we have to disable it to make a single U-Boot binary that works on all SoC generations. Leave the settings for the base address and clock rate of the M1 in place to make it easier to re-enable the debug UART when needed. Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> --- configs/apple_m1_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/apple_m1_defconfig b/configs/apple_m1_defconfig index ef5b7ffd1a..396fe63114 100644 --- a/configs/apple_m1_defconfig +++ b/configs/apple_m1_defconfig @@ -3,7 +3,6 @@ CONFIG_ARCH_APPLE=y CONFIG_DEFAULT_DEVICE_TREE="t8103-j274" CONFIG_DEBUG_UART_BASE=0x235200000 CONFIG_DEBUG_UART_CLOCK=24000000 -CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x0 CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_CPUINFO is not set -- 2.35.1

4 4

[PATCH v3] console: usb: kbd: Limit poll frequency to improve performance
by Thomas Watson 11 Feb '22

11 Feb '22

Using the XHCI driver, the function `usb_kbd_poll_for_event` takes 30-40ms to run. The exact time is dependent on the polling interval the keyboard requests in its descriptor, and likely cannot be significantly reduced without major rework to the XHCI driver. The U-Boot EFI console service sets a timer to poll the keyboard every 5 microseconds, and this timer is checked every time a block is read off disk. The net effect is that, on my system, loading a ~40MiB kernel and initrd takes about 62 seconds with a slower keyboard and 53 seconds with a faster one, with the vast majority of the time spent polling the keyboard. To solve this problem, this patch adds a 20ms delay between consecutive calls to `usb_kbd_poll_for_event`. This is sufficient to reduce the total loading time to under half a second for both keyboards, and does not impact the perceived keystroke latency. Signed-off-by: Thomas Watson <twatson52(a)icloud.com> --- This revision fixes a sandbox test failure by honoring the test's request to skip delays. common/usb_kbd.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/common/usb_kbd.c b/common/usb_kbd.c index afad260d3d..352d86fb2e 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -17,6 +17,9 @@ #include <stdio_dev.h> #include <watchdog.h> #include <asm/byteorder.h> +#ifdef CONFIG_SANDBOX +#include <asm/state.h> +#endif #include <usb.h> @@ -118,7 +121,7 @@ struct usb_kbd_pdata { extern int __maybe_unused net_busy_flag; /* The period of time between two calls of usb_kbd_testc(). */ -static unsigned long __maybe_unused kbd_testc_tms; +static unsigned long kbd_testc_tms; /* Puts character in the queue and sets up the in and out pointer. */ static void usb_kbd_put_queue(struct usb_kbd_pdata *data, u8 c) @@ -394,21 +397,39 @@ static int usb_kbd_testc(struct stdio_dev *sdev) struct usb_device *usb_kbd_dev; struct usb_kbd_pdata *data; + /* + * Polling the keyboard for an event can take dozens of milliseconds. + * Add a delay between polls to avoid blocking activity which polls + * rapidly, like the UEFI console timer. + */ + unsigned long poll_delay = CONFIG_SYS_HZ / 50; + #ifdef CONFIG_CMD_NET /* * If net_busy_flag is 1, NET transfer is running, * then we check key-pressed every second (first check may be * less than 1 second) to improve TFTP booting performance. */ - if (net_busy_flag && (get_timer(kbd_testc_tms) < CONFIG_SYS_HZ)) - return 0; - kbd_testc_tms = get_timer(0); + if (net_busy_flag) + poll_delay = CONFIG_SYS_HZ; +#endif + +#ifdef CONFIG_SANDBOX + /* + * Skip delaying polls if a test requests it. + */ + if (state_get_skip_delays()) + poll_delay = 0; #endif + dev = stdio_get_by_name(sdev->name); usb_kbd_dev = (struct usb_device *)dev->priv; data = usb_kbd_dev->privptr; - usb_kbd_poll_for_event(usb_kbd_dev); + if (get_timer(kbd_testc_tms) >= poll_delay) { + usb_kbd_poll_for_event(usb_kbd_dev); + kbd_testc_tms = get_timer(0); + } return !(data->usb_in_pointer == data->usb_out_pointer); } -- 2.31.1

3 7

Pull request for efi-2022-04-rc2-4
by Heinrich Schuchardt 11 Feb '22

11 Feb '22

Dear Tom, thanks for catching the build warnings with clang. The changes relative to Pull request for efi-2022-04-rc2-3 are described in https://lists.denx.de/pipermail/u-boot/2022-February/475051.html The following changes since commit fe203a05fb663fa9bc42a9ef9ae51a6ed01a4a90: Merge branch '2022-02-10-platform-updates' (2022-02-10 17:38:04 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2022-04-rc2-4 for you to fetch changes up to 72b509b7019878e2a5f69bcf7198a0927a77ad60: test/py: efi_secboot: adjust secure boot tests to code changes (2022-02-11 20:07:55 +0100) Gitlab CI shows no problems in: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/10974 sandbox with clang shows no compiler warning anymore https://source.denx.de/u-boot/custodians/u-boot-efi/-/jobs/392164/raw ---------------------------------------------------------------- Pull request for efi-2022-04-rc2-4 Documentation: * mkeficapsule man-page UEFI changes: * add support for signing images to mkeficapsule * add support for user define capsule GUID * adjust unit tests for capsules * fix UEFI image signature validation in case of multiple signatures ---------------------------------------------------------------- AKASHI Takahiro (10): CI: enforce packages upgrade for Msys2 on Windows tools: build mkeficapsule with tools-only_defconfig tools: mkeficapsule: add firmware image signing tools: mkeficapsule: add man page doc: update UEFI document for usage of mkeficapsule test/py: efi_capsule: add image authentication test tools: mkeficapsule: allow for specifying GUID explicitly test/py: efi_capsule: align with the syntax change of mkeficapsule test/py: efi_capsule: add a test for "--guid" option test/py: efi_capsule: check the results in case of CAPSULE_AUTHENTICATE Ilias Apalodimas (2): efi_loader: fix dual signed image certification test/py: efi_secboot: adjust secure boot tests to code changes .azure-pipelines.yml | 5 +- MAINTAINERS | 1 + configs/tools-only_defconfig | 1 + doc/develop/uefi/uefi.rst | 151 +++---- doc/mkeficapsule.1 | 111 +++++ lib/efi_loader/efi_image_loader.c | 88 +--- test/py/tests/test_efi_capsule/capsule_defs.py | 5 + test/py/tests/test_efi_capsule/conftest.py | 59 ++- test/py/tests/test_efi_capsule/signature.dts | 10 + .../test_efi_capsule/test_capsule_firmware.py | 91 +++- .../test_capsule_firmware_signed.py | 254 ++++++++++++ test/py/tests/test_efi_secboot/test_signed.py | 30 +- tools/Kconfig | 8 + tools/Makefile | 4 +- tools/eficapsule.h | 116 ++++++ tools/mkeficapsule.c | 460 ++++++++++++++++++--- 16 files changed, 1181 insertions(+), 213 deletions(-) create mode 100644 doc/mkeficapsule.1 create mode 100644 test/py/tests/test_efi_capsule/signature.dts create mode 100644 test/py/tests/test_efi_capsule/test_capsule_firmware_signed.py create mode 100644 tools/eficapsule.h

1 0

Pull request for efi-2022-04-rc2-3
by Heinrich Schuchardt 11 Feb '22

11 Feb '22

Dear Tom, The following changes since commit fe203a05fb663fa9bc42a9ef9ae51a6ed01a4a90: Merge branch '2022-02-10-platform-updates' (2022-02-10 17:38:04 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2022-04-rc2-3 for you to fetch changes up to 8c5ed53328712894c19b8b60101b6248358e7dea: test/py: efi_secboot: adjust secure boot tests to code changes (2022-02-11 18:14:49 +0100) Gitlab CI showed no problems: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/10971 ---------------------------------------------------------------- Pull request for efi-2022-04-rc2-3 Documentation: * mkeficapsule man-page UEFI changes: * add support for signing images to mkeficapsule * add support for user define capsule GUID * adjust unit tests for capsules * fix UEFI image signature validation in case of multiple signatures ---------------------------------------------------------------- AKASHI Takahiro (10): CI: enforce packages upgrade for Msys2 on Windows tools: build mkeficapsule with tools-only_defconfig tools: mkeficapsule: add firmware image signing tools: mkeficapsule: add man page doc: update UEFI document for usage of mkeficapsule test/py: efi_capsule: add image authentication test tools: mkeficapsule: allow for specifying GUID explicitly test/py: efi_capsule: align with the syntax change of mkeficapsule test/py: efi_capsule: add a test for "--guid" option test/py: efi_capsule: check the results in case of CAPSULE_AUTHENTICATE Ilias Apalodimas (2): efi_loader: fix dual signed image certification test/py: efi_secboot: adjust secure boot tests to code changes .azure-pipelines.yml | 5 +- MAINTAINERS | 1 + configs/tools-only_defconfig | 1 + doc/develop/uefi/uefi.rst | 151 +++---- doc/mkeficapsule.1 | 111 +++++ lib/efi_loader/efi_image_loader.c | 88 +--- test/py/tests/test_efi_capsule/capsule_defs.py | 5 + test/py/tests/test_efi_capsule/conftest.py | 59 ++- test/py/tests/test_efi_capsule/signature.dts | 10 + .../test_efi_capsule/test_capsule_firmware.py | 91 +++- .../test_capsule_firmware_signed.py | 254 ++++++++++++ test/py/tests/test_efi_secboot/test_signed.py | 30 +- tools/Kconfig | 8 + tools/Makefile | 4 +- tools/eficapsule.h | 115 ++++++ tools/mkeficapsule.c | 459 ++++++++++++++++++--- 16 files changed, 1179 insertions(+), 213 deletions(-) create mode 100644 doc/mkeficapsule.1 create mode 100644 test/py/tests/test_efi_capsule/signature.dts create mode 100644 test/py/tests/test_efi_capsule/test_capsule_firmware_signed.py create mode 100644 tools/eficapsule.h

1 0

[PATCH v2] mkimage: Improve documentation of algo-name parameter
by Jan Kiszka 11 Feb '22

11 Feb '22

From: Jan Kiszka <jan.kiszka(a)siemens.com> Addresses the feedback provided on 5902a397d029 which raced with the merge. Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- Change in v2: - rewrap also_name comment doc/mkimage.1 | 2 +- tools/imagetool.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/mkimage.1 b/doc/mkimage.1 index 0734bd36a11..fc84cca066b 100644 --- a/doc/mkimage.1 +++ b/doc/mkimage.1 @@ -158,7 +158,7 @@ CONFIG_OF_CONTROL in U-Boot. .TP .BI "\-o [" "signing algorithm" "]" Specifies the algorithm to be used for signing a FIT image. The default is -taken from the target signature nodes 'algo' properties. +taken from the signature node's 'algo' property. .TP .BI "\-p [" "external position" "]" diff --git a/tools/imagetool.h b/tools/imagetool.h index a4105515d81..c3f80fc64e8 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -71,7 +71,9 @@ struct image_tool_params { const char *keydest; /* Destination .dtb for public key */ const char *keyfile; /* Filename of private or public key */ const char *comment; /* Comment to add to signature node */ - const char *algo_name; /* Algorithm name to use hashing/signing */ + /* Algorithm name to use for hashing/signing or NULL to use the one + * specified in the its */ + const char *algo_name; int require_keys; /* 1 to mark signing keys as 'required' */ int file_size; /* Total size of output file */ int orig_file_size; /* Original size for file before padding */ -- 2.34.1

2 1

[PATCH] Replace echo -n's used in environment processing with touch
by qthedev 11 Feb '22

11 Feb '22

echo -n does not give the intended effect when invoked in macOS through /bin/sh, which is the shell make uses by default, see "https://stackoverflow.com/questions/11675070/makefile-echo-n-not-working" for a detailed explanation. In this case, it resulted in "-n" being written to env.txt and env.in even though they should be empty, which caused compilation to fail with "Your board uses a text-file environment, so must not define CONFIG_EXTRA_ENV_SETTINGS". This patch prevents the error by replacing echo -n's with touch, as they are used to create empty files in these cases. diff --git a/Makefile b/Makefile index 184223ec63..3101aa0132 100644 --- a/Makefile +++ b/Makefile @@ -1843,7 +1843,7 @@ quiet_cmd_gen_envp = ENVP $@ -I$(srctree)/arch/$(ARCH)/include \ $< -o $@; \ else \ - echo -n >$@ ; \ + touch $@ ; \ fi include/generated/env.in: include/generated/env.txt FORCE $(call cmd,gen_envp) @@ -1860,7 +1860,7 @@ quiet_cmd_envc = ENVC $@ elif [ -n "$(ENV_SOURCE_FILE)" ]; then \ echo "Missing file $(ENV_FILE_CFG)"; \ else \ - echo -n >$@ ; \ + touch $@ ; \ fi include/generated/env.txt: $(wildcard $(ENV_FILE)) FORCE

3 2

[PATCH 1/1] cmd: wrong printf() code in do_test_stackprot_fail()
by Heinrich Schuchardt 11 Feb '22

11 Feb '22

strlen() returns size_t. So we should use %zu to print it. This avoids incorrect output on 32bit systems. Fixes: 2fc62f299174 ("stackprot: Make our test a bit more complex") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/stackprot_test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/stackprot_test.c b/cmd/stackprot_test.c index 1e26193e88..f3470288fa 100644 --- a/cmd/stackprot_test.c +++ b/cmd/stackprot_test.c @@ -17,7 +17,8 @@ static int do_test_stackprot_fail(struct cmd_tbl *cmdtp, int flag, int argc, memset(a, 0xa5, 512); - printf("We have smashed our stack as this should not exceed 128: sizeof(a) = %ld\n", strlen(a)); + printf("We have smashed our stack as this should not exceed 128: sizeof(a) = %zd\n", + strlen(a)); return 0; } -- 2.34.1

2 1