August 2021 - U-Boot

[PATCH] lib: -Wformat-truncation in rsa_engine_get_priv_key
by Heinrich Schuchardt 02 Sep '21

02 Sep '21

With glibc 2.33 (Ubuntu package glibc6 2.33-0ubuntu9) building sifive_unmatched_defconfig results in: In file included from /usr/include/stdio.h:866, from ././include/compiler.h:26, from <command-line>: In function ‘snprintf’, inlined from ‘rsa_engine_get_priv_key’ at ./tools/../^:273:4: /usr/include/riscv64-linux-gnu/bits/stdio2.h:71:10: warning: ‘%s’ directive argument is null [-Wformat-truncation=] 71 | return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 72 | __glibc_objsize (__s), __fmt, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 73 | __va_arg_pack ()); | ~~~~~~~~~~~~~~~~~ Avoid passing a NULL string. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/rsa/rsa-sign.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/rsa/rsa-sign.c b/lib/rsa/rsa-sign.c index 085dc89bf7..c7ae7a0dbc 100644 --- a/lib/rsa/rsa-sign.c +++ b/lib/rsa/rsa-sign.c @@ -271,8 +271,7 @@ static int rsa_engine_get_priv_key(const char *keydir, const char *name, keydir, name); else if (keydir) snprintf(key_id, sizeof(key_id), - "%s", - name); + "%s", name ? name : ""); else if (keyfile) snprintf(key_id, sizeof(key_id), "%s", keyfile); else -- 2.31.1

3 2

Fwd: Re: [PATCH] efi_loader: Omit memory with "no-map" when returning memory map.
by Heinrich Schuchardt 02 Sep '21

02 Sep '21

-------- Ursprüngliche Nachricht -------- Von: Ard Biesheuvel <ardb(a)kernel.org> Gesendet: 31. August 2021 12:33:56 MESZ An: Heinrich Schuchardt <xypron.glpk(a)gmx.de> CC: Kristian Amlie <kristian.amlie(a)northern.tech> Betreff: Re: [PATCH] efi_loader: Omit memory with "no-map" when returning memory map. On Tue, 31 Aug 2021 at 08:41, Heinrich Schuchardt <xypron.glpk(a)gmx.de> wrote: > > On 8/27/21 9:55 AM, Kristian Amlie wrote: > > You can use scripts/get_maintainer.pl to find the right addressees for > your patches. > > > efi_reserve_memory() states that memory marked with "no-map" shall not > > be accessed by the UEFI payload. Make sure efi_get_memory_map() honors > > this. > > Accessing memory and describing memory are two different things. Describing reserved memory in the memory map is important, because it helps us distinguish it from MMIO regions. > > This helps the case when booting vexpress_ca9x4 under QEMU. Because > > the kernel wants to use an address in the lowest 128MiB of the range, > > but this range is reserved with "no-map", the kernel complains that it > > can not allocate the low memory it needs. In reality the actual usable > > memory starts much higher, which is reflected correctly in the memory > > map after this fix. > This is a u-boot patch right? (I cannot tell from the context, as there are no mailing lists on cc) It is u-boot's job to describe all the memory, no matter how it is used. Even if the kernel itself may not use it as system memory, there are cases where kernel infrastructure is used to map these regions: for instance, the ACPI core may need to map a SystemMemory OpRegion, and we need the EFI memory map to tell us whether to use memory or I/O semantics. As for the 128 MB issue: can you reproduce this with a recent kernel? We made some changes recently to the EFI stub as well as the decompressor code to prevent the decompressor code from relocating itself to the base of DRAM, and to allow the decompressed kernel to reside at any 2 MB aligned offset in memory. > The 'no-map' requirement needs to be fulfilled by the kernel. > > The GetMemoryMap() boot time service must comply to the UEFI specification. > > The Devicetree Specification has this clarification: > > "Reserved regions with the no-map property must be listed in the memory > map with type EfiReservedMemoryType. All other reserved regions must be > listed with type EfiBootServicesData." > https://devicetree-specification.readthedocs.io/en/latest/chapter3-deviceno… > > Should the kernel calculate its internal 128 MiB requirement incorrectly > this needs be fixed in the kernel EFI stub. Does the problem exist with > kernel 5.14? > > I wonder if the 128 MiB requirement of the kernel can be lifted for > 32bit ARM as we already did for RISC-V. Cf. > As mentioned above, this should already be fixed, in v5.11 or later > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… > > Cc Ard, maintainer of the kernel EFI stub. > > Best regards > > Heinrich > > > > > Signed-off-by: Kristian Amlie <kristian.amlie(a)northern.tech> > > --- > > lib/efi_loader/efi_memory.c | 14 +++++++++++++- > > 1 file changed, 13 insertions(+), 1 deletion(-) > > > > diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c > > index f4acbee4f9..7f8543143a 100644 > > --- a/lib/efi_loader/efi_memory.c > > +++ b/lib/efi_loader/efi_memory.c > > @@ -646,8 +646,16 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size, > > > > provided_map_size = *memory_map_size; > > > > - list_for_each(lhandle, &efi_mem) > > + list_for_each(lhandle, &efi_mem) { > > + struct efi_mem_list *lmem; > > + > > + lmem = list_entry(lhandle, struct efi_mem_list, link); > > + > > + if (lmem->desc.type == EFI_RESERVED_MEMORY_TYPE) > > + continue; > > + > > map_entries++; > > + } > > > > map_size = map_entries * sizeof(struct efi_mem_desc); > > > > @@ -672,6 +680,10 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size, > > struct efi_mem_list *lmem; > > > > lmem = list_entry(lhandle, struct efi_mem_list, link); > > + > > + if (lmem->desc.type == EFI_RESERVED_MEMORY_TYPE) > > + continue; > > + > > *memory_map = lmem->desc; > > memory_map--; > > } > > >

