January 2023 - U-Boot

[PATCH] tpm2: ftpm: add the device in the OP-TEE services list
by Ilias Apalodimas 20 Jan '23

20 Jan '23

commit fe8a4ed0111073 ("tee: optee: discover services dependent on tee-supplicant") is trying to automatically scan and add TAs that are presented on pseudo bus from the secure world. In orer to be able to list and compare the scanned devices the available drivers have to register themselves on the op-tee service list. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- drivers/tpm/tpm2_ftpm_tee.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/tpm/tpm2_ftpm_tee.c b/drivers/tpm/tpm2_ftpm_tee.c index 3c4c12983daa..f0deaec5b076 100644 --- a/drivers/tpm/tpm2_ftpm_tee.c +++ b/drivers/tpm/tpm2_ftpm_tee.c @@ -18,10 +18,12 @@ #include <log.h> #include <tpm-v2.h> #include <tee.h> +#include <tee/optee_service.h> #include "tpm_tis.h" #include "tpm2_ftpm_tee.h" +OPTEE_SERVICE_DRIVER(optee_ftpm, TA_FTPM_UUID, "ftpm_tee"); /** * ftpm_tee_transceive() - send fTPM commands and retrieve fTPM response. * @sendbuf - address of the data to send, byte by byte -- 2.38.1

3 2

[PATCH] tee: optee: fix uuid comparisons on service discovery
by Ilias Apalodimas 20 Jan '23

20 Jan '23

