July 2020 - U-Boot

[PATCH] watchdog: imx: Support set timeout by wdt command
by Mo, Yuezhang 16 Jul '20

16 Jul '20

After "4b969deac0 watchdog: imx: Add DM support", the imx watchdog can be started by wdt command. But the imx watchdog driver only support start with the default timeout. This commit adds the support for setting the timeout which pass from the wdt command into the imx watchdog. If the timeout out of the valid range(0.5~128s), start the watchdog with a timeout within the valid range and the timeout is the one which closest to the passed timeout. Signed-off-by: Yuezhang.Mo <yuezhang.mo(a)sony.com> Reviewed-by: Andy.Wu <Andy.Wu(a)sony.com> --- drivers/watchdog/imx_watchdog.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/imx_watchdog.c b/drivers/watchdog/imx_watchdog.c index 01762df019..b90c2daece 100644 --- a/drivers/watchdog/imx_watchdog.c +++ b/drivers/watchdog/imx_watchdog.c @@ -16,6 +16,10 @@ #include <asm/arch/immap_lsch2.h> #endif #include <fsl_wdog.h> +#include <div64.h> + +#define TIMEOUT_MAX 128000 +#define TIMEOUT_MIN 500 static void imx_watchdog_expire_now(struct watchdog_regs *wdog, bool ext_reset) { @@ -57,9 +61,9 @@ static void imx_watchdog_reset(struct watchdog_regs *wdog) #endif /* CONFIG_WATCHDOG_RESET_DISABLE*/ } -static void imx_watchdog_init(struct watchdog_regs *wdog, bool ext_reset) +static void imx_watchdog_init(struct watchdog_regs *wdog, bool ext_reset, + u64 timeout) { - u16 timeout; u16 wcr; /* @@ -70,7 +74,11 @@ static void imx_watchdog_init(struct watchdog_regs *wdog, bool ext_reset) #ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS #define CONFIG_WATCHDOG_TIMEOUT_MSECS 128000 #endif - timeout = (CONFIG_WATCHDOG_TIMEOUT_MSECS / 500) - 1; + + timeout = max_t(u64, timeout, TIMEOUT_MIN); + timeout = min_t(u64, timeout, TIMEOUT_MAX); + timeout = lldiv(timeout, 500) - 1; + #ifdef CONFIG_FSL_LSCH2 wcr = (WCR_WDA | WCR_SRS | WCR_WDE) << 8 | timeout; #else @@ -95,7 +103,7 @@ void hw_watchdog_init(void) { struct watchdog_regs *wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR; - imx_watchdog_init(wdog, true); + imx_watchdog_init(wdog, true, CONFIG_WATCHDOG_TIMEOUT_MSECS); } #else struct imx_wdt_priv { @@ -126,7 +134,7 @@ static int imx_wdt_start(struct udevice *dev, u64 timeout, ulong flags) { struct imx_wdt_priv *priv = dev_get_priv(dev); - imx_watchdog_init(priv->base, priv->ext_reset); + imx_watchdog_init(priv->base, priv->ext_reset, timeout); return 0; } -- 2.17.1

2 1

Re: [PATCH] azure: gitlab: travis: Update OpenSBI used for RISC-V testing
by Rick Chen 16 Jul '20

16 Jul '20

Hi Bin > From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Tom Rini > Sent: Tuesday, July 07, 2020 10:13 PM > To: Bin Meng > Cc: U-Boot Mailing List; Bin Meng > Subject: Re: [PATCH] azure: gitlab: travis: Update OpenSBI used for RISC-V testing > > On Sat, Jun 27, 2020 at 05:21:04AM -0700, Bin Meng wrote: > > > From: Bin Meng <bin.meng(a)windriver.com> > > > > Change to use OpenSBI release v0.8 generic platform images for QEMU > > RISC-V CI testing for azure, gitlab and travis-ci. > > > > Signed-off-by: Bin Meng <bin.meng(a)windriver.com> > > Reviewed-by: Tom Rini <trini(a)konsulko.com> > I am trying to apply this patch, but it fail Applying: azure: gitlab: travis: Update OpenSBI used for RISC-V testing error: patch failed: .azure-pipelines.yml:283 error: .azure-pipelines.yml: patch does not apply error: patch failed: .gitlab-ci.yml:25 error: .gitlab-ci.yml: patch does not apply Patch failed at 0001 azure: gitlab: travis: Update OpenSBI used for RISC-V testing Can you rebase again ? Thanks, Rick