3 6

[PATCH v2 0/5] Use device tree to get DRAM for sama5d27_som1_ek/sama5d2_xplained
by Clément Léger 02 Sep '21

02 Sep '21

Loading U-Boot after OP-TEE requires to move the base address of the DRAM and reduce its size. Indeed, OP-TEE will be loaded at start of DRAM for these platforms and this DRAM will be secured and thus not accessible to U-Boot. Currently, addresses are hardcoded in board configs. This series adds memory property when missing to existing device tree and modify init code to fetch DRAM size from devicetree. This will allow to modify only the device tree to reduce DRAM when needed. Memory addresses have been chosen to have a 32Mb hole at the start of DRAM which allows to put OP-TEE and necessary exchange memory zones. Changes in v2: - Move memory node from sama5d2.dtsi to at91-sama5d2_xplained.dts Clément Léger (5): board: sama5d27_som1_ek: Get dram size and base from device tree board: sama5d27_som1_ek: Modify load addresses ARM: dts: at91: sama5d2_xplained: Add memory node in devicetree board: sama5d2_xplained: Get dram size and base from device tree board: sama5d2_xplained: Modify load addresses arch/arm/dts/at91-sama5d2_xplained.dts | 4 ++++ .../atmel/sama5d27_som1_ek/sama5d27_som1_ek.c | 12 ++++++---- .../atmel/sama5d2_xplained/sama5d2_xplained.c | 11 +++++---- include/configs/sama5d27_som1_ek.h | 12 ++++------ include/configs/sama5d2_xplained.h | 24 ++++++++----------- 5 files changed, 33 insertions(+), 30 deletions(-) -- 2.32.0

2 6

[PATCH] watchdog: Fix watchdog enablement in SPL and TPL
by Marek Vasut 02 Sep '21

02 Sep '21

Commit 830d29ac372 ("watchdog: Allow to use CONFIG_WDT without starting watchdog") completely broke WDT operation in both SPL and TPL, in either case those WDTs are never enabled. Fix it by filling in the missing Kconfig options for SPL and TPL. Fixes: 830d29ac372 ("watchdog: Allow to use CONFIG_WDT without starting watchdog") Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Pali Rohar <pali(a)kernel.org> Cc: Stefan Roese <sr(a)denx.de> --- drivers/watchdog/Kconfig | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index f0ff2612a6b..65d974c4dd5 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -273,4 +273,24 @@ config SPL_WDT Enable driver model for watchdog timer in SPL. This is similar to CONFIG_WDT in U-Boot. +config SPL_WATCHDOG_AUTOSTART + bool "Automatically start watchdog timer in SPL" + depends on SPL && WDT + default y + help + Automatically start watchdog timer and start servicing it during + SPL phase. Enabled by default. Disable this option if you want + to compile U-Boot with CONFIG_WDT support but do not want to + activate watchdog, like when CONFIG_WDT option is disabled. + +config TPL_WATCHDOG_AUTOSTART + bool "Automatically start watchdog timer in TPL" + depends on TPL && WDT + default y + help + Automatically start watchdog timer and start servicing it during + TPL phase. Enabled by default. Disable this option if you want + to compile U-Boot with CONFIG_WDT support but do not want to + activate watchdog, like when CONFIG_WDT option is disabled. + endmenu -- 2.33.0

