November 2023 - U-Boot

[PATCH 1/1] efi_loader: improve efi_var_from_file() description
by Heinrich Schuchardt 13 Nov '23

13 Nov '23

It is unclear to developers why efi_var_from_file() returns EFI_SUCCESS if file ubootefi.var is missing or corrupted. Improve the description. Reported-by: Weizhao Ouyang <o451686892(a)gmail.com> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_loader/efi_var_file.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c index 62e071bd83..dbf76f93de 100644 --- a/lib/efi_loader/efi_var_file.c +++ b/lib/efi_loader/efi_var_file.c @@ -204,8 +204,11 @@ efi_status_t efi_var_restore(struct efi_var_file *buf, bool safe) * File ubootefi.var is read from the EFI system partitions and the variables * stored in the file are created. * - * In case the file does not exist yet or a variable cannot be set EFI_SUCCESS - * is returned. + * On first boot the file ubootefi.var does not exist yet. This is if why we + * must return EFI_SUCCESS in this case. + * + * If the variable file is corrupted, e.g. incorrect CRC32, we do not want to + * stop the boot process. We deliberately return EFI_SUCCESS in this case, too. * * Return: status code */ -- 2.40.1

3 2

[PATCH v2] efi_loader: Fix UEFI error handling
by Weizhao Ouyang 13 Nov '23

13 Nov '23