2 1

[PATCH 0/4] Add support for the SquashFS filesystem
by Joao Marcos Costa 16 Jul '20

16 Jul '20

Hello! This series adds support for the SquashFS filesystem. For now, zlib is the only supported compression type. This is my first contribution to U-Boot as well as to a major Open Source project. Best regards, Joao Marcos Costa Joao Marcos Costa (4): fs/squashfs: new filesystem fs/squashfs: add filesystem commands fs/squashfs: add sources for zlib decompression fs/squashfs: add support for zlib decompression cmd/Kconfig | 6 + cmd/Makefile | 1 + cmd/sqfs.c | 43 + common/spl/Kconfig | 9 + fs/Kconfig | 2 + fs/Makefile | 2 + fs/fs.c | 15 + fs/squashfs/Kconfig | 10 + fs/squashfs/Makefile | 7 + fs/squashfs/sqfs.c | 1625 +++++++++++++++++++++++++++++++ fs/squashfs/sqfs_decompressor.c | 53 + fs/squashfs/sqfs_decompressor.h | 58 ++ fs/squashfs/sqfs_dir.c | 107 ++ fs/squashfs/sqfs_filesystem.h | 301 ++++++ fs/squashfs/sqfs_inode.c | 142 +++ fs/squashfs/sqfs_utils.h | 49 + include/fs.h | 13 + include/squashfs.h | 24 + include/u-boot/zlib.h | 32 + lib/zlib/uncompr.c | 93 ++ lib/zlib/zlib.c | 1 + 21 files changed, 2593 insertions(+) create mode 100644 cmd/sqfs.c create mode 100644 fs/squashfs/Kconfig create mode 100644 fs/squashfs/Makefile create mode 100644 fs/squashfs/sqfs.c create mode 100644 fs/squashfs/sqfs_decompressor.c create mode 100644 fs/squashfs/sqfs_decompressor.h create mode 100644 fs/squashfs/sqfs_dir.c create mode 100644 fs/squashfs/sqfs_filesystem.h create mode 100644 fs/squashfs/sqfs_inode.c create mode 100644 fs/squashfs/sqfs_utils.h create mode 100644 include/squashfs.h create mode 100644 lib/zlib/uncompr.c -- 2.17.1

4 19

[PATCH for v2020.10 1/1] cmd: drop fitupd command
by Heinrich Schuchardt 16 Jul '20

16 Jul '20