3 5

[PATCH v3 0/5] efi_loader: capsule: improve capsule authentication support
by AKASHI Takahiro 02 Sep '21

02 Sep '21

# This patch set is basically the same as v2, but removed authentication- # related pytest because the discussion about where to save a public # key is still going on. The command, mkeficapule, is independent from # the result. As I proposed and discussed in [1] and [2], I have made a couple of improvements on the current implementation of capsule update in this patch set. * add signing feature to mkeficapsule * add "--guid" option to mkeficapsule * add man page of mkeficapsule [1] https://lists.denx.de/pipermail/u-boot/2021-April/447918.html [2] https://lists.denx.de/pipermail/u-boot/2021-July/455292.html Prerequisite patches ==================== None Test ==== * locally passed the pytest which is included in this patch series on sandbox built. Todo ==== * add capsule authentication pytest Changes ======= v3 (Aug 31, 2021) * rebased on v2021.10-rc3 * remove pytest-related patches * add function descriptions in mkeficapsule.c * correct format specifiers in printf() * let main() return 0 or -1 only * update doc/develop/uefi/uefi.rst for syntax change of mkeficapsule v2 (July 28, 2021) * rebased on v2021.10-rc* * removed dependency on target's configuration * removed fdtsig.sh and others * add man page * update the UEFI document * add dedicate defconfig for testing on sandbox * add gitlab CI support * add "--guid" option to mkeficapsule (yet rather RFC) Initial release (May 12, 2021) * based on v2021.07-rc2 AKASHI Takahiro (5): tools: mkeficapsule: add firmwware image signing tools: mkeficapsule: add man page doc: update UEFI document for usage of mkeficapsule tools: mkeficapsule: allow for specifying GUID explicitly test/py: efi_capsule: align with the syntax change of mkeficapsule MAINTAINERS | 1 + doc/develop/uefi/uefi.rst | 31 +- doc/mkeficapsule.1 | 98 +++++ test/py/tests/test_efi_capsule/conftest.py | 4 +- tools/Kconfig | 7 + tools/Makefile | 8 +- tools/mkeficapsule.c | 471 +++++++++++++++++++-- 7 files changed, 554 insertions(+), 66 deletions(-) create mode 100644 doc/mkeficapsule.1 -- 2.33.0

2 13

[PATCH v2 0/2] Refactor and improve full help output from tools
by Paul Barker 02 Sep '21

02 Sep '21

Sorry this took so long to get back to! Got there in the end though :) Changes from v1: * Collected the full help printing code from patman, buildman & binman into a single function so that when support for PAGER containing arguments is added it applies to all the relevant tools. Paul Barker (2): tools: Refactor full help printing tools: Handle PAGER containing arguments tools/binman/control.py | 9 +++------ tools/buildman/control.py | 10 ++++------ tools/patman/main.py | 12 ++++-------- tools/patman/tools.py | 14 ++++++++++++++ 4 files changed, 25 insertions(+), 20 deletions(-) -- 2.31.1

2 4

[PATCH] lib: rsa: Extract public key from private key if keyfile argument is used
by Chan, Donald 02 Sep '21

02 Sep '21

