November 2021 - U-Boot

[PATCH] tools/mxsimage: Remove fclose on empty FILE pointer
by Mattias Hansson 19 Nov '21

19 Nov '21

If `sb_load_cmdfile()` fails to open the configuration file it will jump to error handling where the code will try to `fclose()` the FILE pointer which is NULL causing `mkimage` to segfault. This patch removes the `fclose()` since `fopen()` always returns NULL instead of the file descriptor when failing. --- tools/mxsimage.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/mxsimage.c b/tools/mxsimage.c index 002f4b525a..c7bd86ce52 100644 --- a/tools/mxsimage.c +++ b/tools/mxsimage.c @@ -1618,7 +1618,6 @@ static int sb_load_cmdfile(struct sb_image_ctx *ictx) return 0; err_file: - fclose(fp); fprintf(stderr, "ERR: Failed to load file \"%s\"\n", ictx->cfg_filename); return -EINVAL; -- 2.27.0

1 0

[RFC PATCH] imx8m: Drop env_get_location for imx8mn and imx8mp
by Michael Trimarchi 19 Nov '21

19 Nov '21

This function defined for two architecture is not really clean and can be generate problem when people add a new board Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> --- arch/arm/mach-imx/imx8m/soc.c | 42 ----------------------------------- 1 file changed, 42 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index e75d2fa255..83a515c973 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -1311,45 +1311,3 @@ void do_error(struct pt_regs *pt_regs, unsigned int esr) } #endif #endif - -#if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP) -enum env_location env_get_location(enum env_operation op, int prio) -{ - enum boot_device dev = get_boot_device(); - enum env_location env_loc = ENVL_UNKNOWN; - - if (prio) - return env_loc; - - switch (dev) { -#ifdef CONFIG_ENV_IS_IN_SPI_FLASH - case QSPI_BOOT: - env_loc = ENVL_SPI_FLASH; - break; -#endif -#ifdef CONFIG_ENV_IS_IN_NAND - case NAND_BOOT: - env_loc = ENVL_NAND; - break; -#endif -#ifdef CONFIG_ENV_IS_IN_MMC - case SD1_BOOT: - case SD2_BOOT: - case SD3_BOOT: - case MMC1_BOOT: - case MMC2_BOOT: - case MMC3_BOOT: - env_loc = ENVL_MMC; - break; -#endif - default: -#if defined(CONFIG_ENV_IS_NOWHERE) - env_loc = ENVL_NOWHERE; -#endif - break; - } - - return env_loc; -} - -#endif -- 2.25.1

3 3

[PATCH 00/14] Some more env fixes
by Marek Behún 19 Nov '21

19 Nov '21

From: Marek Behún <marek.behun(a)nic.cz> Hello Tom, Simon and others, here are some various fixes for env. More are to follow after this, the code is horrible and I want to implement something there. Marek Behún (14): env: sf: Cosmetic fix in env_sf_init_addr() env: sf: Use ENV_VALID enum names instead of literals env: sf: Put ENV_INVALID into gd->env_valid on CRC failure env: nand: Put ENV_INVALID into gd->env_valid if default environment env: nvram: Let generic env_init() assign default environment env: nvram: Cosmetic fix in env_nvram_init() env: nowhere: Let generic env_init() assign default environment env: nowhere: Cosmetic fix env: flash: Let generic env_init() assign default environment env: flash: Cosmetic fix board: synquacer: developerbox: Don't set gd->env_addr to default_environment board: freescale: various boards: Let env subsystem set gd->env_addr env: Always use char for default_environment env: Use static_assert() to check if default_environment is too large board/Marvell/mvebu_armada-37xx/board.c | 2 +- board/freescale/ls1012afrdm/ls1012afrdm.c | 4 ---- board/freescale/ls1012aqds/ls1012aqds.c | 4 ---- board/freescale/ls1012ardb/ls1012ardb.c | 4 ---- board/freescale/ls1028a/ls1028a.c | 4 ---- board/freescale/ls1088a/ls1088a.c | 4 ---- board/freescale/ls2080aqds/ls2080aqds.c | 3 --- board/freescale/ls2080ardb/ls2080ardb.c | 3 --- board/freescale/lx2160a/lx2160a.c | 3 --- board/socionext/developerbox/developerbox.c | 2 -- env/common.c | 11 +++-------- env/flash.c | 5 +---- env/nand.c | 3 +-- env/nowhere.c | 5 ++--- env/nvram.c | 7 +++---- env/sf.c | 7 +++---- include/env_default.h | 10 ++++++++-- include/env_internal.h | 4 ++-- 18 files changed, 24 insertions(+), 61 deletions(-) -- 2.32.0