The `fitupd' command is not used by any board. The `dfu tftp' command provides the same capabilities. So let's drop the `fitupd' command. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/Kconfig | 7 ------- cmd/Makefile | 1 - cmd/fitupd.c | 30 ------------------------------ doc/README.dfutftp | 2 -- doc/README.update | 5 ----- 5 files changed, 45 deletions(-) delete mode 100644 cmd/fitupd.c diff --git a/cmd/Kconfig b/cmd/Kconfig index 192b3b262f..8c0204c32c 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -489,13 +489,6 @@ config CMD_SPL_WRITE_SIZE flash used by Falcon-mode boot. See the documentation until CMD_SPL for detail. -config CMD_FITUPD - bool "fitImage update command" - depends on UPDATE_TFTP - help - Implements the 'fitupd' command, which allows to automatically - store software updates present on a TFTP server in NOR Flash - config CMD_THOR_DOWNLOAD bool "thor - TIZEN 'thor' download" select DFU diff --git a/cmd/Makefile b/cmd/Makefile index 974ad48b0a..dd7a00482b 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -61,7 +61,6 @@ obj-$(CONFIG_CMD_EXT4) += ext4.o obj-$(CONFIG_CMD_EXT2) += ext2.o obj-$(CONFIG_CMD_FAT) += fat.o obj-$(CONFIG_CMD_FDT) += fdt.o -obj-$(CONFIG_CMD_FITUPD) += fitupd.o obj-$(CONFIG_CMD_FLASH) += flash.o obj-$(CONFIG_CMD_FPGA) += fpga.o obj-$(CONFIG_CMD_FPGAD) += fpgad.o diff --git a/cmd/fitupd.c b/cmd/fitupd.c deleted file mode 100644 index 0f490c58fc..0000000000 --- a/cmd/fitupd.c +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2011 - * Andreas Pretzsch, carpe noctem engineering, apr(a)cn-eng.de - */ - -#include <common.h> -#include <command.h> -#include <net.h> - -static int do_fitupd(struct cmd_tbl *cmdtp, int flag, int argc, - char *const argv[]) -{ - ulong addr = 0UL; - - if (argc > 2) - return CMD_RET_USAGE; - - if (argc == 2) - addr = simple_strtoul(argv[1], NULL, 16); - - return update_tftp(addr, NULL, NULL); -} - -U_BOOT_CMD(fitupd, 2, 0, do_fitupd, - "update from FIT image", - "[addr]\n" - "\t- run update from FIT image at addr\n" - "\t or from tftp 'updatefile'" -); diff --git a/doc/README.dfutftp b/doc/README.dfutftp index 127d2d6abc..a3341bbb61 100644 --- a/doc/README.dfutftp +++ b/doc/README.dfutftp @@ -42,8 +42,6 @@ for USB based DFU (CONFIG_DFU_*) and DFU TFTP update The "dfu" command has been extended to support transfer via TFTP - one needs to type for example "dfu tftp 0 mmc 0" -This feature does not depend on "fitupd" command enabled. - As of this writing (SHA1:8d77576371381ade83de475bb639949b44941e8c v2015.10-rc2) the update.c code is not enabled (CONFIG_UPDATE_TFTP) by any board in the contemporary u-boot tree. diff --git a/doc/README.update b/doc/README.update index d37f2c4d4a..bf4379279e 100644 --- a/doc/README.update +++ b/doc/README.update @@ -51,11 +51,6 @@ the mkimage tool. dtc tool with support for binary includes, e.g. in version to be prepared. Refer to the doc/uImage.FIT/ directory for more details on FIT images. -This mechanism can be also triggered by the command "fitupd". -If an optional, non-zero address is provided as argument, the TFTP transfer -is skipped and the image at this address is used. -The fitupd command is enabled by CONFIG_CMD_FITUPD. - Example .its files ------------------ -- 2.27.0

3 3

Re: [PATCH 1/2] Revert "riscv: Allow use of reset drivers"
by Rick Chen 16 Jul '20

16 Jul '20

Hi Bin > From: Bin Meng [mailto:bmeng.cn@gmail.com] > Sent: Thursday, July 16, 2020 9:36 AM > To: Sean Anderson > Cc: Rick Jian-Zhi Chen(陳建志); Tom Rini; U-Boot Mailing List; Bin Meng > Subject: Re: [PATCH 1/2] Revert "riscv: Allow use of reset drivers" > > Hi Rick, > > On Wed, Jul 8, 2020 at 3:04 PM Sean Anderson <seanga2(a)gmail.com> wrote: > > > > On 7/8/20 2:44 AM, Bin Meng wrote: > > > From: Bin Meng <bin.meng(a)windriver.com> > > > > > > This reverts commit 958a3f464c7f8ef7e10db9feb663e9e80445ce2f. > > > > > > A more appropriate change below is already in mainline. > > > Commit fd31e4fd184f ("riscv: Do not build reset.c if SYSRESET is > > > on") > > > > > > Revert this patch, so that U-Boot can be built successfully for > > > SiFive Fu540 board. > > > > > > Signed-off-by: Bin Meng <bin.meng(a)windriver.com> > > > --- > > > > > > arch/riscv/lib/reset.c | 2 -- > > > 1 file changed, 2 deletions(-) > > > > > > diff --git a/arch/riscv/lib/reset.c b/arch/riscv/lib/reset.c index > > > 6008bbe..8779c61 100644 > > > --- a/arch/riscv/lib/reset.c > > > +++ b/arch/riscv/lib/reset.c > > > @@ -7,7 +7,6 @@ > > > #include <command.h> > > > #include <hang.h> > > > > > > -#ifndef CONFIG_SYSRESET > > > int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const > > > argv[]) { > > > printf("resetting ...\n"); > > > @@ -17,4 +16,3 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int > > > argc, char *const argv[]) > > > > > > return 0; > > > } > > > -#endif > > > > > > > Reviewed-by: Sean Anderson <seanga2(a)gmail.com> > > Could we get this series applied soon? thanks! > OK. But [PATCH 2/2] Revert "Revert "riscv: sifive: fu540: Add gpio-restart support"" seem conflict with Pragnesh's [PATCH 2/2] riscv: sifive: fu540: Enable SiFive PWM driver. Would you please rebase with u-boot-riscv/master and send again ? Thanks, Rick > Regards, > Bin

2 1

[PATCH v2 0/5] mips: Improve initial Octeon MIPS64 support
by Stefan Roese 16 Jul '20

16 Jul '20

This patchset improves the Octeon base support by adding a very early copy of the U-Boot image from bootspace (e.g. parallel NOR CFI flash) to the L2 cache and continue execution there. This is done by introducing the optional hook mips_mach_early_init() to start.S for very early machine specific code. This code can be selected via the new Kconfig symbol CONFIG_MIPS_MACH_EARLY_INIT. Additionally, the common invalidate_dcache_range() implementation is also changed to a weak function allowing Octeon to adds its own no-op cache function (Octeon is cache coherent). This patchset is based on the base Octeon patchsert in v4. Thanks, Stefan Changes in v2: - Change mips_mach_early_init() as suggested by Daniel to make it easier to understand and smaller - Drop CONFIG_BOARD_SIZE_LIMIT Stefan Roese (5): mips: Add CONFIG_MIPS_MACH_EARLY_INIT for very early mach init code mips: octeon: use mips_mach_early_init() to copy to L2 cache mips: octeon: octeon_ebb7304: Change TEXT_BASE to L2 cache mips: cache: Make invalidate_dcache_range() weak to enable overwrite mips: octeon: Add empty invalidate_dcache_range() arch/mips/Kconfig | 10 ++++++ arch/mips/cpu/start.S | 5 +++ arch/mips/lib/cache.c | 2 +- arch/mips/mach-octeon/cache.c | 4 +++ arch/mips/mach-octeon/lowlevel_init.S | 50 +++++++++++++++++++++++++++ configs/octeon_ebb7304_defconfig | 3 +- 6 files changed, 72 insertions(+), 2 deletions(-) -- 2.27.0

2 7

[PATCH 0/4] MIPS: sync asm header files with Linux 5.7 (part 1)
by Daniel Schwierzeck 16 Jul '20

16 Jul '20

This is the first part of syncing the MIPS asm header files with Linux 5.7 to get the latest features for newer MIPS cores and MIPS architectures. This also prepares for the upcoming Octeon MIPS64 support. Daniel Schwierzeck (4): mips: remove deprecated UNCACHED_SDRAM() macro mips: sync asm/asm.h with Linux 5.7 mips: sync asm/addrspace.h with Linux 5.7 mips: sync asm/mipsregs.h with Linux 5.7 arch/mips/cpu/start.S | 2 +- arch/mips/include/asm/addrspace.h | 27 +- arch/mips/include/asm/asm.h | 130 +--- arch/mips/include/asm/compiler.h | 69 ++ arch/mips/include/asm/isa-rev.h | 24 + arch/mips/include/asm/mipsregs.h | 1202 ++++++++++++++++++++++++----- arch/mips/lib/bootm.c | 4 +- arch/mips/lib/traps.c | 2 +- 8 files changed, 1117 insertions(+), 343 deletions(-) create mode 100644 arch/mips/include/asm/compiler.h create mode 100644 arch/mips/include/asm/isa-rev.h -- 2.27.0

2 8

[PATCH 0/4] MIPS: refactor and cleanup start.S (part 1)
by Daniel Schwierzeck 16 Jul '20

16 Jul '20

This is the first part of upcoming refactorings in start.S to cleanup the multiple and hard-to-follow code flows as well as adding more extension points required for modern and complex multi-core SoC's. The first parts concentrates on caches. Daniel Schwierzeck (4): mips: start.S: remove dead code mips: add KSEG1 wrapper for change_k0_cca mips: refactor disabling of caches mips: add config options for generic cache setup code arch/mips/Kconfig | 24 ++++++++++++++++++++++++ arch/mips/cpu/start.S | 24 +++++++++--------------- arch/mips/lib/cache_init.S | 38 ++++++++++++++++++++++++-------------- 3 files changed, 57 insertions(+), 29 deletions(-) -- 2.27.0

2 8

[PATCH 1/1] efi_loader: pre-seed UEFI variables
by Heinrich Schuchardt 16 Jul '20

16 Jul '20

Include a file with the initial values for non-volatile UEFI variables into the U-Boot binary. If this variable is set, changes to variable PK will not be allowed. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/asm-generic/sections.h | 2 ++ include/efi_variable.h | 8 ++++++++ lib/efi_loader/Kconfig | 23 +++++++++++++++++++++++ lib/efi_loader/Makefile | 6 +++++- lib/efi_loader/efi_var_file.c | 8 +------- lib/efi_loader/efi_var_seed.S | 17 +++++++++++++++++ lib/efi_loader/efi_variable.c | 19 +++++++++++++++++-- 7 files changed, 73 insertions(+), 10 deletions(-) create mode 100644 lib/efi_loader/efi_var_seed.S diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h index 17a31ec788..0577238d60 100644 --- a/include/asm-generic/sections.h +++ b/include/asm-generic/sections.h @@ -25,6 +25,8 @@ extern char __initdata_begin[], __initdata_end[]; extern char __start_rodata[], __end_rodata[]; extern char __efi_helloworld_begin[]; extern char __efi_helloworld_end[]; +extern char __efi_var_file_begin[]; +extern char __efi_var_file_end[]; /* Start and end of .ctors section - used for constructor calls. */ extern char __ctors_start[], __ctors_end[]; diff --git a/include/efi_variable.h b/include/efi_variable.h index 021a74f309..17f25ad7a4 100644 --- a/include/efi_variable.h +++ b/include/efi_variable.h @@ -138,6 +138,14 @@ struct efi_var_file { */ efi_status_t efi_var_to_file(void); +/** + * efi_var_restore() - restore EFI variables from buffer + * + * @buf: buffer + * Return: status code + */ +efi_status_t efi_var_restore(struct efi_var_file *buf); + /** * efi_var_from_file() - read variables from file * diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 8827c76cc9..6017ffe9a6 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -50,6 +50,29 @@ config EFI_MM_COMM_TEE endchoice +config EFI_VARIABLES_PRESEED + bool "Initial values for UEFI variables" + depends on EFI_VARIABLE_FILE_STORE + help + Include a file with the initial values for non-volatile UEFI variables + into the U-Boot binary. If this configuration option is set, changes + to authentication related variables (PK, KEK, db, dbx) are not + allowed. + +if EFI_VARIABLES_PRESEED + +config EFI_VAR_SEED_FILE + string "File with initial values of non-volatile UEFI variables" + default ubootefi.var + help + File with initial values of non-volatile UEFI variables. The file must + be in the same format as the storage in the EFI system partition. The + easiest way to create it is by setting the non-volatile variables in + U-Boot. If a relative file path is used, it is relative to the source + directory. + +endif + config EFI_GET_TIME bool "GetTime() runtime service" depends on DM_RTC diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index f81ec8d277..441ac9432e 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -6,7 +6,7 @@ # This file only gets included with CONFIG_EFI_LOADER set, so all # object inclusion implicitly depends on it -asflags-y += -DHOST_ARCH="$(HOST_ARCH)" +asflags-y += -DHOST_ARCH="$(HOST_ARCH)" -I. ccflags-y += -DHOST_ARCH="$(HOST_ARCH)" CFLAGS_efi_boottime.o += \ @@ -42,6 +42,7 @@ obj-y += efi_variable_tee.o else obj-y += efi_variable.o obj-y += efi_var_file.o +obj-$(CONFIG_EFI_VARIABLES_PRESEED) += efi_var_seed.o endif obj-y += efi_watchdog.o obj-$(CONFIG_LCD) += efi_gop.o @@ -53,3 +54,6 @@ obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += efi_smbios.o obj-$(CONFIG_EFI_RNG_PROTOCOL) += efi_rng.o obj-$(CONFIG_EFI_LOAD_FILE2_INITRD) += efi_load_initrd.o obj-y += efi_signature.o + +EFI_VAR_SEED_FILE := $(subst $\",,$(CONFIG_EFI_VAR_SEED_FILE)) +$(obj)/efi_var_seed.o: $(srctree)/$(EFI_VAR_SEED_FILE) diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c index 880c279aef..6f9d76f2a2 100644 --- a/lib/efi_loader/efi_var_file.c +++ b/lib/efi_loader/efi_var_file.c @@ -159,13 +159,7 @@ error: #endif } -/** - * efi_var_restore() - restore EFI variables from buffer - * - * @buf: buffer - * Return: status code - */ -static efi_status_t __maybe_unused efi_var_restore(struct efi_var_file *buf) +efi_status_t efi_var_restore(struct efi_var_file *buf) { struct efi_var_entry *var, *last_var; efi_status_t ret; diff --git a/lib/efi_loader/efi_var_seed.S b/lib/efi_loader/efi_var_seed.S new file mode 100644 index 0000000000..e0a40cf46c --- /dev/null +++ b/lib/efi_loader/efi_var_seed.S @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Predefined UEFI variables + * + * Copyright (c) 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> + */ + +#include <config.h> + +.section .rodata.efi_seed.init,"a" +.balign 16 +.global __efi_var_file_begin +__efi_var_file_begin: +.incbin CONFIG_EFI_VAR_SEED_FILE +.global __efi_var_file_end +__efi_var_file_end: +.balign 16 diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index ecbc4f7f54..39a8482903 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -5,12 +5,15 @@ * Copyright (c) 2017 Rob Clark */ +#define LOG_CATEGORY LOGC_EFI + #include <common.h> #include <efi_loader.h> #include <efi_variable.h> #include <env.h> #include <env_internal.h> #include <hexdump.h> +#include <log.h> #include <malloc.h> #include <rtc.h> #include <search.h> @@ -18,7 +21,7 @@ #include <crypto/pkcs7_parser.h> #include <linux/compat.h> #include <u-boot/crc.h> - +#include <asm/sections.h> #ifdef CONFIG_EFI_SECURE_BOOT static u8 pkcs7_hdr[] = { @@ -365,10 +368,16 @@ efi_status_t efi_set_variable_int(u16 *variable_name, const efi_guid_t *vendor, delete = !append && (!data_size || !attributes); /* check attributes */ + var_type = efi_auth_var_get_type(variable_name, vendor); if (var) { if (ro_check && (var->attr & EFI_VARIABLE_READ_ONLY)) return EFI_WRITE_PROTECTED; + if (IS_ENABLED(CONFIG_EFI_VARIABLES_PRESEED)) { + if (var_type != EFI_AUTH_VAR_NONE) + return EFI_WRITE_PROTECTED; + } + /* attributes won't be changed */ if (!delete && ((ro_check && var->attr != attributes) || @@ -386,7 +395,6 @@ efi_status_t efi_set_variable_int(u16 *variable_name, const efi_guid_t *vendor, return EFI_NOT_FOUND; } - var_type = efi_auth_var_get_type(variable_name, vendor); if (var_type != EFI_AUTH_VAR_NONE) { /* authentication is mandatory */ if (!(attributes & @@ -589,5 +597,12 @@ efi_status_t efi_init_variables(void) if (ret != EFI_SUCCESS) return ret; + if (IS_ENABLED(CONFIG_EFI_VARIABLES_PRESEED)) { + ret = efi_var_restore((struct efi_var_file *) + __efi_var_file_begin); + if (ret != EFI_SUCCESS) + log_err("Invalid EFI variable seed\n"); + } + return efi_var_from_file(); } -- 2.27.0

2 2

[PATCH 1/1] efi_loader: describe EFI_VAR_FILE_MAGIC
by Heinrich Schuchardt 16 Jul '20

16 Jul '20

Add documentation for EFI_VAR_FILE_MAGIC used in the file format for UEFI variables. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/efi_variable.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/efi_variable.h b/include/efi_variable.h index 17f25ad7a4..2c629e4dca 100644 --- a/include/efi_variable.h +++ b/include/efi_variable.h @@ -93,6 +93,10 @@ efi_status_t efi_query_variable_info_int(u32 attributes, #define EFI_VAR_BUF_SIZE 0x4000 +/* + * This constant identifies the file format for storing UEFI variables in + * struct efi_var_file. + */ #define EFI_VAR_FILE_MAGIC 0x0161566966456255 /* UbEfiVa, version 1 */ /** @@ -116,7 +120,7 @@ struct efi_var_entry { * struct efi_var_file - file for storing UEFI variables * * @reserved: unused, may be overwritten by memory probing - * @magic: identifies file format + * @magic: identifies file format, takes value %EFI_VAR_FILE_MAGIC * @length: length including header * @crc32: CRC32 without header * @var: variables -- 2.27.0

1 0