March 2023 - U-Boot

[PATCH v3 0/4] FMP versioning support
by Masahisa Kojima 23 Mar '23

23 Mar '23

Firmware version management is not implemented in the current FMP implementation. This series aims to add the versioning support in FMP. Python based test will follow later. EDK2 reference implementation utilizes the FMP Payload Header inserted right before the capsule payload. With this series, U-Boot also follows the EDK2 implementation. Currently, there is no way to know the current running firmware version through the EFI interface. FMP->GetImageInfo() returns always 0 for the version number. So a user can not know that expected firmware is running after the capsule update. With this series applied, version number can be specified in the capsule file generation with mkeficapsule tool, then user can know the running firmware version through FMP->GetImageInfo() and ESRT. Note that this series does not mandate the FMP Payload Header, compatible with boards that are already using the existing U-Boot FMP implementation. If no FMP Payload Header is found in the capsule file, fw_version, lowest supported version, last attempt version and last attempt status is set to 0 and this is the same behavior as existing FMP implementation. Changes in v3: - exclude CONFIG_FWU_MULTI_BANK_UPDATE case Masahisa Kojima (4): efi_loader: store firmware version into FmpState variable efi_loader: versioning support in GetImageInfo efi_loader: check lowest supported version in capsule update mkeficapsule: add FMP Payload Header doc/mkeficapsule.1 | 16 ++ lib/efi_loader/efi_firmware.c | 302 +++++++++++++++++++++++++++++++--- tools/eficapsule.h | 32 ++++ tools/mkeficapsule.c | 51 +++++- 4 files changed, 369 insertions(+), 32 deletions(-) -- 2.17.1

2 9

[PATCH 1/6] arm: Correct cpu_reset function prototype on some platforms
by Tom Rini 23 Mar '23

23 Mar '23

Some platforms were not including <cpu_func.h> which sets the prototype for reset_cpu, and in turn had it set wrong. Correct these cases. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/arm/mach-hpe/gxp/reset.c | 3 ++- arch/arm/mach-mediatek/mt7981/init.c | 3 ++- arch/arm/mach-mediatek/mt7986/init.c | 3 ++- board/armltd/corstone1000/corstone1000.c | 3 ++- board/bosch/acc/acc.c | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-hpe/gxp/reset.c b/arch/arm/mach-hpe/gxp/reset.c index ce018a35d94d..a147bcac18bd 100644 --- a/arch/arm/mach-hpe/gxp/reset.c +++ b/arch/arm/mach-hpe/gxp/reset.c @@ -7,6 +7,7 @@ * Author: Jean-Marie Verdun <verdun(a)hpe.com> */ +#include <cpu_func.h> #include <asm/io.h> #define GXP_CCR 0xc0000000 @@ -16,7 +17,7 @@ void lowlevel_init(void) { } -void reset_cpu(ulong ignored) +void reset_cpu(void) { writel(1, GXP_CCR); diff --git a/arch/arm/mach-mediatek/mt7981/init.c b/arch/arm/mach-mediatek/mt7981/init.c index d8b10f035808..3c921d6ad5cc 100644 --- a/arch/arm/mach-mediatek/mt7981/init.c +++ b/arch/arm/mach-mediatek/mt7981/init.c @@ -4,6 +4,7 @@ * Author: Sam Shih <sam.shih(a)mediatek.com> */ +#include <cpu_func.h> #include <init.h> #include <asm/armv8/mmu.h> #include <asm/system.h> @@ -19,7 +20,7 @@ int dram_init(void) return 0; } -void reset_cpu(ulong addr) +void reset_cpu(void) { psci_system_reset(); } diff --git a/arch/arm/mach-mediatek/mt7986/init.c b/arch/arm/mach-mediatek/mt7986/init.c index fb74b2f34d7b..9d0c0cdcd08f 100644 --- a/arch/arm/mach-mediatek/mt7986/init.c +++ b/arch/arm/mach-mediatek/mt7986/init.c @@ -4,6 +4,7 @@ * Author: Sam Shih <sam.shih(a)mediatek.com> */ +#include <cpu_func.h> #include <init.h> #include <asm/armv8/mmu.h> #include <asm/system.h> @@ -19,7 +20,7 @@ int dram_init(void) return 0; } -void reset_cpu(ulong addr) +void reset_cpu(void) { psci_system_reset(); } diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c index 4f4b96a095c2..6ec8e6144fb4 100644 --- a/board/armltd/corstone1000/corstone1000.c +++ b/board/armltd/corstone1000/corstone1000.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <dm.h> #include <netdev.h> #include <dm/platform_data/serial_pl01x.h> @@ -86,6 +87,6 @@ int dram_init_banksize(void) return 0; } -void reset_cpu(ulong addr) +void reset_cpu(void) { } diff --git a/board/bosch/acc/acc.c b/board/bosch/acc/acc.c index 770ca8b711b0..4a0603d0f3f6 100644 --- a/board/bosch/acc/acc.c +++ b/board/bosch/acc/acc.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <bootstage.h> #include <dm.h> #include <dm/platform_data/serial_mxc.h> @@ -720,7 +721,7 @@ int board_fit_config_name_match(const char *name) return -1; } -void reset_cpu(ulong addr) +void reset_cpu(void) { puts("Hanging CPU for watchdog reset!\n"); hang(); -- 2.34.1