4 46

[RESEND][PATCH] arm64: Add missing GD_FLG_SKIP_RELOC handling
by marek.vasut＠gmail.com 19 Nov '21

19 Nov '21

From: Marek Vasut <marek.vasut+renesas(a)gmail.com> In case U-Boot enters relocation with GD_FLG_SKIP_RELOC, skip the relocation. The code still has to set up new_gd pointer and new stack pointer. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- arch/arm/lib/crt0_64.S | 4 ++++ lib/asm-offsets.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index 680e674fa3..28c8356aee 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -104,6 +104,10 @@ ENTRY(_main) bic sp, x0, #0xf /* 16-byte alignment for ABI compliance */ ldr x18, [x18, #GD_NEW_GD] /* x18 <- gd->new_gd */ + /* Skip relocation in case gd->gd_flags & GD_FLG_SKIP_RELOC */ + ldr x0, [x18, #GD_FLAGS] /* x0 <- gd->flags */ + tbnz x0, 11, relocation_return /* GD_FLG_SKIP_RELOC is bit 11 */ + adr lr, relocation_return #if CONFIG_POSITION_INDEPENDENT /* Add in link-vs-runtime offset */ diff --git a/lib/asm-offsets.c b/lib/asm-offsets.c index c691066332..0808cd4b0c 100644 --- a/lib/asm-offsets.c +++ b/lib/asm-offsets.c @@ -29,6 +29,9 @@ int main(void) DEFINE(GD_SIZE, sizeof(struct global_data)); DEFINE(GD_BD, offsetof(struct global_data, bd)); + + DEFINE(GD_FLAGS, offsetof(struct global_data, flags)); + #if CONFIG_VAL(SYS_MALLOC_F_LEN) DEFINE(GD_MALLOC_BASE, offsetof(struct global_data, malloc_base)); #endif -- 2.33.0

2 1

[PATCH v3] lmb: Reserve U-Boot separately if relocation is disabled
by marek.vasut＠gmail.com 19 Nov '21

19 Nov '21

From: Marek Vasut <marek.vasut+renesas(a)gmail.com> In case U-Boot starts with GD_FLG_SKIP_RELOC, the U-Boot code is not relocated, however the stack and heap is at the end of DRAM after relocation. Reserve a LMB area for the non-relocated U-Boot code so it won't be overwritten. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- V2: Make this fully generic V3: Cast _start to uintptr_t first --- lib/lmb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/lmb.c b/lib/lmb.c index 676b3a0bda..f72996a424 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -13,6 +13,7 @@ #include <malloc.h> #include <asm/global_data.h> +#include <asm/sections.h> DECLARE_GLOBAL_DATA_PTR; @@ -144,6 +145,10 @@ void arch_lmb_reserve_generic(struct lmb *lmb, ulong sp, ulong end, ulong align) bank_end = end - 1; lmb_reserve(lmb, sp, bank_end - sp + 1); + + if (gd->flags & GD_FLG_SKIP_RELOC) + lmb_reserve(lmb, (phys_addr_t)(uintptr_t)_start, gd->mon_len); + break; } } -- 2.33.0

2 1

[PATCH v3] board_f: Copy GD to new GD even if relocation disabled
by marek.vasut＠gmail.com 19 Nov '21

19 Nov '21

