May 2021 - U-Boot

[PATCH] riscv: Split SiFive CLINT support between SPL and U-Boot proper
by Bin Meng 11 May '21

11 May '21

At present there is only one Kconfig option CONFIG_SIFIVE_CLINT to control the enabling of SiFive CLINT support in both SPL (M-mode) and U-Boot proper (S-mode). So for a typical SPL config that the SiFive CLINT driver is enabled in both SPL and U-Boot proper, that means the S-mode U-Boot tries to access the memory-mapped CLINT registers directly, instead of the normal 'rdtime' instruction. This was not a problem before, as the hardware does not forbid the access from S-mode. However this becomes an issue now with OpenSBI commit 8b569803475e ("lib: utils/sys: Add CLINT memregion in the root domain") that the SiFive CLINT register space is protected by PMP for M-mode access only. U-Boot proper does not boot any more with the latest OpenSBI, that access exceptions are fired forever from U-Boot when trying to read the timer value via the SiFive CLINT driver in U-Boot. To solve this, we need to split current SiFive CLINT support between SPL and U-Boot proper, using 2 separate Kconfig options. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- arch/riscv/Kconfig | 9 ++++++++- arch/riscv/cpu/fu540/Kconfig | 2 +- arch/riscv/cpu/generic/Kconfig | 3 ++- arch/riscv/include/asm/global_data.h | 2 +- arch/riscv/lib/Makefile | 2 +- drivers/timer/Makefile | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 3f221dccdb..82e10da11e 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -158,7 +158,14 @@ config DMA_ADDR_T_64BIT config SIFIVE_CLINT bool - depends on RISCV_MMODE || SPL_RISCV_MMODE + depends on RISCV_MMODE + help + The SiFive CLINT block holds memory-mapped control and status registers + associated with software and timer interrupts. + +config SPL_SIFIVE_CLINT + bool + depends on SPL_RISCV_MMODE help The SiFive CLINT block holds memory-mapped control and status registers associated with software and timer interrupts. diff --git a/arch/riscv/cpu/fu540/Kconfig b/arch/riscv/cpu/fu540/Kconfig index 616b25650f..dcf099447b 100644 --- a/arch/riscv/cpu/fu540/Kconfig +++ b/arch/riscv/cpu/fu540/Kconfig @@ -11,7 +11,7 @@ config SIFIVE_FU540 imply CPU imply CPU_RISCV imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE) - imply SIFIVE_CLINT if (RISCV_MMODE || SPL_RISCV_MMODE) + imply SPL_SIFIVE_CLINT imply CMD_CPU imply SPL_CPU imply SPL_OPENSBI diff --git a/arch/riscv/cpu/generic/Kconfig b/arch/riscv/cpu/generic/Kconfig index a4934bb957..e025134b23 100644 --- a/arch/riscv/cpu/generic/Kconfig +++ b/arch/riscv/cpu/generic/Kconfig @@ -9,7 +9,8 @@ config GENERIC_RISCV imply CPU imply CPU_RISCV imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE) - imply SIFIVE_CLINT if (RISCV_MMODE || SPL_RISCV_MMODE) + imply SIFIVE_CLINT if RISCV_MMODE + imply SPL_SIFIVE_CLINT if SPL_RISCV_MMODE imply CMD_CPU imply SPL_CPU imply SPL_OPENSBI diff --git a/arch/riscv/include/asm/global_data.h b/arch/riscv/include/asm/global_data.h index d3a0b1d221..095484a635 100644 --- a/arch/riscv/include/asm/global_data.h +++ b/arch/riscv/include/asm/global_data.h @@ -18,7 +18,7 @@ struct arch_global_data { long boot_hart; /* boot hart id */ phys_addr_t firmware_fdt_addr; -#ifdef CONFIG_SIFIVE_CLINT +#if CONFIG_IS_ENABLED(SIFIVE_CLINT) void __iomem *clint; /* clint base address */ #endif #ifdef CONFIG_ANDES_PLIC diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile index d08cbe9b79..c4cc41434b 100644 --- a/arch/riscv/lib/Makefile +++ b/arch/riscv/lib/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o obj-$(CONFIG_CMD_GO) += boot.o obj-y += cache.o ifeq ($(CONFIG_$(SPL_)RISCV_MMODE),y) -obj-$(CONFIG_SIFIVE_CLINT) += sifive_clint.o +obj-$(CONFIG_$(SPL_)SIFIVE_CLINT) += sifive_clint.o obj-$(CONFIG_ANDES_PLIC) += andes_plic.o else obj-$(CONFIG_SBI) += sbi.o diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile index eb5c48cc6c..2ebdeab0ce 100644 --- a/drivers/timer/Makefile +++ b/drivers/timer/Makefile @@ -19,7 +19,7 @@ obj-$(CONFIG_RENESAS_OSTM_TIMER) += ostm_timer.o obj-$(CONFIG_RISCV_TIMER) += riscv_timer.o obj-$(CONFIG_ROCKCHIP_TIMER) += rockchip_timer.o obj-$(CONFIG_SANDBOX_TIMER) += sandbox_timer.o -obj-$(CONFIG_SIFIVE_CLINT) += sifive_clint_timer.o +obj-$(CONFIG_$(SPL_)SIFIVE_CLINT) += sifive_clint_timer.o obj-$(CONFIG_STI_TIMER) += sti-timer.o obj-$(CONFIG_STM32_TIMER) += stm32_timer.o obj-$(CONFIG_X86_TSC_TIMER) += tsc_timer.o -- 2.25.1

2 1

BeagleBone Green Wireless - serial debug port hangs after sending u-boot-spl.bin (since v2021.01)
by Darren Ng 11 May '21

11 May '21

(Hello, from a U-Boot NOOB.) Issue ----- After sending u-boot-spl.bin with xmodem, the serial debug port seems to hang. Neither "...U-Boot SPL...\n...\nTrying to boot from UART..." nor "CCC..." shows up in minicom. Always 0% if I try sending u-boot.img with xmodem anyway. Target Device ------------- Seeed Studio BeagleBone® Green Wireless https://seeeddoc.github.io/Beaglebone_green_wireless/ https://wiki.seeedstudio.com/BeagleBone_Green_Wireless/#hardware-overview https://source.denx.de/u-boot/u-boot/-/commits/master/configs/am335x_bonebl… Matrix ------ This issue applies to tags ever since v2021.01. In the following table: (x) - This issue applies. (O) - I can send both u-boot-spl.bin and u-boot.img then execute u-boot commands without trouble. ------ tag result ------------ ------------------ v2021.07-rc1 (x) hangs v2021.04 (x) hangs v2021.01 (x) hangs v2020.10 (O) success v2020.07 (?) not tested yet v2020.04 (?) not tested yet v2020.01 (O) success Toolchain --------- "Official toolchain for Arch ARM builds via distcc on x86_64 volunteers" https://aur.archlinux.org/packages/distccd-alarm-armv7h https://archlinuxarm.org/wiki/Distcc_Cross-Compiling --------- $ gcc --version gcc (GCC) 10.2.0 Copyright... --------- $ cd /opt/x-tools7h/arm-unknown-linux-gnueabihf/bin/ $ ./armv7l-unknown-linux-gnueabihf-gcc --version armv7l-unknown-linux-gnueabihf-gcc (crosstool-NG 1.23.0.418-d590) 10.2.0 Copyright... Build ----- tar xf ... cd u-boot-*/ export PATH="$PATH:/opt/x-tools7h/arm-unknown-linux-gnueabihf/bin/" export CROSS_COMPILE="armv7l-unknown-linux-gnueabihf-" export KBUILD_OUTPUT="O" make -j4 am335x_boneblack_vboot_defconfig make -j4 all Regards, Darren "Un1Gfn" Ng Jumat, 7 Mei 2021 WITA(UTC+8)

2 3

[PATCH] configs: ti: enable TFTP_SIZE
by Tero Kristo 11 May '21

11 May '21

This fits the TFTP progress bar on single line based on the size of the file being downloaded, reducing unnecessary spam and also making it easier to track the download progress. Signed-off-by: Tero Kristo <kristo(a)kernel.org> --- include/configs/ti_armv7_common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index f13e9e5264..f40089a3fd 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -205,6 +205,8 @@ "run netloadfdt; " \ "run netargs; " \ "bootz ${loadaddr} - ${fdtaddr}\0" + +#define CONFIG_TFTP_TSIZE #else #define NETARGS "" #endif -- 2.17.1

2 2

[ANN] U-Boot v2021.07-rc2 released
by Tom Rini 11 May '21

11 May '21

Hey all, It's release day, and here's v2021.07-rc2. There's a few PRs I do hope to see come in soon, and shortly after this I will pull in the patches needed to enforce the DM migrations that are now 2 years past their warning dates. I need to start soon on the next round of board removal patches based on the next deadline. In terms of a changelog, git log --merges v2021.07-rc1..v2021.07-rc2 contains what I've pulled but as always, better PR messages and tags will provide better results here. I do have my reminders setup for doing -rc releases every other Monday from here on out and final release on July 5th, 2021. Thanks all! -- Tom

2 2

[PATCH v4] efi_loader: Fix Kconfig for EFI_TCG2 protocol
by Ilias Apalodimas 11 May '21

11 May '21

EFI_TCG2 depends not only on TPMv2 but also on the underlying algorithms. So select the missing SHA1, SHA256, SHA384 and SHA512 we currently support Reported-by: Michal Simek <michal.simek(a)xilinx.com> Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- changes since v3: - add multiple select lines changes since v2: - remove 'on' after select changes since v1: - use 'select' instead of 'depend' lib/efi_loader/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 0b99d7c7749b..9a5a0334ad45 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -301,6 +301,10 @@ config EFI_RNG_PROTOCOL config EFI_TCG2_PROTOCOL bool "EFI_TCG2_PROTOCOL support" depends on TPM_V2 + select SHA1 + select SHA256 + select SHA384 + select SHA512 help Provide a EFI_TCG2_PROTOCOL implementation using the TPM hardware of the platform. -- 2.31.0

2 1

[PATCH v3] efi_loader: Fix Kconfig for EFI_TCG2 protocol
by Ilias Apalodimas 11 May '21

11 May '21

EFI_TCG2 depends not only on TPMv2 but also on the underlying algorithms. So select the missing SHA1, SHA256, SHA384 and SHA512 we currently support Reported-by: Michal Simek <michal.simek(a)xilinx.com> Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- changes since v1: - use 'select' instead of 'depend' changes since v2: - remove 'on' after select lib/efi_loader/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 0b99d7c7749b..4acc0d14e4cc 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -301,6 +301,7 @@ config EFI_RNG_PROTOCOL config EFI_TCG2_PROTOCOL bool "EFI_TCG2_PROTOCOL support" depends on TPM_V2 + select SHA1 && SHA256 && SHA384 && SHA512 help Provide a EFI_TCG2_PROTOCOL implementation using the TPM hardware of the platform. -- 2.31.0

1 0

[PATCH v2] efi_loader: Fix Kconfig for EFI_TCG2 protocol
by Ilias Apalodimas 11 May '21

11 May '21

EFI_TCG2 depends not only on TPMv2 but also on the underlying algorithms. So select the missing SHA1, SHA256, SHA384 and SHA512 we currently support Reported-by: Michal Simek <michal.simek(a)xilinx.com> Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- Changes since v1: - use 'select' instead of 'depends' lib/efi_loader/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 0b99d7c7749b..660236c1fc20 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -301,6 +301,7 @@ config EFI_RNG_PROTOCOL config EFI_TCG2_PROTOCOL bool "EFI_TCG2_PROTOCOL support" depends on TPM_V2 + select on SHA1 && SHA256 && SHA384 && SHA512 help Provide a EFI_TCG2_PROTOCOL implementation using the TPM hardware of the platform. -- 2.31.0

2 2

[PATCH] efi_loader: Fix Kconfig for EFI_TCG2 protocol
by Ilias Apalodimas 11 May '21

11 May '21

EFI_TCG2 depends not only on TPMv2 but also on the underlying algorithms. So add the missing SHA1, SHA256, SHA384 and SHA512 we currently support as depenmdencies Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 0b99d7c7749b..6decdee6aa3e 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -301,6 +301,7 @@ config EFI_RNG_PROTOCOL config EFI_TCG2_PROTOCOL bool "EFI_TCG2_PROTOCOL support" depends on TPM_V2 + depends on SHA1 && SHA256 && SHA384 && SHA512 help Provide a EFI_TCG2_PROTOCOL implementation using the TPM hardware of the platform. -- 2.31.0

2 3

[PATCH v2 1/1] efi_loader: Uninstall the TCG2 protocol if logging s-crtm fails
by Heinrich Schuchardt 11 May '21

11 May '21

From: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Instead of just failing, clean up the installed config table and EventLog memory if logging an s-crtm event fails during the protocol installation Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Eliminate label 'out:' by using return. Reviewed-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_tcg2.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index 570cc746ed..4530a47b63 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -1103,8 +1103,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"); - ret = EFI_SUCCESS; - goto out; + return EFI_SUCCESS; } ret = efi_init_event_log(); @@ -1113,7 +1112,7 @@ efi_status_t efi_tcg2_register(void) ret = efi_append_scrtm_version(dev); if (ret != EFI_SUCCESS) - goto out; + goto fail; ret = efi_add_protocol(efi_root, &efi_guid_tcg2_protocol, (void *)&efi_tcg2_protocol); @@ -1121,9 +1120,8 @@ efi_status_t efi_tcg2_register(void) log_err("Cannot install EFI_TCG2_PROTOCOL\n"); goto fail; } - -out: return ret; + fail: tcg2_uninit(); return ret; -- 2.30.2

2 1

[PATCH] efi_loader: Uninstall the TCG2 protocol if logging s-crtm fails
by Ilias Apalodimas 11 May '21

11 May '21

Instead of just failing, clean up the installed config table and EventLog memory if logging an s-crtm event fails during the 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 570cc746ed4e..8f8a26e7b7ae 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -1113,7 +1113,7 @@ efi_status_t efi_tcg2_register(void) ret = efi_append_scrtm_version(dev); if (ret != EFI_SUCCESS) - goto out; + goto fail; ret = efi_add_protocol(efi_root, &efi_guid_tcg2_protocol, (void *)&efi_tcg2_protocol); -- 2.31.0

2 1