November 2021 - U-Boot

[PATCH v2] env: Avoid using GNU features in awk
by Simon Glass 20 Nov '21

20 Nov '21

GNU has a very useful third argument to match() but this is not supported in the POSIX awk. It is a great shame. Update the code to cope. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - Fix the has_var match() that had left-over test code scripts/env2string.awk | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/scripts/env2string.awk b/scripts/env2string.awk index 57d0fc8f3ba..e758738df07 100644 --- a/scripts/env2string.awk +++ b/scripts/env2string.awk @@ -24,26 +24,33 @@ NF { # Quote quotes gsub("\"", "\\\"") + # Avoid using the non-POSIX third parameter to match() which is very + # inconvenient + has_var = match($0, "^([^ \t=][^ =]*)=(.*)$") + # Is this the start of a new environment variable? - if (match($0, "^([^ \t=][^ =]*)=(.*)$", arr)) { + if (has_var) { if (length(env) != 0) { # Record the value of the variable now completed vars[var] = env } - var = arr[1] - env = arr[2] + + # Collect the variable name. The value follows the '=' + match($0, "^([^ \t=][^ =]*)=") + var = substr($0, 1, RLENGTH - 1) + env = substr($0, RLENGTH + 1) # Deal with += which concatenates the new string to the existing - # variable - if (length(env) != 0 && match(var, "^(.*)[+]$", var_arr)) - { + # variable. Again we are careful to use POSIX match() + if (length(env) != 0 && match(var, "^(.*)[+]$")) { + plusname = substr(var, RSTART, RLENGTH - 1) # Allow var\+=val to indicate that the variable name is # var+ and this is not actually a concatenation - if (substr(var_arr[1], length(var_arr[1])) == "\\") { + if (substr(plusname, length(plusname)) == "\\") { # Drop the backslash sub(/\\[+]$/, "+", var) } else { - var = var_arr[1] + var = plusname env = vars[var] env } } -- 2.34.0.rc2.393.gf8c9666880-goog

2 1

[PATCH v2 1/1] efi_loader: efi_disk_register() should not fail
by Heinrich Schuchardt 20 Nov '21

20 Nov '21

Our algorithm for creating USB device paths may lead to duplicate device paths which result in efi_disk_register() failing. Instead we should just skip devices that cannot be registered as EFI block devices. Fix a memory leak in efi_disk_add_dev() caused by the duplicate device path. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v2: %s/return/goto/ --- lib/efi_loader/efi_disk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index ef8b5c88ff..45127d1768 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -424,7 +424,7 @@ static efi_status_t efi_disk_add_dev( &efi_block_io_guid, &diskobj->ops, guid, NULL, NULL)); if (ret != EFI_SUCCESS) - return ret; + goto error; /* * On partitions or whole disks without partitions install the @@ -573,7 +573,7 @@ efi_status_t efi_disk_register(void) if (ret) { log_err("ERROR: failure to add disk device %s, r = %lu\n", dev->name, ret & ~EFI_ERROR_MASK); - return ret; + continue; } disks++; -- 2.32.0

1 0

[PATCH] efi_loader: efi_disk_register() should not fail
by Heinrich Schuchardt 20 Nov '21

20 Nov '21

Our algorithm for creating USB device paths may lead to duplicate device paths which result in efi_disk_register() failing. Instead we should just skip devices that cannot be registered as EFI block devices. Fix a memory leak in efi_disk_add_dev() caused by the duplicate device path. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_loader/efi_disk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index ef8b5c88ff..20121dea89 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -424,7 +424,7 @@ static efi_status_t efi_disk_add_dev( &efi_block_io_guid, &diskobj->ops, guid, NULL, NULL)); if (ret != EFI_SUCCESS) - return ret; + return error; /* * On partitions or whole disks without partitions install the @@ -573,7 +573,7 @@ efi_status_t efi_disk_register(void) if (ret) { log_err("ERROR: failure to add disk device %s, r = %lu\n", dev->name, ret & ~EFI_ERROR_MASK); - return ret; + continue; } disks++; -- 2.32.0

1 0

[PATCH] efi: Call bootm_disable_interrupts earlier in efi_exit_boot_services
by Tom Rini 20 Nov '21

20 Nov '21

If we look at the path that bootm/booti take when preparing to boot the OS, we see that as part of (or prior to calling do_bootm_states, explicitly) the process, bootm_disable_interrupts() is called prior to announce_and_cleanup() which is where udc_disconnect() / board_quiesce_devices() / dm_remove_devices_flags() are called from. In the EFI path, these are called afterwards. In efi_exit_boot_services() however we have been calling bootm_disable_interrupts() after the above functions, as part of ensuring that we disable interrupts as required by the spec. However, bootm_disable_interrupts() is also where we go and call usb_stop(). While this has been fine before, on the TI J721E platform this leads us to an exception. This exception seems likely to be the case that we're trying to stop devices that we have already disabled clocks for. The most direct way to handle this particular problem is to make EFI behave like the do_bootm_states() process and ensure we call bootm_disable_interrupts() prior to ending up in usb_stop(). Cc: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Cc: Simon Glass <sjg(a)chromium.org> Suggested-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- First up, as my wording above implies, I'm assuming rather than being 100% confident in why calling usb_stop() is leading to the exception I get. It's this call: /* Locate root hub device */ device_find_first_child(bus, &rh); that causes the exception. This board is also a little odd in that, borrowing from dm_dump_all(): nop 5 [ ] cdns-ti | |-- cdns-usb@4114000 usb 0 [ + ] cdns-usb3-host | | `-- usb@6400000 usb_hub 0 [ + ] usb_hub | | `-- usb_hub usb_hub 1 [ + ] usb_hub | | `-- usb_hub usb_mass_s 0 [ + ] usb_mass_storage | | `-- usb_mass_storage blk 2 [ + ] usb_storage_blk | | `-- usb_mass_storage.lun0 and physically, only that mass storage device is attached to the board itself, the rest is on-device. Second, while talking with Ilias he's said he'll see if there can be some common function / abstractions done here between the do_bootm_states() code and the efi_exit_boot_services() code as this change shows other common code that's in arch/*/lib/bootm.c. The call to bootm_disable_interrupts() however I have tried to make clear is not handled in a common way as bootm/booti spell out the call as they don't use the BOOTM_STATE_LOADOS flag. Third, I'm not 100% sure that 3d71c81a9bb0 is still the correct / ideal thing to be doing, and that's what usb_stop() is all about, at that point in the boot cycle. It might well be the kind of quirk that we have handled now, via DM. Fourth, I really would like to figure out a fix here appropriate to v2022.01 and I think this is the least invasive approach. --- lib/efi_loader/efi_boottime.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 1823990d9bd5..0485870d34d9 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -2154,6 +2154,7 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, } if (!efi_st_keep_devices) { + bootm_disable_interrupts(); if (IS_ENABLED(CONFIG_USB_DEVICE)) udc_disconnect(); board_quiesce_devices(); @@ -2166,9 +2167,6 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, /* Fix up caches for EFI payloads if necessary */ efi_exit_caches(); - /* This stops all lingering devices */ - bootm_disable_interrupts(); - /* Disable boot time services */ systab.con_in_handle = NULL; systab.con_in = NULL; -- 2.25.1

4 4

[PATCH] efi: add comment for efi_system_table and efi_configuration_table
by Masahisa Kojima 20 Nov '21

20 Nov '21

This commit adds the comment for efi_system_table and efi_configuration_table structure. Signed-off-by: Masahisa Kojima <masahisa.kojima(a)linaro.org> --- include/efi_api.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/include/efi_api.h b/include/efi_api.h index 0accad08c8..78a6412116 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -417,6 +417,15 @@ struct efi_runtime_services { EFI_GUID(0x1e2ed096, 0x30e2, 0x4254, 0xbd, \ 0x89, 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25) +/** + * struct efi_configuration_table - EFI Configuration Table + * + * This table contains a set of GUID/pointer pairs. + * The EFI Configuration Table may contain at most one instance of each table type. + * + * @guid: GUID that uniquely identifies the system configuration table + * @table: A pointer to the table associated with guid + */ struct efi_configuration_table { efi_guid_t guid; void *table; @@ -424,6 +433,29 @@ struct efi_configuration_table { #define EFI_SYSTEM_TABLE_SIGNATURE ((u64)0x5453595320494249ULL) +/** + * struct efi_system_table - EFI System Table + * + * EFI System Table contains pointers to the runtime and boot services tables. + * + * @hdr: The table header for the EFI System Table + * @fw_vendor: A pointer to a null terminated string that identifies the vendor + * that produces the system firmware + * @fw_version: The revision of the system firmware + * @con_in_handle: The handle for the active console input device + * @con_in: A pointer to the EFI_SIMPLE_TEXT_INPUT_PROTOCOL interface + * that is associated with con_in_handle + * @con_out_handle: The handle for the active console output device + * @con_out: A pointer to the EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL interface + * that is associated with con_out_handle + * @stderr_handle: The handle for the active standard error console device + * @std_err: A pointer to the EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL interface + * that is associated with stderr_handle + * @runtime: A pointer to the EFI Runtime Services Table + * @boottime: A pointer to the EFI Boot Services Table + * @nr_tables: The number of system configuration tables + * @tables: A pointer to the system configuration tables + */ struct efi_system_table { struct efi_table_hdr hdr; u16 *fw_vendor; /* physical addr of wchar_t vendor string */ -- 2.17.1

3 2

[PATCH 1/1] efi_loader: Sphinx comments in efi_api.h
by Heinrich Schuchardt 20 Nov '21

20 Nov '21

Fix incorrect Sphinx comments in efi_api.h: * add missing 'struct' * correct indentation Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- include/efi_api.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/efi_api.h b/include/efi_api.h index db35819473..41516cc7eb 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -902,8 +902,8 @@ struct efi_hii_package_list_header { * @fields: 'fields' replaces the bit-fields defined in the EFI * specification to to avoid possible compiler incompatibilities:: * - * u32 length:24; - * u32 type:8; + * u32 length:24; + * u32 type:8; */ struct efi_hii_package_header { u32 fields; @@ -1841,7 +1841,7 @@ struct efi_system_resource_table { 0x34, 0x7d, 0x37, 0x56, 0x65, 0xa7) /** - * win_certificate_uefi_guid - A certificate that encapsulates + * struct win_certificate_uefi_guid - A certificate that encapsulates * a GUID-specific signature * * @hdr: Windows certificate header @@ -1855,7 +1855,7 @@ struct win_certificate_uefi_guid { } __attribute__((__packed__)); /** - * efi_variable_authentication_2 - A time-based authentication method + * struct efi_variable_authentication_2 - A time-based authentication method * descriptor * * This structure describes an authentication information for @@ -1872,7 +1872,7 @@ struct efi_variable_authentication_2 { } __attribute__((__packed__)); /** - * efi_firmware_image_authentication - Capsule authentication method + * struct efi_firmware_image_authentication - Capsule authentication method * descriptor * * This structure describes an authentication information for @@ -1890,7 +1890,7 @@ struct efi_firmware_image_authentication { /** - * efi_signature_data - A format of signature + * struct efi_signature_data - A format of signature * * This structure describes a single signature in signature database. * @@ -1903,7 +1903,7 @@ struct efi_signature_data { } __attribute__((__packed__)); /** - * efi_signature_list - A format of signature database + * struct efi_signature_list - A format of signature database * * This structure describes a list of signatures with the same type. * An authenticated variable's value is a concatenation of one or more -- 2.32.0

1 0

[PULL u-boot] Please pull u-boot-amlogic-20211119
by Neil Armstrong 20 Nov '21

20 Nov '21

Hi Tom, Here's a change to fix GPIO declaration in the Meson PINCTRL driver, and a couple of changes to handle boot errors when using the meson64 android config and permit recovering the board via fastboot when the boot media is invalid. The CI job is at https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic/pipelines/9918 Thanks, Neil The following changes since commit 8391a0f3d97c0300d7eafe7581b6712afb18f283: Merge branch '2021-11-18-regression-fixes' (2021-11-18 18:25:19 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-amlogic.git tags/u-boot-amlogic-20211119 for you to fetch changes up to 28f70cfcfd82ac509c8da772b74e5dc2df795fd2: configs: meson64_android: add PANIC stage for SYSTEM fails (2021-11-19 18:15:26 +0100) ---------------------------------------------------------------- - pinctrl: Correct the driver GPIO declaration - meson64_android: handle errors on boot and run fastboot on boot failure ---------------------------------------------------------------- Neil Armstrong (2): configs: meson64_android: bypass other checks on run_fastboot=1 configs: meson64_android: add PANIC stage for SYSTEM fails Simon Glass (1): pinctrl: meson: Correct the driver GPIO declaration drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c | 2 +- drivers/pinctrl/meson/pinctrl-meson-gx.h | 2 +- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 4 +-- drivers/pinctrl/meson/pinctrl-meson-gxl.c | 4 +-- include/configs/meson64_android.h | 47 +++++++++++++++++----------- 5 files changed, 35 insertions(+), 24 deletions(-)

2 1

TPM subsystem pull
by Ilias Apalodimas 20 Nov '21

20 Nov '21

Hi Tom, Please pull for master The following changes since commit 3144ba23bf4649f699078259fdf2e5cb4eab8f53: Merge branch '2021-11-15-assorted-fixes' (2021-11-16 14:23:30 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-tpm/ tags/tpm-19112021 for you to fetch changes up to 4a08dba019cda7bd6d81694ecb3230dedf54d46f: drivers: tpm: atmel_twi: fix printf specifier compile warning (2021-11-17 13:47:36 +0200) ---------------------------------------------------------------- - TPM1.2 compilation fixes - Atmel TPM 1.2 fixes ---------------------------------------------------------------- Mathew McBride (6): cmd: tpm-v1: fix compile error in TPMv1 list resources command cmd: tpm-v1: fix load_key_by_sha1 compile errors drivers: tpm: atmel_twi: drop non-DM_I2C compatibility drivers: tpm: atmel_twi: do not use an offset byte drivers: tpm: atmel_twi: implement get_desc operation drivers: tpm: atmel_twi: fix printf specifier compile warning cmd/tpm-v1.c | 17 +++++++++++------ drivers/tpm/tpm_atmel_twi.c | 22 +++++++--------------- lib/tpm-v1.c | 4 ++-- 3 files changed, 20 insertions(+), 23 deletions(-)

2 1

[PATCH] env: Avoid using GNU features in awk
by Simon Glass 20 Nov '21

20 Nov '21

GNU has a very useful third argument to match() but this is not supported in the POSIX awk. It is a great shame. Update the code to cope. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- scripts/env2string.awk | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/scripts/env2string.awk b/scripts/env2string.awk index 57d0fc8f3ba..4c109eee32a 100644 --- a/scripts/env2string.awk +++ b/scripts/env2string.awk @@ -24,26 +24,33 @@ NF { # Quote quotes gsub("\"", "\\\"") + # Avoid using the non-POSIX third parameter to match() which is very + # inconvenient + has_var = match($0, "^([^ \t=][^ =]*)=(.*)$", arr) + # Is this the start of a new environment variable? - if (match($0, "^([^ \t=][^ =]*)=(.*)$", arr)) { + if (has_var) { if (length(env) != 0) { # Record the value of the variable now completed vars[var] = env } - var = arr[1] - env = arr[2] + + # Collect the variable name. The value follows the '=' + match($0, "^([^ \t=][^ =]*)=") + var = substr($0, 1, RLENGTH - 1) + env = substr($0, RLENGTH + 1) # Deal with += which concatenates the new string to the existing - # variable - if (length(env) != 0 && match(var, "^(.*)[+]$", var_arr)) - { + # variable. Again we are careful to use POSIX match() + if (length(env) != 0 && match(var, "^(.*)[+]$")) { + plusname = substr(var, RSTART, RLENGTH - 1) # Allow var\+=val to indicate that the variable name is # var+ and this is not actually a concatenation - if (substr(var_arr[1], length(var_arr[1])) == "\\") { + if (substr(plusname, length(plusname)) == "\\") { # Drop the backslash sub(/\\[+]$/, "+", var) } else { - var = var_arr[1] + var = plusname env = vars[var] env } } -- 2.34.0.rc2.393.gf8c9666880-goog

1 0

[PATCH] board: stemmy: Increase boot image to 16 MB
by Linus Walleij 19 Nov '21

19 Nov '21

When using a recent kernel with a bunch of compiled-in stuff the kernel image easily becomes bigger than 8 MB yielding this error: Loading Kernel Image Image too large: increase CONFIG_SYS_BOOTM_LEN Must RESET board to recover Fix this by bumping to SZ_16MB. Cc: Stephan Gerhold <stephan(a)gerhold.net> Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- include/configs/stemmy.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/stemmy.h b/include/configs/stemmy.h index ed79b1203901..f4700a45daf5 100644 --- a/include/configs/stemmy.h +++ b/include/configs/stemmy.h @@ -14,6 +14,7 @@ * bootloader. New images are loaded at the same address for compatibility. */ #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_BOOTM_LEN SZ_16M /* FIXME: This should be loaded from device tree... */ #define CONFIG_SYS_L2_PL310 -- 2.31.1

3 2