From: Marek Vasut <marek.vasut+renesas(a)gmail.com> Even if U-Boot has relocation disabled via GD_FLG_SKIP_RELOC , the relocated stage of U-Boot still picks GD from new_gd location. The U-Boot itself is not relocated, but GD might be, so copy the GD to new GD location even if relocation is disabled. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Peng Fan <peng.fan(a)oss.nxp.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- V2: Deduplicate memcpy. The patch is better viewed with git show -w V3: Skip the gd->reloc_off = 0 assignment if reloc disabled --- common/board_f.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 3dc0eaa59c..f7ea7c7a1e 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -673,30 +673,32 @@ static int reloc_bloblist(void) static int setup_reloc(void) { - if (gd->flags & GD_FLG_SKIP_RELOC) { - debug("Skipping relocation due to flag\n"); - return 0; - } - + if (!(gd->flags & GD_FLG_SKIP_RELOC)) { #ifdef CONFIG_SYS_TEXT_BASE #ifdef ARM - gd->reloc_off = gd->relocaddr - (unsigned long)__image_copy_start; + gd->reloc_off = gd->relocaddr - (unsigned long)__image_copy_start; #elif defined(CONFIG_M68K) - /* - * On all ColdFire arch cpu, monitor code starts always - * just after the default vector table location, so at 0x400 - */ - gd->reloc_off = gd->relocaddr - (CONFIG_SYS_TEXT_BASE + 0x400); + /* + * On all ColdFire arch cpu, monitor code starts always + * just after the default vector table location, so at 0x400 + */ + gd->reloc_off = gd->relocaddr - (CONFIG_SYS_TEXT_BASE + 0x400); #elif !defined(CONFIG_SANDBOX) - gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE; + gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE; #endif #endif + } + memcpy(gd->new_gd, (char *)gd, sizeof(gd_t)); - debug("Relocation Offset is: %08lx\n", gd->reloc_off); - debug("Relocating to %08lx, new gd at %08lx, sp at %08lx\n", - gd->relocaddr, (ulong)map_to_sysmem(gd->new_gd), - gd->start_addr_sp); + if (gd->flags & GD_FLG_SKIP_RELOC) { + debug("Skipping relocation due to flag\n"); + } else { + debug("Relocation Offset is: %08lx\n", gd->reloc_off); + debug("Relocating to %08lx, new gd at %08lx, sp at %08lx\n", + gd->relocaddr, (ulong)map_to_sysmem(gd->new_gd), + gd->start_addr_sp); + } return 0; } -- 2.33.0

2 1

[PATCH v2] part: return -ENOSYS when get_info not valid.
by schspa 19 Nov '21

19 Nov '21

In some case, get_info() interface can be NULL, add this check to stop from crash. Signed-off-by: schspa <schspa(a)gmail.com> --- disk/part.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/disk/part.c b/disk/part.c index a6a8f7052b..f9b9b89861 100644 --- a/disk/part.c +++ b/disk/part.c @@ -668,6 +668,13 @@ int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name, part_drv = part_driver_lookup_type(dev_desc); if (!part_drv) return -1; + + if (!part_drv->get_info) { + log_debug("## Driver %s does not have the get_info() method\n", + part_drv->name); + return -ENOSYS; + } + for (i = 1; i < part_drv->max_entries; i++) { ret = part_drv->get_info(dev_desc, i, info); if (ret != 0) { -- 2.33.1

3 2

[BUG] firefly-rk3399 tpl/spl with optee from tag v2020.07 hangs on booting kernel
by Piotr Lobacz 18 Nov '21

18 Nov '21

Hi all, as in subject when using tpl/spl with u-boot master branch and atf/optee (atf v2.5 and optee 3.15.0) on firefly-rk3399 board causes hang out on booting the kernel. The problem does not persist with optee 3.7.0 and more over, with uboot <=v2020.04 and optee 3.15.0, the problem does not persist either. It gets stuck on: Starting kernel ... I/TC: Secondary CPU 1 initializing I/TC: Secondary CPU 1 switching to normal world boot I/TC: Secondary CPU 2 initializing I/TC: Secondary CPU 2 switching to normal world boot I/TC: Secondary CPU 3 initializing I/TC: Secondary CPU 3 switching to normal world boot I/TC: Secondary CPU 4 initializing I/TC: Secondary CPU 4 switching to normal world boot I/TC: Secondary CPU 5 initializing I/TC: Secondary CPU 5 switching to normal world boot Let me know how i could debug this issue. BR Piotr Lobacz [Softgent logo]<https://www.softgent.com> Softgent Sp. z o.o., Budowlanych 31d, 80-298 Gdansk, POLAND KRS: 0000674406, NIP: 9581679801, REGON: 367090912 www.softgent.com<https://www.softgent.com> Sąd Rejonowy Gdańsk-Północ w Gdańsku, VII Wydział Gospodarczy Krajowego Rejestru Sądowego KRS 0000674406, Kapitał zakładowy: 25 000,00 zł wpłacony w całości. Jesteśmy uczestnikiem Programu RZETELNA Firma Sprawdź naszą rzetelność na https://www.rzetelnafirma.pl/F5IA32UW

2 3

Re: [PATCH v4] lib: sparse: Make CHUNK_TYPE_RAW buffer aligned
by Sean Anderson 18 Nov '21

18 Nov '21

On 11/17/21 3:41 AM, qianfan wrote: > > 在 2021/11/16 23:05, Sean Anderson 写道: >> >> >> On 11/15/21 8:35 PM, qianfanguijin(a)qq.com wrote: >>> From: qianfan Zhao <qianfanguijin(a)163.com> >>> >>> CHUNK_TYPE_RAW buffer is not aligned, and flash sparse images by >>> fastboot will report "Misaligned operation" if DCACHE is enabled. >>> >>> Flashing Sparse Image >>> CACHE: Misaligned operation at range [84000028, 84001028] >>> CACHE: Misaligned operation at range [84001034, 84002034] >>> CACHE: Misaligned operation at range [8401104c, 8401304c] >>> >>> Fix it >>> >>> Signed-off-by: qianfan Zhao <qianfanguijin(a)163.com> >>> --- >>> lib/image-sparse.c | 69 ++++++++++++++++++++++++++++++++++++++++------ >>> 1 file changed, 61 insertions(+), 8 deletions(-) >>> >>> diff --git a/lib/image-sparse.c b/lib/image-sparse.c >>> index d80fdbbf58..5ec0f94ab3 100644 >>> --- a/lib/image-sparse.c >>> +++ b/lib/image-sparse.c >>> @@ -46,9 +46,66 @@ >>> #include <asm/cache.h> >>> #include <linux/math64.h> >>> +#include <linux/err.h> >>> static void default_log(const char *ignored, char *response) {} >>> +static lbaint_t write_sparse_chunk_raw(struct sparse_storage *info, >>> + lbaint_t blk, lbaint_t blkcnt, >>> + void *data, >>> + char *response) >>> +{ >>> + lbaint_t n = blkcnt, write_blks, blks = 0, aligned_buf_blks = 100; >>> + uint32_t *aligned_buf = NULL; >>> + >>> + if (CONFIG_IS_ENABLED(SYS_DCACHE_OFF)) { >>> + write_blks = info->write(info, blk, n, data); >>> + if (write_blks < n) >>> + goto write_fail; >>> + >>> + return write_blks; >>> + } >>> + >>> + aligned_buf = memalign(ARCH_DMA_MINALIGN, info->blksz * aligned_buf_blks); >>> + if (!aligned_buf) { >>> + info->mssg("Malloc failed for: CHUNK_TYPE_RAW", response); >>> + return -ENOMEM; >>> + } >>> + >>> + while (blkcnt > 0) { >>> + n = min(aligned_buf_blks, blkcnt); >>> + memcpy(aligned_buf, data, n * info->blksz); >>> + >>> + /* write_blks might be > n due to NAND bad-blocks */ >> >> nit: < > > This comment is misleading here, but it is actually correct. It is correct to write more that the specified number when nand flash bad blocks occur, so (write_blks >= n) is write successful. maybe rewrite the judge conditions like this is better? Ah, you are right. > if (!(write_blks >= n)) > >> >>> + write_blks = info->write(info, blk + blks, n, aligned_buf); >>> + if (write_blks < n) { >>> + free(aligned_buf); >>> + goto write_fail; >>> + } >>> + >>> + blks += write_blks; >>> + data += n * info->blksz; >>> + blkcnt -= n; >>> + } >>> + >>> + free(aligned_buf); >>> + return blks; >>> + >>> +write_fail: >> >> I think this label can be lower, but it does not affect correctness. > sorry, could you please explain this clear, I can't understand. >> >>> + if (IS_ERR_VALUE(write_blks)) { >>> + printf("%s: Write failed, block #" LBAFU " [" LBAFU "] (%lld)\n", >>> + __func__, blk + blks, n, (long long)write_blks); >>> + info->mssg("flash write failure", response); >>> + return write_blks; >>> + } The above label could be placed here, since you check the value of write_blks before jumping. --Sean >>> + /* write_blks < n */ >>> + printf("%s: Write failed, block #" LBAFU " [" LBAFU "]\n", >>> + __func__, blk + blks, n); >>> + info->mssg("flash write failure(incomplete)", response); >>> + return -1; >> >> -EIO? > It's OK >> >>> +} >>> + >>> int write_sparse_image(struct sparse_storage *info, >>> const char *part_name, void *data, char *response) >>> { >>> @@ -152,15 +209,11 @@ int write_sparse_image(struct sparse_storage *info, >>> return -1; >>> } >>> - blks = info->write(info, blk, blkcnt, data); >>> - /* blks might be > blkcnt (eg. NAND bad-blocks) */ >>> - if (blks < blkcnt) { >>> - printf("%s: %s" LBAFU " [" LBAFU "]\n", >>> - __func__, "Write failed, block #", >>> - blk, blks); >>> - info->mssg("flash write failure", response); >>> + blks = write_sparse_chunk_raw(info, blk, blkcnt, >>> + data, response); >>> + if (blks < 0) >>> return -1; >> >> ditto > It's OK >> >>> - } >>> + >>> blk += blks; >>> bytes_written += ((u64)blkcnt) * info->blksz; >>> total_blocks += chunk_header->chunk_sz; >>> >> >> Reviewed-by: Sean Anderson <sean.anderson(a)seco.com>

1 0

[PATCH v8 00/12] aspeed: Support secure boot chain with FIT image verification
by Chia-Wei Wang 18 Nov '21

18 Nov '21

This patch series intends to provide a secure boot chain from SPL to Linux kernel based on the hash and signature verification of FIT image paradigm. To improve the performance and save code size (SPL is limited to 64KB due to HW-RoT), the drviers of two HW crypto engine HACE and ACRY are also added for AST26xx SoCs. As HACE and ACRY can only access to DRAM space, additional configuration and boot command are also updated according to move each FIT image before its booting. In addition, the common code of FIT image hash algorithm lookup is also revised to leverage the HW accelerated calculation. v8: - include reviewers' tag - address comments suggested by Joel - move this patch series back to the master branch as DM_HASH has been merged v7: - fix missing interrupt status clear for ACRY RSA operation v6: - fix parameter comment for v5 update v5: - fix inconsistent parameter name due to parallel patch work v4: - add new DM_HASH based driver for Aspeed HACE - remove SPL board init, which was originally used to probe non-DM HACE driver - fix typo of ARCY to ACRY - refactor defconfig based on the new Kconfig of U-Boot next branch v3: - add SW work around for HACE HW DMA issue by resetting HACE - add reset control for HACE device tree node - sync all of the HACE error message to use debug() v2: - update commit authors Chia-Wei Wang (9): image: fit: Fix parameter name for hash algorithm aspeed: ast2600: Enlarge SRAM size clk: ast2600: Add RSACLK control for ACRY crypto: aspeed: Add AST2600 ACRY support ARM: dts: ast2600: Add ACRY to device tree ast2600: spl: Locate load buffer in DRAM space configs: ast2600-evb: Enable SPL FIT support configs: aspeed: Make EXTRA_ENV_SETTINGS board specific configs: ast2600: Boot kernel FIT in DRAM Joel Stanley (2): clk: ast2600: Add YCLK control for HACE ARM: dts: ast2600: Add HACE to device tree Johnny Huang (1): crypto: aspeed: Add AST2600 HACE support arch/arm/dts/ast2600-evb.dts | 10 + arch/arm/dts/ast2600.dtsi | 17 + arch/arm/include/asm/arch-aspeed/platform.h | 2 +- .../arm/include/asm/arch-aspeed/scu_ast2600.h | 6 +- arch/arm/mach-aspeed/ast2600/spl.c | 9 +- common/image-fit.c | 4 +- configs/evb-ast2600_defconfig | 22 +- drivers/clk/aspeed/clk_ast2600.c | 46 +++ drivers/crypto/Kconfig | 2 + drivers/crypto/Makefile | 1 + drivers/crypto/aspeed/Kconfig | 20 + drivers/crypto/aspeed/Makefile | 2 + drivers/crypto/aspeed/aspeed_acry.c | 190 +++++++++ drivers/crypto/aspeed/aspeed_hace.c | 381 ++++++++++++++++++ drivers/crypto/hash/Kconfig | 8 + include/configs/aspeed-common.h | 9 - include/configs/evb_ast2500.h | 7 + include/configs/evb_ast2600.h | 14 + lib/rsa/Kconfig | 10 +- 19 files changed, 733 insertions(+), 27 deletions(-) create mode 100644 drivers/crypto/aspeed/Kconfig create mode 100644 drivers/crypto/aspeed/Makefile create mode 100644 drivers/crypto/aspeed/aspeed_acry.c create mode 100644 drivers/crypto/aspeed/aspeed_hace.c -- 2.25.1

3 14