3 12

[PATCH 1/7] global: Disable deprecated-non-prototype warning with clang
by Tom Rini 23 Mar '23

23 Mar '23

We have a number of places in the code which use the following syntax: void func(a, b, c) int a; /* Does a */ something_t *b; /* Pointer to b */ int c; /* Does c */ { ... } Which while not what we document as our coding style, this is also code which we have imported from other projects, and would like to re-sync with in the future. While the biggest example of this is the zlib code, there are other places as well. For now, we will silence this warning. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 54f894dab841..d2c132be6e09 100644 --- a/Makefile +++ b/Makefile @@ -790,6 +790,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare) # See modpost pattern 2 KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,) KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior) +KBUILD_CFLAGS += $(call cc-disable-warning, deprecated-non-prototype) endif # These warnings generated too much noise in a regular build. -- 2.34.1

4 22

How to add eth1 to test device tree?
by Ehsan Mohandesi 22 Mar '23

22 Mar '23

Hi All, When running the sandbox tests, I want to know how to enable eth1 in order to be able to test network features. The following command is used to run sandbox tests. ./test/py/test.py -k testname.py I am specifically interested in running the network tests. ./test/py/test.py -k test_net.py These Python tests use test.dts device tree which does not have eth1 in it. I can replace the test.dts file with sandbox.dts to enable eth1 and run the network tests; however, I think there should be a better way to do it. Can anyone help me with this issue? When running U-Boot, the -T option could be used to tell it to use the test.dts or -D to use sandbox.dts; however, there is no such option when running test.py. Eth1 is needed in order to enable the network. Enabling the sandbox network is explained after line 250 in doc/arch/sandbox.rst. For more information, the following is the list of network interfaces when each device tree is used. arch/sandbox/dts/sandbox.dts Net: eth0: host_lo, eth1: host_eth0, eth2: host_br1, eth3: eth@10002000 arch/sandbox/dts/test.dts Net: eth0: eth@10002000, eth5: eth@10003000, eth3: sbe5, eth6: eth@10004000, eth4: dsa-test-eth, eth2: lan0, eth7: lan1

1 0

[PATCH] console: Use flush() before panic and reset
by Tony Dinh 22 Mar '23

22 Mar '23

To make sure the panic and the reset messages will go out, console flush() should be used. Sleep periods do not work in early u-boot phase when timer driver is not initialized yet. Reference: https://lists.denx.de/pipermail/u-boot/2023-March/512233.html Signed-off-by: Tony Dinh <mibodhi(a)gmail.com> --- arch/arm/lib/reset.c | 4 ++-- lib/panic.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c index 95169bae1c..3e051e36f1 100644 --- a/arch/arm/lib/reset.c +++ b/arch/arm/lib/reset.c @@ -25,6 +25,7 @@ #include <cpu_func.h> #include <irq_func.h> #include <linux/delay.h> +#include <stdio.h> __weak void reset_misc(void) { @@ -33,8 +34,7 @@ __weak void reset_misc(void) int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { puts ("resetting ...\n"); - - mdelay(50); /* wait 50 ms */ + flush(); disable_interrupts(); diff --git a/lib/panic.c b/lib/panic.c index 58382ac4f4..66ae17f3df 100644 --- a/lib/panic.c +++ b/lib/panic.c @@ -15,6 +15,7 @@ #include <command.h> #endif #include <linux/delay.h> +#include <stdio.h> static void panic_finish(void) __attribute__ ((noreturn)); @@ -24,7 +25,8 @@ static void panic_finish(void) #if defined(CONFIG_PANIC_HANG) hang(); #else - udelay(100000); /* allow messages to go out */ + flush(); /* flush the panic message before reset */ + do_reset(NULL, 0, 0, NULL); #endif while (1) -- 2.30.2

4 5

[PATCH] arm: total_compute: Remap console logs
by Annam Sai Manisha 22 Mar '23

22 Mar '23