When comparing UUIDs for discovered services we only compare up to the ptr size instead of the entire UUID Fixes: 94ccfb78a4d61 ("drivers: tee: optee: discover OP-TEE services") Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- drivers/tee/optee/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 88e23d252bcd..9a9b697e91f5 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -73,7 +73,7 @@ static struct optee_service *find_service_driver(const struct tee_optee_ta_uuid for (idx = 0; idx < service_cnt; idx++, service++) { tee_optee_ta_uuid_to_octets(loc_uuid, &service->uuid); - if (!memcmp(uuid, loc_uuid, sizeof(uuid))) + if (!memcmp(uuid, loc_uuid, sizeof(*uuid))) return service; } -- 2.38.1

3 2

Please pull u-boot-dm
by Simon Glass 19 Jan '23

19 Jan '23

Hi Tom, https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/14776 The following changes since commit 5b958dea5c678dbdb2aeb6ac3c0c8cc8dfea065c: Merge branch '2022-01-16-bootstd-updates' (2023-01-17 08:55:40 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-18jan23 for you to fetch changes up to 4c5907889553696160fabaa7e9f0c96ed1fa6597: patman: symlink top level .checkpatch.conf (2023-01-18 14:55:41 -0700) ---------------------------------------------------------------- convert rockchip to use binman patman fix for checkpatch binman optional entries, improved support for ELF symbols trace improvements minor fdt refactoring ---------------------------------------------------------------- Maxim Cournoyer (2): Revert "patman: invoke the checkpatch.pl script with '--u-boot' and '--strict'" patman: symlink top level .checkpatch.conf Simon Glass (36): trace: Use notrace for short arm: Support trace on armv8 tpm: Add a proper Kconfig option for crc8 in SPL fdt: Avoid exporting fdtdec_prepare_fdt() fdt: Drop ifdefs in fdtdec_prepare_fdt() fdt: Pass the device tree to fdtdec_prepare_fdt() fdt: Check for overlapping data and FDT trace: Move trace pointer to data section mkimage: Add a few more messages for FIT failures trace: Adjust flags in proftool trace: Update trace-format generator for newer version trace: Don't require TIMER_EARLY rockchip: Enable bootstage on rockpro64 Revert "fdtdec: drop needlessly convoluted CONFIG_PHANDLE_CHECK_SEQ" dm: pinctrl: Revert "pinctrl: probe pinctrl drivers during post-bind" binman: Allow writing section contents to a file binman: Tidy up comment in fit _gen_node binman: Update entry docs binman: Use a reference for binman symbols docs binman: Support optional entries binman: Add a way to check for a valid ELF file binman: Support new op-tee binary format binman: Support optional external blobs rockchip: evb-rk3288: Drop raw-image support rockchip: Use multiple-images for rk3399 rockchip: Support building the all output files in binman rockchip: Convert all boards to use binman rockchip: Drop the FIT generator script binman: Add a test for an inner section with a size binman: Clarify use of False when obtaining data binman: Add a null entry binman: Add a function to check for special section nodes binman: Support overlapping entries binman: Provide general support for updating ELF symbols dtoc: Add a way to read a phandle with params binman: Support positioning an entry by and ELF symbol .gitignore | 1 + Makefile | 11 +-- arch/arm/cpu/armv7/s5p-common/timer.c | 2 +- arch/arm/cpu/armv8/generic_timer.c | 6 +- arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi | 2 +- arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 4 +- arch/arm/dts/rk3399-u-boot.dtsi | 3 +- arch/arm/dts/rockchip-u-boot.dtsi | 78 ++++++++++++++-- arch/arm/mach-exynos/include/mach/cpu.h | 6 +- arch/arm/mach-rockchip/make_fit_atf.py | 267 ------------------------------------------------------ arch/arm/mach-rockchip/tpl.c | 16 +++- arch/x86/include/asm/global_data.h | 2 +- arch/x86/include/asm/msr.h | 2 +- arch/x86/include/asm/u-boot-x86.h | 2 +- boot/Kconfig | 3 +- common/spl/spl_fit.c | 1 + configs/am65x_evm_a53_defconfig | 1 + configs/evb-ast2600_defconfig | 1 + configs/evb-rk3288_defconfig | 1 + configs/rockpro64-rk3399_defconfig | 8 ++ configs/sama7g5ek_mmc1_defconfig | 1 + configs/sama7g5ek_mmc_defconfig | 1 + doc/develop/trace.rst | 2 +- drivers/pinctrl/pinctrl-uclass.c | 7 -- include/fdtdec.h | 9 -- lib/Kconfig | 27 +++++- lib/Makefile | 3 +- lib/efi_loader/efi_freestanding.c | 4 +- lib/fdtdec.c | 92 ++++++++++++------- lib/trace.c | 29 +++--- tools/binman/binman.rst | 78 +++++++++++++++- tools/binman/control.py | 12 +++ tools/binman/elf.py | 46 +++++++++- tools/binman/elf_test.py | 10 ++ tools/binman/entries.rst | 237 +++++++++++++++++++++++++++++++++++++++++------- tools/binman/entry.py | 80 ++++++++++++++-- tools/binman/etype/_testing.py | 3 + tools/binman/etype/blob.py | 8 +- tools/binman/etype/fit.py | 100 +++++++++++--------- tools/binman/etype/mkimage.py | 28 +++--- tools/binman/etype/null.py | 25 +++++ tools/binman/etype/section.py | 93 ++++++++++++++++--- tools/binman/etype/tee_os.py | 76 +++++++++++++++- tools/binman/etype/u_boot.py | 6 +- tools/binman/etype/u_boot_spl.py | 5 +- tools/binman/etype/u_boot_spl_nodtb.py | 4 +- tools/binman/etype/u_boot_tpl.py | 4 +- tools/binman/etype/u_boot_tpl_nodtb.py | 4 +- tools/binman/etype/u_boot_vpl.py | 4 +- tools/binman/etype/u_boot_vpl_nodtb.py | 6 +- tools/binman/ftest.py | 233 +++++++++++++++++++++++++++++++++++++++++++++++ tools/binman/image.py | 3 - tools/binman/test/261_section_fname.dts | 29 ++++++ tools/binman/test/262_absent.dts | 20 ++++ tools/binman/test/263_tee_os_opt.dts | 22 +++++ tools/binman/test/264_tee_os_opt_fit.dts | 33 +++++++ tools/binman/test/265_tee_os_opt_fit_bad.dts | 40 ++++++++ tools/binman/test/266_blob_ext_opt.dts | 21 +++++ tools/binman/test/267_section_inner.dts | 16 ++++ tools/binman/test/268_null.dts | 19 ++++ tools/binman/test/269_overlap.dts | 21 +++++ tools/binman/test/270_overlap_null.dts | 24 +++++ tools/binman/test/271_overlap_bad.dts | 21 +++++ tools/binman/test/272_overlap_no_size.dts | 19 ++++ tools/binman/test/273_blob_symbol.dts | 24 +++++ tools/binman/test/274_offset_from_elf.dts | 30 ++++++ tools/binman/test/Makefile | 9 +- tools/binman/test/blob_syms.c | 20 ++++ tools/binman/test/blob_syms.lds | 30 ++++++ tools/dtoc/fdt_util.py | 28 ++++++ tools/dtoc/test/dtoc_test_phandle.dts | 1 + tools/dtoc/test_dtoc.py | 3 + tools/dtoc/test_fdt.py | 11 +++ tools/fit_image.c | 4 +- tools/image-host.c | 6 +- tools/patman/.checkpatch.conf | 1 + tools/patman/checkpatch.py | 2 +- tools/proftool.c | 43 +++++---- 78 files changed, 1617 insertions(+), 537 deletions(-) delete mode 100755 arch/arm/mach-rockchip/make_fit_atf.py create mode 100644 tools/binman/etype/null.py create mode 100644 tools/binman/test/261_section_fname.dts create mode 100644 tools/binman/test/262_absent.dts create mode 100644 tools/binman/test/263_tee_os_opt.dts create mode 100644 tools/binman/test/264_tee_os_opt_fit.dts create mode 100644 tools/binman/test/265_tee_os_opt_fit_bad.dts create mode 100644 tools/binman/test/266_blob_ext_opt.dts create mode 100644 tools/binman/test/267_section_inner.dts create mode 100644 tools/binman/test/268_null.dts create mode 100644 tools/binman/test/269_overlap.dts create mode 100644 tools/binman/test/270_overlap_null.dts create mode 100644 tools/binman/test/271_overlap_bad.dts create mode 100644 tools/binman/test/272_overlap_no_size.dts create mode 100644 tools/binman/test/273_blob_symbol.dts create mode 100644 tools/binman/test/274_offset_from_elf.dts create mode 100644 tools/binman/test/blob_syms.c create mode 100644 tools/binman/test/blob_syms.lds create mode 120000 tools/patman/.checkpatch.conf Regards, Simon

2 1

U-Boot v2022.04 Compile Errors
by Matthew.Moreira＠gd-ms.com 19 Jan '23

19 Jan '23

Hello, I have been working with trying to build U-Boot version 2022.04, cloning from branch boundary-v2022.04 from the following link: https://github.com/boundarydevices/u-boot/tree/boundary-v2022.04 I am running into a couple errors, none of which I was able to find on the email threads and FAQ page. 1. I am currently getting an error when calling the 'make -j8' command due to not having SWIG installed. I have gotten past this by setting CONFIG_PYLIBFDT=n on the command line. However, I believe this is a temporary solution, is it possible to build the latest version of U-Boot without SWIG? 1. I do not know if this is related to me circumventing the issue above, but if I set CONFIG_PYLIBFDT=n on the command line when calling make, I proceed to get an include/ctype.h error, expected identifier or '(' before numeric constant. Is this a known issue in the boundary-v2022.04 branch? Or is this a repercussion of circumventing the SWIG/BINMAN issue above? Thank you! Matthew Moreira (781) - 410 - 3818 Matthew.moreira(a)gd-ms.com<mailto:Matthew.moreira@gd-ms.com> 150 Rustcraft Road Dedham, MA 02026 [cid:image001.png@01D92BEB.B9740E40] This message and/or attachments may include information subject to GD Corporate Policies 07-103 and 07-105 and is intended to be accessed only by authorized recipients. Use, storage and transmission are governed by General Dynamics and its policies. Contractual restrictions apply to third parties. Recipients should refer to the policies or contract to determine proper handling. Unauthorized review, use, disclosure or distribution is prohibited. If you are not an intended recipient, please contact the sender and destroy all copies of the original message.

2 1

[PATCH v4 0/3] Timer support for ARM Tegra
by Svyatoslav Ryhel 19 Jan '23

19 Jan '23

- ARM: tegra: remap clock_osc_freq for all Tegra family Enum clock_osc_freq was designed to use only with T20. This patch remaps it to use additional frequencies, added in T30+ SoC while maintaining backwards compatibility with T20. - drivers: timer: add timer driver for ARMv7 based Tegra devices Add timer support for T20/T30/T114 and T124 based devices. Driver is based on DM, has device tree support and can be used on SPL and early boot stage. - ARM: tegra: include timer as default option Enable TIMER as default option for add Tegra devices and enable TEGRA_TIMER for TEGRA_ARMV7_COMMON. Additionally enable SPL_TIMER if build as SPL part and drop deprecated configs from common header. P. S. I have no arm64 Tegra and according to comment in tegra-common.h Use the Tegra US timer on ARMv7, but the architected timer on ARMv8. Svyatoslav Ryhel (3): ARM: tegra: remap clock_osc_freq for all Tegra family drivers: timer: add timer driver for ARMv7 based Tegra devices ARM: tegra: include timer as default option arch/arm/Kconfig | 1 + arch/arm/include/asm/arch-tegra/clock.h | 9 +- arch/arm/mach-tegra/Kconfig | 2 + arch/arm/mach-tegra/clock.c | 17 +++- arch/arm/mach-tegra/cpu.c | 70 ++++++++++++--- arch/arm/mach-tegra/tegra114/clock.c | 13 ++- arch/arm/mach-tegra/tegra124/clock.c | 13 ++- arch/arm/mach-tegra/tegra20/clock.c | 4 +- arch/arm/mach-tegra/tegra210/clock.c | 22 +---- arch/arm/mach-tegra/tegra30/clock.c | 10 +-- drivers/timer/Kconfig | 8 ++ drivers/timer/Makefile | 1 + drivers/timer/tegra-timer.c | 113 ++++++++++++++++++++++++ drivers/usb/host/ehci-tegra.c | 46 ++++++++-- include/configs/tegra-common.h | 6 -- 15 files changed, 256 insertions(+), 79 deletions(-) create mode 100644 drivers/timer/tegra-timer.c -- 2.37.2

2 7

[PATCH] armv7: ls102xa: make QSPI clock selection optional during SoC init
by Mario Kicherer 19 Jan '23

19 Jan '23

To improve startup times when booting from QSPI flash, the QSPI frequency can be configured very early in the boot process [1] to reduce loading times of U-Boot itself. This patch adds an option to disable setting the frequency to a default value during SoC initialization. [1] https://www.nxp.com/docs/en/application-note/AN12279.pdf Signed-off-by: Mario Kicherer <dev(a)kicherer.org> --- arch/arm/cpu/armv7/ls102xa/Kconfig | 9 +++++++++ arch/arm/cpu/armv7/ls102xa/soc.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig index e75a895e00..f6b07b6026 100644 --- a/arch/arm/cpu/armv7/ls102xa/Kconfig +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig @@ -98,4 +98,13 @@ config SYS_FSL_IFC_BANK_COUNT config SYS_FSL_ERRATUM_A008407 bool +config SYS_FSL_QSPI_SKIP_CLKSEL + bool "Skip setting QSPI clock during SoC init" + default 0 + help + To improve startup times when booting from QSPI flash, the QSPI + frequency can be set very early in the boot process. If this option + is enabled, the QSPI frequency will not be changed by U-Boot during + SoC initialization. + endmenu diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c index 21570204b0..84d4ea3a8f 100644 --- a/arch/arm/cpu/armv7/ls102xa/soc.c +++ b/arch/arm/cpu/armv7/ls102xa/soc.c @@ -169,8 +169,8 @@ int arch_soc_init(void) #ifdef CONFIG_LAYERSCAPE_NS_ACCESS enable_layerscape_ns_access(); #endif - -#if defined(CONFIG_FSL_QSPI) + +#if defined(CONFIG_FSL_QSPI) && !defined(CONFIG_SYS_FSL_QSPI_SKIP_CLKSEL) out_be32(&scfg->qspi_cfg, SCFG_QSPI_CLKSEL); #endif -- 2.34.1

1 0

[PATCH 1/2] Revert "patman: invoke the checkpatch.pl script with '--u-boot' and '--strict'"
by Maxim Cournoyer 19 Jan '23

19 Jan '23

This reverts commit 648d8186dd7f9c444fb07f355090d275dcdd4de4, because it broke usage of patman on Linux, whose check script doesn't know about '--strict' or '--u-boot'. Reported-by: Sjoerd Simons <sjoerd(a)collabora.com> Signed-off-by: Maxim Cournoyer <maxim.cournoyer(a)savoirfairelinux.com> --- tools/patman/checkpatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py index 012c0d895c..d1b902dd96 100644 --- a/tools/patman/checkpatch.py +++ b/tools/patman/checkpatch.py @@ -211,7 +211,7 @@ def check_patch(fname, verbose=False, show_types=False, use_tree=False): stdout: Full output of checkpatch """ chk = find_check_patch() - args = [chk, '--u-boot', '--strict'] + args = [chk] if not use_tree: args.append('--no-tree') if show_types: base-commit: 87c9e117bf57d6bb42c5521a3f6ec9ca7d97e5fa -- 2.38.1

4 8

[PATCH 1/1] buildman: invalid reference to README
by Heinrich Schuchardt 19 Jan '23

19 Jan '23

The readme file for buildman is called buildman.rst. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- tools/buildman/toolchain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 38b0dea8c7..ea1ad1bcb8 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -265,7 +265,7 @@ class Toolchains: print(("Warning: No tool chains. Please run 'buildman " "--fetch-arch all' to download all available toolchains, or " "add a [toolchain] section to your buildman config file " - "%s. See README for details" % + "%s. See buildman.rst for details" % bsettings.config_fname)) paths = [] -- 2.38.1

2 1

[PATCH] efi_loader: update the error message of TCG protocol installation
by Ilias Apalodimas 19 Jan '23

19 Jan '23

"Unable to find TPMv2 device" doesn't explain much with regards to the error origin. Update it to match what we have in the RNG protocol installation. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- 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 a525ebf75b58..d7cce97ced5e 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -2417,7 +2417,7 @@ efi_status_t efi_tcg2_register(void) ret = platform_get_tpm2_device(&dev); if (ret != EFI_SUCCESS) { - log_warning("Unable to find TPMv2 device\n"); + log_warning("Missing TPMv2 device for EFI_TCG_PROTOCOL\n"); return EFI_SUCCESS; } -- 2.38.1

2 1

[PATCH 1/1] fs/fat: avoid noisy message fat_read_file()
by Heinrich Schuchardt 19 Jan '23

19 Jan '23

UEFI applications call file system functions to determine if a file exists. The return codes are evaluated to show appropriate messages. U-Boot's file system layer should not interfere with the output. Rename file_fat_read_at() to fat_read_file() adjusting the parameter sequence and names and eliminate the old wrapper function. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- fs/fat/fat.c | 22 +++++----------------- include/fat.h | 2 -- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index a945904785..2da93dae3c 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -1243,8 +1243,8 @@ out_free_itr: return ret; } -int file_fat_read_at(const char *filename, loff_t pos, void *buffer, - loff_t maxsize, loff_t *actread) +int fat_read_file(const char *filename, void *buf, loff_t offset, loff_t len, + loff_t *actread) { fsdata fsdata; fat_itr *itr; @@ -1261,12 +1261,12 @@ int file_fat_read_at(const char *filename, loff_t pos, void *buffer, if (ret) goto out_free_both; - debug("reading %s at pos %llu\n", filename, pos); + debug("reading %s at pos %llu\n", filename, offset); /* For saving default max clustersize memory allocated to malloc pool */ dir_entry *dentptr = itr->dent; - ret = get_contents(&fsdata, dentptr, pos, buffer, maxsize, actread); + ret = get_contents(&fsdata, dentptr, offset, buf, len, actread); out_free_both: free(fsdata.fatbuf); @@ -1280,25 +1280,13 @@ int file_fat_read(const char *filename, void *buffer, int maxsize) loff_t actread; int ret; - ret = file_fat_read_at(filename, 0, buffer, maxsize, &actread); + ret = fat_read_file(filename, buffer, 0, maxsize, &actread); if (ret) return ret; else return actread; } -int fat_read_file(const char *filename, void *buf, loff_t offset, loff_t len, - loff_t *actread) -{ - int ret; - - ret = file_fat_read_at(filename, offset, buf, len, actread); - if (ret) - printf("** Unable to read file %s **\n", filename); - - return ret; -} - typedef struct { struct fs_dir_stream parent; struct fs_dirent dirent; diff --git a/include/fat.h b/include/fat.h index bd8e450b33..a9756fb4cd 100644 --- a/include/fat.h +++ b/include/fat.h @@ -200,8 +200,6 @@ static inline u32 sect_to_clust(fsdata *fsdata, int sect) int file_fat_detectfs(void); int fat_exists(const char *filename); int fat_size(const char *filename, loff_t *size); -int file_fat_read_at(const char *filename, loff_t pos, void *buffer, - loff_t maxsize, loff_t *actread); int file_fat_read(const char *filename, void *buffer, int maxsize); int fat_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info); int fat_register_device(struct blk_desc *dev_desc, int part_no); -- 2.38.1

3 4