If the 'keyfile' (-G) argument is used, there is little value to require 'keydir' (-k) argument since the public key can also be extracted from the private key itself. Signed-off-by: Donald Chan <hoiho(a)lab126.com> --- lib/rsa/rsa-sign.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/lib/rsa/rsa-sign.c b/lib/rsa/rsa-sign.c index f4ed11e74a..f70f352311 100644 --- a/lib/rsa/rsa-sign.c +++ b/lib/rsa/rsa-sign.c @@ -49,16 +49,16 @@ static int rsa_err(const char *msg) } /** - * rsa_pem_get_pub_key() - read a public key from a .crt file + * rsa_pem_get_pub_key() - read a public key from a private key file or .crt file * - * @keydir: Directory containins the key - * @name Name of key file (will have a .crt extension) + * @keydir: Directory containing the key, can be NULL + * @name Name of key file (will apply a .crt extension if keydir is not NULL) * @evpp Returns EVP_PKEY object, or NULL on failure * @return 0 if ok, -ve on error (in which case *evpp will be set to NULL) */ static int rsa_pem_get_pub_key(const char *keydir, const char *name, EVP_PKEY **evpp) { - char path[1024]; + char path[1024] = {0}; EVP_PKEY *key = NULL; X509 *cert; FILE *f; @@ -68,7 +68,10 @@ static int rsa_pem_get_pub_key(const char *keydir, const char *name, EVP_PKEY ** return -EINVAL; *evpp = NULL; - snprintf(path, sizeof(path), "%s/%s.crt", keydir, name); + if (keydir && name) + snprintf(path, sizeof(path), "%s/%s.crt", keydir, name); + else if (name) + snprintf(path, sizeof(path), "%s", name); f = fopen(path, "r"); if (!f) { fprintf(stderr, "Couldn't open RSA certificate: '%s': %s\n", @@ -76,7 +79,13 @@ static int rsa_pem_get_pub_key(const char *keydir, const char *name, EVP_PKEY ** return -EACCES; } - /* Read the certificate */ + /* See if it contains a PEM private key? */ + if (PEM_read_PrivateKey(f, evpp, NULL, path)) { + fclose(f); + return 0; + } + + /* Not a PEM private key, read the certificate */ cert = NULL; if (!PEM_read_X509(f, &cert, NULL, NULL)) { rsa_err("Couldn't read certificate"); @@ -672,7 +681,12 @@ int rsa_add_verify_data(struct image_sign_info *info, void *keydest) if (ret) return ret; } - ret = rsa_get_pub_key(info->keydir, info->keyname, e, &pkey); + if (info->keydir && info->keyname) + ret = rsa_get_pub_key(info->keydir, info->keyname, e, &pkey); + else if (info->keyfile) + ret = rsa_get_pub_key(NULL, info->keyfile, e, &pkey); + else + ret = -EINVAL; if (ret) goto err_get_pub_key; #if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -- 2.16.6

5 7

[PATCH 1/9] Kconfig: Use spaces not tabs in Kconfig entires
by Tom Rini 01 Sep '21

01 Sep '21

While the Kconfig language seems to accept either form of whitespace, we use a space throughout the project, except in these spots. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/arm/mach-exynos/Kconfig | 2 +- board/freescale/mx6memcal/Kconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 0b4276c03628..7df0e176179d 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -141,7 +141,7 @@ if ARCH_EXYNOS7 choice prompt "EXYNOS7 board select" -config TARGET_ESPRESSO7420 +config TARGET_ESPRESSO7420 bool "ESPRESSO7420 board" select ARM64 select ARMV8_MULTIENTRY diff --git a/board/freescale/mx6memcal/Kconfig b/board/freescale/mx6memcal/Kconfig index 9987cba5dcb7..481403ae855d 100644 --- a/board/freescale/mx6memcal/Kconfig +++ b/board/freescale/mx6memcal/Kconfig @@ -87,12 +87,12 @@ choice help Select the type of DDR (DDR3 or LPDDR2) used on your design -config DDR3 +config DDR3 bool "DDR3" help Select this if your board design uses DDR3. -config LPDDR2 +config LPDDR2 bool "LPDDR2" help Select this if your board design uses LPDDR2. -- 2.17.1

4 19

[PATCH] btrfs: Use default subvolume as filesystem root
by Matwey V. Kornilov 01 Sep '21

01 Sep '21

BTRFS volume consists of a number of subvolumes which can be mounted separately from each other. The top-level subvolume always exists even if no subvolumes were created manually. A subvolume can be denoted as the default subvolume i.e. the subvolume which is mounted by default. The default "default subvolume" is the top-level one, but this is far from the common practices used in the wild. For instance, openSUSE provides an OS snapshot/rollback feature based on BTRFS. To achieve this, the actual OS root filesystem is located into a separate subvolume which is "default" but not "top-level". That means that the /boot/dtb/ directory is also located inside this default subvolume instead of top-level one. However, the existing btrfs u-boot driver always uses the top-level subvolume as the filesystem root. This behaviour 1) is inconsistent with mount /dev/sda1 /target command, which mount the default subvolume 2) leads to the issues when /boot/dtb cannot be found properly (see the reference). This patch uses the default subvolume as the filesystem root to overcome mentioned issues. Reference: https://bugzilla.suse.com/show_bug.cgi?id=1185656 Signed-off-by: Matwey V. Kornilov <matwey.kornilov(a)gmail.com> --- fs/btrfs/disk-io.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 349411c3cc..12f9579fcf 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -804,6 +804,30 @@ static int setup_root_or_create_block(struct btrfs_fs_info *fs_info, return 0; } +static int get_default_subvolume(struct btrfs_fs_info *fs_info, + struct btrfs_key *key_ret) +{ + struct btrfs_root *root = fs_info->tree_root; + struct btrfs_dir_item *dir_item; + struct btrfs_path path; + int ret = 0; + + btrfs_init_path(&path); + + dir_item = btrfs_lookup_dir_item(NULL, root, &path, + BTRFS_ROOT_TREE_DIR_OBJECTID, + "default", 7, 0); + if (IS_ERR(dir_item)) { + ret = PTR_ERR(dir_item); + goto out; + } + + btrfs_dir_item_key_to_cpu(path.nodes[0], dir_item, key_ret); +out: + btrfs_release_path(&path); + return ret; +} + int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info) { struct btrfs_super_block *sb = fs_info->super_copy; @@ -833,9 +857,17 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info) fs_info->last_trans_committed = generation; - key.objectid = BTRFS_FS_TREE_OBJECTID; - key.type = BTRFS_ROOT_ITEM_KEY; - key.offset = (u64)-1; + ret = get_default_subvolume(fs_info, &key); + if (ret) { + /* + * The default dir item isn't there. Linux kernel behaviour is + * to silently use the top-level subvolume in this case. + */ + key.objectid = BTRFS_FS_TREE_OBJECTID; + key.type = BTRFS_ROOT_ITEM_KEY; + key.offset = (u64)-1; + } + fs_info->fs_root = btrfs_read_fs_root(fs_info, &key); if (IS_ERR(fs_info->fs_root)) -- 2.31.1

4 6

Please pull u-boot-marvell/next (watchdog related)
by Stefan Roese 01 Sep '21

01 Sep '21

Hi Tom, please pull the following watchdog related patches: ---------------------------------------------------------------- - handling all DM watchdogs in watchdog_reset() (Rasmus) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=111&view=results Thanks, Stefan The following changes since commit a85a8e63c5cf8ccb3905eb5982bf8bdcb2978557: Merge branch '2021-08-30-kconfig-migrations-part1' into next (2021-08-30 16:56:54 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git next for you to fetch changes up to 4171c574721f3790b416b57d6a536cf3238d5849: sandbox: add test of wdt-uclass' watchdog_reset() (2021-08-31 12:04:03 +0200) ---------------------------------------------------------------- Rasmus Villemoes (12): watchdog: wdt-uclass.c: use wdt_start() in wdt_expire_now() watchdog: wdt-uclass.c: introduce struct wdt_priv watchdog: wdt-uclass.c: neaten UCLASS_DRIVER definition watchdog: wdt-uclass.c: refactor initr_watchdog() watchdog: wdt-uclass.c: keep track of each device's running state sandbox: disable CONFIG_WATCHDOG_AUTOSTART watchdog: wdt-uclass.c: add wdt_stop_all() helper board: x530: switch to wdt_stop_all() watchdog: wdt-uclass.c: handle all DM watchdogs in watchdog_reset() watchdog: add gpio watchdog driver sandbox: add test of wdt_gpio driver sandbox: add test of wdt-uclass' watchdog_reset() arch/sandbox/dts/test.dts | 8 ++ board/alliedtelesis/x530/x530.c | 5 +- configs/sandbox64_defconfig | 2 + configs/sandbox_defconfig | 2 + doc/device-tree-bindings/watchdog/gpio-wdt.txt | 19 +++ drivers/watchdog/Kconfig | 9 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/gpio_wdt.c | 68 +++++++++ drivers/watchdog/wdt-uclass.c | 192 ++++++++++++++++++------- include/asm-generic/global_data.h | 6 - include/wdt.h | 8 ++ test/dm/wdt.c | 90 +++++++++++- 12 files changed, 349 insertions(+), 61 deletions(-) create mode 100644 doc/device-tree-bindings/watchdog/gpio-wdt.txt create mode 100644 drivers/watchdog/gpio_wdt.c

2 1