From: annsai01 <annam.saimanisha(a)arm.com> Remapping console logs from soc uart2 (s1 terminal) to css non-secure (uart_ap terminal) Change-Id: I554f3ab6eb8439c54f5568c47e48f1543ac67b44 Signed-off-by: Annam Sai Manisha <annam.saimanisha(a)arm.com> --- include/configs/total_compute.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h index 436bf622e1..a8bd8e259c 100644 --- a/include/configs/total_compute.h +++ b/include/configs/total_compute.h @@ -2,7 +2,7 @@ /* * Configuration for Total Compute platform. Parts were derived from other ARM * configurations. - * (C) Copyright 2020 Arm Limited + * (C) Copyright 2020-2023 Arm Limited * Usama Arif <usama.arif(a)arm.com> */ @@ -11,7 +11,8 @@ /* Link Definitions */ -#define UART0_BASE 0x7ff80000 +/* AP non-secure UART base address */ +#define UART0_BASE 0x2A400000 /* PL011 Serial Configuration */ #define CFG_PL011_CLOCK 7372800 -- 2.25.1

2 1

[PATCH] gitattributes: Treat .bin files as binary.
by Sebastian Andrzej Siewior 22 Mar '23

22 Mar '23

Binary files, which are committed to a private fork of this repository, will be subject to line feed substitution unless marked as binary. Mark .bin files as binary. Signed-off-by: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index d5931f03e7c74..7a7c416356028 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,7 @@ # Declare files that always have LF line endings on checkout * text eol=lf # Denote all files that are truly binary and should not be modified +*.bin binary *.bmp binary *.ttf binary *.gz binary -- 2.39.2

2 1

[PATCH] fs: ext4: check the minimal partition size to mount
by Patrick Delaunay 22 Mar '23

22 Mar '23

No need to mount a too small partition to handle a EXT4 file system. This patch add a test on partition size before to read the SUPERBLOCK_SIZE buffer and avoid error latter in fs_devread() function. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- This patch avoids traces when EFI try to detect FS type on one GPT partition with only one LBA (512 octetcs): fs_devread read outside partition 2 Failed to mount ext2 filesystem.. FyleSytem type is searched by efi_disk_create_part() / efi_fs_exists() Even if these traces are removed by commit f337fb9ea8b8 ("fs: Quieten down the filesystems more"), if think it should be good to avoid to read outside partition at the start of this function by a simple test. fs/ext4/ext4_common.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index f50de7c089e6..9a9c520e22ca 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -2373,6 +2373,10 @@ int ext4fs_mount(unsigned part_length) struct ext2_data *data; int status; struct ext_filesystem *fs = get_fs(); + + if (part_length < SUPERBLOCK_SIZE) + return 0; + data = zalloc(SUPERBLOCK_SIZE); if (!data) return 0; -- 2.25.1

2 1

[PATCH] README.mpc85xx-sd-spi-boot: Suggest the NXP boot format github repo
by Fabio Estevam 22 Mar '23

22 Mar '23

As explained in the text at the bottom of the page https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/boot-format: "QUIC repositories on this site will not receive any updates after March 31, 2022, and will be deleted on March 31, 2023." Point to the NXP boot format github repo instead. Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- doc/README.mpc85xx-sd-spi-boot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.mpc85xx-sd-spi-boot b/doc/README.mpc85xx-sd-spi-boot index 329de4e6c4..7608fc3aac 100644 --- a/doc/README.mpc85xx-sd-spi-boot +++ b/doc/README.mpc85xx-sd-spi-boot @@ -14,7 +14,7 @@ Where to get boot_format: ======================== you can browse it online at: -https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/boot-format +https://github.com/nxp-qoriq-yocto-sdk/boot-format Building ======== -- 2.25.1

5 9

[PATCH] configs: am62x_evm_a53_defconfig: Fix SF_DEFAULT_MODE
by Nikhil M Jain 22 Mar '23

22 Mar '23

Setting sf default mode to 0x3 breaks sf update when we do SF read through u-boot console. This issue arises when we do a splash image through OSPI flash media, to fix this set the default mode to 0x0. Fixes: 04150400c967 ("configs: enable OSPI related configs in AM62x") Signed-off-by: Nikhil M Jain <n-jain1(a)ti.com> --- configs/am62x_evm_a53_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/am62x_evm_a53_defconfig b/configs/am62x_evm_a53_defconfig index 1f490f08c9..0ad4fe9fec 100644 --- a/configs/am62x_evm_a53_defconfig +++ b/configs/am62x_evm_a53_defconfig @@ -72,7 +72,7 @@ CONFIG_MMC_SDHCI_ADMA=y CONFIG_SPL_MMC_SDHCI_ADMA=y CONFIG_MMC_SDHCI_AM654=y CONFIG_DM_SPI_FLASH=y -CONFIG_SF_DEFAULT_MODE=0x3 +CONFIG_SF_DEFAULT_MODE=0x0 CONFIG_SF_DEFAULT_SPEED=25000000 CONFIG_SPI_FLASH_SFDP_SUPPORT=y CONFIG_SPI_FLASH_SOFT_RESET=y -- 2.34.1

2 1