Try to catch error the earlier way. Signed-off-by: Weizhao Ouyang <o451686892(a)gmail.com> --- Changes in v2: - Avoid to stop the boot process. lib/efi_loader/efi_var_file.c | 4 +++- lib/efi_loader/efi_variable.c | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c index 62e071bd83..fe1c462f17 100644 --- a/lib/efi_loader/efi_var_file.c +++ b/lib/efi_loader/efi_var_file.c @@ -192,8 +192,10 @@ efi_status_t efi_var_restore(struct efi_var_file *buf, bool safe) ret = efi_var_mem_ins(var->name, &var->guid, var->attr, var->length, data, 0, NULL, var->time); - if (ret != EFI_SUCCESS) + if (ret != EFI_SUCCESS) { log_err("Failed to set EFI variable %ls\n", var->name); + return ret; + } } return EFI_SUCCESS; } diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index be95ed44e6..2b2ca8c090 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -350,8 +350,6 @@ efi_status_t efi_set_variable_int(const u16 *variable_name, if (var_type == EFI_AUTH_VAR_PK) ret = efi_init_secure_state(); - else - ret = EFI_SUCCESS; /* * Write non-volatile EFI variables to file -- 2.39.2

1 0

[PATCH] efi_loader: Correctly account the SCRTM event creation
by Ilias Apalodimas 13 Nov '23

13 Nov '23

The result of efi_append_scrtm_version() is overwritten before anyone checks its result. Check it and exit the function on failures Addresses-Coverity-ID: 467399 Code maintainability issues (UNUSED_VALUE) Fixes: commit 97707f12fdab ("tpm: Support boot measurements") Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/efi_tcg2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index 2eaa12b83b16..463ea4c15416 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -944,8 +944,11 @@ static efi_status_t efi_init_event_log(void) * Add SCRTM version to the log if previous firmmware * doesn't pass an eventlog. */ - if (!elog.found) + if (!elog.found) { ret = efi_append_scrtm_version(dev); + if (ret != EFI_SUCCESS) + goto free_pool; + } ret = create_final_event(); if (ret != EFI_SUCCESS) -- 2.40.1

2 1

Pull request: u-boot-sunxi/master for 2024.01
by Andre Przywara 13 Nov '23

13 Nov '23

Hi Tom, please pull some more sunxi changes for this cycle: the first few patches are some easy refactorings and fixes, most of them actually don't change the generated binaries at all. Then there is a defconfig for a new board, for which we just gained the .dts file from the last kernel DT sync. On top there is support for a new PMIC (AXP313), and LPDDR4 support for the Allwinner H616 SoC, both of which are needed to support new devices that appeared lately, especially cheap TV boxes. While those are technically new features, they don't affect existing boards, for instance the LPDDR4 support code is guarded by a new DRAM type Kconfig variable. So the risk for regressions is very slim. Gitlab CI passed, and I booted that briefly on some boards, including an H616 and an H618 one (with LPDDR4). Thanks, Andre ========================================================= The following changes since commit da2e3196e4dc28298b58a018ace07f85eecd1652: Merge patch series "arm: dts: k3-am6: Fix Ethernet/DMA" (2023-11-10 15:25:47 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-sunxi.git master for you to fetch changes up to 4b02f0120a4bb2a5d7081aef8cef6a4ca57e9db2: sunxi: H616: add LPDDR4 DRAM support (2023-11-12 18:04:32 +0000) ---------------------------------------------------------------- Andre Przywara (4): sunxi: board: simplify early PMIC setup conditions power: pmic: sunxi: add AXP313 SPL driver power: regulator: add AXP313 support sunxi: H616: DRAM: refactor mctl_phy_configure_odt() Ludwig Kormann (1): arm: dts: icnova-a20-adb4006: Add board support Mikhail Kalashnikov (1): sunxi: H616: add LPDDR4 DRAM support Samuel Holland (5): net: sun8i_emac: Drop DM_GPIO checks sunxi: mmc: Move header to the driver directory clk: sunxi: Use the right symbol in the Makefile sunxi: mmc: Sort compatible strings numerically pinctrl: sunxi: Avoid using .bss for SPL Tom Rini (1): arm: sunxi: Correct warning in board_fit_config_name_match arch/arm/dts/Makefile | 1 + arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h | 2 + arch/arm/include/asm/arch-sunxi/mmc.h | 139 +--------- arch/arm/mach-sunxi/Kconfig | 17 ++ arch/arm/mach-sunxi/dram_sun50i_h616.c | 294 +++++++++++++++------ arch/arm/mach-sunxi/dram_timings/Makefile | 1 + .../arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c | 95 +++++++ arch/arm/mach-sunxi/pmic_bus.c | 3 + board/sunxi/MAINTAINERS | 5 + board/sunxi/board.c | 38 ++- configs/icnova-a20-adb4006_defconfig | 21 ++ drivers/clk/Makefile | 2 +- drivers/mmc/sunxi_mmc.c | 6 +- drivers/mmc/sunxi_mmc.h | 138 ++++++++++ drivers/net/sun8i_emac.c | 10 - drivers/pinctrl/sunxi/pinctrl-sunxi.c | 2 +- drivers/power/Kconfig | 19 +- drivers/power/Makefile | 1 + drivers/power/axp313.c | 134 ++++++++++ drivers/power/pmic/axp.c | 1 + drivers/power/regulator/axp_regulator.c | 17 ++ include/axp_pmic.h | 1 + 22 files changed, 688 insertions(+), 259 deletions(-) create mode 100644 arch/arm/mach-sunxi/dram_timings/h616_lpddr4_2133.c create mode 100644 configs/icnova-a20-adb4006_defconfig create mode 100644 drivers/mmc/sunxi_mmc.h create mode 100644 drivers/power/axp313.c

2 1

[PATCH] usb: gadget: f_mass_storage: Stop ums on START-STOP UNIT SCSI command
by Marek Vasut 13 Nov '23

13 Nov '23

Exit the UMS handler loop in case START-STOP UNIT SCSI command is received. This is sent e.g. by the util-linux eject(1) command and indicates to the device that it is supposed to spin down the media and enter low power state. This effectively adds support for exitting the 'ums' command from host using 'eject /dev/sdN' that is on par with 'dfu-util -e' . Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Lukasz Majewski <lukma(a)denx.de> Cc: Mattijs Korpershoek <mkorpershoek(a)baylibre.com> --- drivers/usb/gadget/f_mass_storage.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index 1d17331cb03..c725aed3f62 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -327,6 +327,7 @@ struct fsg_common { unsigned int short_packet_received:1; unsigned int bad_lun_okay:1; unsigned int running:1; + unsigned int eject:1; int thread_wakeup_needed; struct completion thread_notifier; @@ -669,6 +670,10 @@ static int sleep_thread(struct fsg_common *common) } if (k == 10) { + /* Handle START-STOP UNIT */ + if (common->eject) + return -EPIPE; + /* Handle CTRL+C */ if (ctrlc()) return -EPIPE; @@ -1325,6 +1330,8 @@ static int do_start_stop(struct fsg_common *common) return -EINVAL; } + common->eject = 1; + return 0; } -- 2.42.0

2 2

[PATCH] mtd: nand: check nand_mtd_to_devnum() argument
by Dario Binacchi 13 Nov '23

13 Nov '23

If the "mtd" parameter is NULL, the search will definitely yield a negative result. In that case, it's better to exit immediately. Signed-off-by: Dario Binacchi <dario.binacchi(a)amarulasolutions.com> --- drivers/mtd/nand/raw/nand.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/nand.c b/drivers/mtd/nand/raw/nand.c index eacd99c4e275..55c00ac815dd 100644 --- a/drivers/mtd/nand/raw/nand.c +++ b/drivers/mtd/nand/raw/nand.c @@ -41,8 +41,11 @@ int nand_mtd_to_devnum(struct mtd_info *mtd) { int i; + if (!mtd) + return -ENODEV; + for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) { - if (mtd && get_nand_dev_by_index(i) == mtd) + if (get_nand_dev_by_index(i) == mtd) return i; } -- 2.42.0

2 1

[PATCH] mtd: nand: complete nand_register() arguments check
by Dario Binacchi 13 Nov '23

13 Nov '23

The patch checks that the "mtd" parameter is accessible before proceeding. Signed-off-by: Dario Binacchi <dario.binacchi(a)amarulasolutions.com> --- drivers/mtd/nand/raw/nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/nand.c b/drivers/mtd/nand/raw/nand.c index eacd99c4e275..d31bb580c46a 100644 --- a/drivers/mtd/nand/raw/nand.c +++ b/drivers/mtd/nand/raw/nand.c @@ -52,7 +52,7 @@ int nand_mtd_to_devnum(struct mtd_info *mtd) /* Register an initialized NAND mtd device with the U-Boot NAND command. */ int nand_register(int devnum, struct mtd_info *mtd) { - if (devnum >= CONFIG_SYS_MAX_NAND_DEVICE) + if (!mtd || devnum >= CONFIG_SYS_MAX_NAND_DEVICE) return -EINVAL; nand_info[devnum] = mtd; -- 2.42.0

2 1

[PATCH] sandbox: Fix VPL instructions
by Simon Glass 13 Nov '23

13 Nov '23

Fix the devicetree used with sandbox. This is needed because the default (full) devicetree must be used by all phases of boot, with sandbox. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- doc/arch/sandbox/sandbox.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/arch/sandbox/sandbox.rst b/doc/arch/sandbox/sandbox.rst index 23902dee89e7..9c69dea81ed1 100644 --- a/doc/arch/sandbox/sandbox.rst +++ b/doc/arch/sandbox/sandbox.rst @@ -427,7 +427,7 @@ VPL (Verifying Program Loader) Sandbox provides an example build of vpl called `sandbox_vpl`. This can be run using:: - /path/to/sandbox_vpl/tpl/u-boot-tpl -D + /path/to/sandbox_vpl/tpl/u-boot-tpl -d /tmp/b/sandbox_vpl/u-boot.dtb It starts up TPL (first-stage init), then VPL, then runs SPL and finally U-Boot proper, following the normal flow for a verified boot. At present, no -- 2.42.0.869.gea05f2083d-goog

2 1

[PATCH] efi_loader: Increase default variable store size to 128K
by Ilias Apalodimas 13 Nov '23

13 Nov '23

In commit 9fd3f881c6ed ("efi_loader: Increase default variable store size to 64KiB") Alper has a detailed explanation of why the size needs to be bumped to at least 64K. However enabling Secure boot, writing db, KEK, PK etc keys will further increase the size so bump it to 128K. It's worth noting that when U-Boot stores the EFI variables in an RPMB the available storage is defined statically in StandAloneMM at build time. The U-Boot code is detecting the available true size on the fly during writes. When StandAloneMM is present this size defines the reserved memory U-Boot can use to copy any runtime variables, before booting an OS. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/efi_loader/Kconfig | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 4ccd26f94a93..0d024911b42e 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -133,18 +133,20 @@ endif config EFI_VAR_BUF_SIZE int "Memory size of the UEFI variable store" - default 16384 if EFI_MM_COMM_TEE - default 65536 + default 131072 range 4096 2147483647 help This defines the size in bytes of the memory area reserved for keeping UEFI variables. - When using StandAloneMM (CONFIG_EFI_MM_COMM_TEE=y) this value should - match the value of PcdFlashNvStorageVariableSize used to compile the - StandAloneMM module. + When using StandAloneMM (CONFIG_EFI_MM_COMM_TEE=y) is used the + available size for storing variables is defined in + PcdFlashNvStorageVariableSize. + That value is probed at runtime from U-Boot. In that case, + EFI_VAR_BUF_SIZE represents the memory U-Boot reserves to present + runtime variables to the OS. - Minimum 4096, default 65536, or 16384 when using StandAloneMM. + Minimum 4096, default 131072 config EFI_GET_TIME bool "GetTime() runtime service" -- 2.40.1

2 1

[PATCH 1/1] acpi: cannot have RSDT above 4 GiB
by Heinrich Schuchardt 12 Nov '23

12 Nov '23

The field RsdtAddress has only 32 bit. The RSDT table cannot be located beyond 4 GiB. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/acpi/base.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/lib/acpi/base.c b/lib/acpi/base.c index 2057bd2bef..128a76ad39 100644 --- a/lib/acpi/base.c +++ b/lib/acpi/base.c @@ -21,10 +21,17 @@ void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt, memcpy(rsdp->signature, RSDP_SIG, 8); memcpy(rsdp->oem_id, OEM_ID, 6); - rsdp->length = sizeof(struct acpi_rsdp); - rsdp->rsdt_address = map_to_sysmem(rsdt); + if (rsdt) + rsdp->rsdt_address = map_to_sysmem(rsdt); + else + rsdp->rsdt_address = 0; + + if (xsdt) + rsdp->xsdt_address = map_to_sysmem(xsdt); + else + rsdp->xsdt_address = 0; - rsdp->xsdt_address = map_to_sysmem(xsdt); + rsdp->length = sizeof(struct acpi_rsdp); rsdp->revision = ACPI_RSDP_REV_ACPI_2_0; /* Calculate checksums */ @@ -68,11 +75,15 @@ static void acpi_write_xsdt(struct acpi_xsdt *xsdt) static int acpi_write_base(struct acpi_ctx *ctx, const struct acpi_writer *entry) { - /* We need at least an RSDP and an RSDT Table */ + /* We need at least an RSDP and an XSDT Table */ ctx->rsdp = ctx->current; acpi_inc_align(ctx, sizeof(struct acpi_rsdp)); - ctx->rsdt = ctx->current; - acpi_inc_align(ctx, sizeof(struct acpi_rsdt)); + if (map_to_sysmem(ctx->current) < UINT_MAX - 0x10000) { + ctx->rsdt = ctx->current; + acpi_inc_align(ctx, sizeof(struct acpi_rsdt)); + } else { + ctx->rsdt = 0; + } ctx->xsdt = ctx->current; acpi_inc_align(ctx, sizeof(struct acpi_xsdt)); @@ -80,7 +91,8 @@ static int acpi_write_base(struct acpi_ctx *ctx, memset(ctx->base, '\0', ctx->current - ctx->base); acpi_write_rsdp(ctx->rsdp, ctx->rsdt, ctx->xsdt); - acpi_write_rsdt(ctx->rsdt); + if (ctx->rsdt) + acpi_write_rsdt(ctx->rsdt); acpi_write_xsdt(ctx->xsdt); return 0; -- 2.40.1

2 3