January 2023 - U-Boot

[PATCH] arch/riscv/dts: Fix uart reg-shift on fu540/fu740 SiFive devices
by Alexander von Gluck IV 24 Jan '23

24 Jan '23

* Not specifying reg-shift creates a situation where the register shift is unknown and can only be decoded via special compat cases. * The device tree specification states: "...reg-shift. If unspecified, the default value is 0." https://devicetree-specification.readthedocs.io/en/latest/chapter4-device-b… * Since the reg-shift for the SiFive boards is *NOT* 0, it shall be defined as 2 --- arch/riscv/dts/fu540-c000.dtsi | 1 + arch/riscv/dts/fu740-c000.dtsi | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/riscv/dts/fu540-c000.dtsi b/arch/riscv/dts/fu540-c000.dtsi index 7db8610534..0bea8cf1e5 100644 --- a/arch/riscv/dts/fu540-c000.dtsi +++ b/arch/riscv/dts/fu540-c000.dtsi @@ -161,6 +161,7 @@ uart0: serial@10010000 { compatible = "sifive,fu540-c000-uart", "sifive,uart0"; reg = <0x0 0x10010000 0x0 0x1000>; + reg-shift = <2>; interrupt-parent = <&plic0>; interrupts = <4>; clocks = <&prci PRCI_CLK_TLCLK>; diff --git a/arch/riscv/dts/fu740-c000.dtsi b/arch/riscv/dts/fu740-c000.dtsi index 7b77c13496..19da3709f0 100644 --- a/arch/riscv/dts/fu740-c000.dtsi +++ b/arch/riscv/dts/fu740-c000.dtsi @@ -164,6 +164,7 @@ uart0: serial@10010000 { compatible = "sifive,fu740-c000-uart", "sifive,uart0"; reg = <0x0 0x10010000 0x0 0x1000>; + reg-shift = <2>; interrupt-parent = <&plic0>; interrupts = <39>; clocks = <&prci FU740_PRCI_CLK_PCLK>; @@ -172,6 +173,7 @@ uart1: serial@10011000 { compatible = "sifive,fu740-c000-uart", "sifive,uart0"; reg = <0x0 0x10011000 0x0 0x1000>; + reg-shift = <2>; interrupt-parent = <&plic0>; interrupts = <40>; clocks = <&prci FU740_PRCI_CLK_PCLK>; -- 2.39.1

1 1

[PATCH 1/1] doc: rework doc/mkeficapsule.1
by Heinrich Schuchardt 23 Jan '23

23 Jan '23

* Indicate the location of the directory for EFI capsules. * Improve the readability. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- doc/mkeficapsule.1 | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/doc/mkeficapsule.1 b/doc/mkeficapsule.1 index 6fb2dd0810..1ca245a10f 100644 --- a/doc/mkeficapsule.1 +++ b/doc/mkeficapsule.1 @@ -11,22 +11,23 @@ mkeficapsule \- Generate EFI capsule file for U-Boot .RI [ options ] " " [ image-blob ] " " capsule-file .SH "DESCRIPTION" +The .B mkeficapsule -command is used to create an EFI capsule file for use with the U-Boot -EFI capsule update. -A capsule file may contain various type of firmware blobs which -are to be applied to the system and must be placed in the specific -directory on the UEFI system partition. -An update will be automatically executed at next reboot. +command is used to create an EFI capsule file to be used by U-Boot for firmware +updates. +A capsule file may contain various types of firmware blobs which are to be +applied to the system. +If a capsule file is placed in the /EFI/CapusuleUpdate directory of the EFI +system partition, U-Boot will try to execute the update at the next reboot. Optionally, a capsule file can be signed with a given private key. In this case, the update will be authenticated by verifying the signature before applying. -Additionally, an empty capsule file can be generated for acceptance or -rejection of firmware images by a governing component like an Operating -System. The empty capsules do not require an image-blob input file. - +Additionally, an empty capsule file can be generated to indicate the acceptance +or rejection of firmware images by a governing component like an operating +system. +Empty capsules do not require an image-blob input file. .B mkeficapsule takes any type of image files when generating non empty capsules, including: -- 2.38.1

2 3

[PATCH v2 0/3] power: X-Powers PMIC regulator support
by Samuel Holland 23 Jan '23

23 Jan '23

This series adds a driver for the regulators in X-Powers AXPxxx PMICs. It supports everything except regulators shared with GPIO pins. Those have a different register interface, so they may need a separate driver. Regulator setup in U-Boot proper is needed for Ethernet and HDMI/LCD display output. For some SoCs (H616), this driver could possibly be used for the DRAM regulator setup done in SPL. Older SoCs do all of their regulator setup in SPL. Some of that is probably necessary, but I think a lot of it is not and can be deferred to U-Boot proper or Linux; that's just where it was convenient to initialize the PMIC at the time. The main goal here is to replace the corresponding code in TF-A, both because of TF-A size constraints, and because the TF-A code is too simple/overzealous and breaks EPHY power sequencing on some boards. Changes in v2: - Dual-license the driver - Add a comment about the requirements for the voltage table - Fix AXP22x ALDO3 enable bit position Samuel Holland (3): power: pmic: axp: Provide a variant ID in the driver data power: regulator: Add a driver for AXP PMIC regulators power: pmic: axp: Bind regulators from the DT drivers/power/pmic/axp.c | 36 ++- drivers/power/regulator/Kconfig | 14 ++ drivers/power/regulator/Makefile | 1 + drivers/power/regulator/axp_regulator.c | 312 ++++++++++++++++++++++++ include/axp_pmic.h | 12 + 5 files changed, 366 insertions(+), 9 deletions(-) create mode 100644 drivers/power/regulator/axp_regulator.c -- 2.37.4

3 8

[PATCH] include: configs: am62x_evm: Add .env file for Am62x
by Nikhil M Jain 23 Jan '23

23 Jan '23

Use .env file for setting board related environment variables, in place of am62x_evm.h file. Except for BOOTENV settings, as config_distro_boot.env file doesn't exist. Signed-off-by: Nikhil M Jain <n-jain1(a)ti.com> --- board/ti/am62x/am62x.env | 105 ++++++++++++++++++++++++++++++++++++ include/configs/am62x_evm.h | 43 --------------- 2 files changed, 105 insertions(+), 43 deletions(-) create mode 100644 board/ti/am62x/am62x.env diff --git a/board/ti/am62x/am62x.env b/board/ti/am62x/am62x.env new file mode 100644 index 0000000000..3d4ab84fa3 --- /dev/null +++ b/board/ti/am62x/am62x.env @@ -0,0 +1,105 @@ +#define CFG_SYS_SDRAM_BASE1 0x880000000 + +loadaddr=0x82000000 +kernel_addr_r=0x82000000 +fdtaddr=0x88000000 +dtboaddr=0x89000000 +fdt_addr_r=0x88000000 +fdtoverlay_addr_r=0x89000000 +rdaddr=0x88080000 +ramdisk_addr_r=0x88080000 +scriptaddr=0x80000000 +pxefile_addr_r=0x80100000 +bootm_size=0x10000000 +boot_fdt=try + +mmcrootfstype=ext4 rootwait +finduuid=part uuid ${boot} ${bootpart} uuid +args_mmc=run finduuid;setenv bootargs console=${console} + ${optargs} + root=PARTUUID=${uuid} rw + rootfstype=${mmcrootfstype} +loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr +bootscript=echo Running bootscript from mmc${mmcdev} ...; + source ${loadaddr} +bootenvfile=uEnv.txt +importbootenv=echo Importing environment from mmc${mmcdev} ...; + env import -t ${loadaddr} ${filesize} +loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile} +loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile} +loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile} +envboot=mmc dev ${mmcdev}; + if mmc rescan; then + echo SD/MMC found on device ${mmcdev}; + if run loadbootscript; then + run bootscript; + else + if run loadbootenv; then + echo Loaded env from ${bootenvfile}; + run importbootenv; + fi; + if test -n $uenvcmd; then + echo Running uenvcmd ...; + run uenvcmd; + fi; + fi; + fi; +mmcloados= + if test ${boot_fdt} = yes || test ${boot_fdt} = try; then + if run loadfdt; then + bootz ${loadaddr} - ${fdtaddr}; + else + if test ${boot_fdt} = try; then + bootz; + else + echo WARN: Cannot load the DT; + fi; + fi; + else + bootz; + fi; +mmcboot=mmc dev ${mmcdev}; + devnum=${mmcdev}; + devtype=mmc; + if mmc rescan; then + echo SD/MMC found on device ${mmcdev}; + if run loadimage; then + run args_mmc; + if test ${boot_fit} -eq 1; then + run run_fit; + else + run mmcloados; + fi; + fi; + fi; + +default_device_tree=k3-am625-sk.dtb +findfdt= + setenv name_fdt ${default_device_tree}; + setenv fdtfile ${name_fdt} +name_kern=Image +console=ttyS2,115200n8 +args_all=setenv optargs ${optargs} earlycon=ns16550a,mmio32,0x02800000 + ${mtdparts} +run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr} + +boot=mmc +mmcdev=1 +bootpart=1:2 +bootdir=/boot +rd_spec=- +init_mmc=run args_all args_mmc +get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt} +get_overlay_mmc= + fdt address ${fdtaddr}; + fdt resize 0x100000; + for overlay in $name_overlays; + do; + load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && + fdt apply ${dtboaddr}; + done; +get_kern_mmc=load mmc ${bootpart} ${loadaddr} + ${bootdir}/${name_kern} +get_fit_mmc=load mmc ${bootpart} ${addr_fit} + ${bootdir}/${name_fit} +partitions=name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs} diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h index 7fbefdece4..7bf07809b0 100644 --- a/include/configs/am62x_evm.h +++ b/include/configs/am62x_evm.h @@ -38,51 +38,8 @@ DISTRO_BOOT_DEV_PXE(func) \ DISTRO_BOOT_DEV_DHCP(func) -#define PARTS_DEFAULT \ - /* Linux partitions */ \ - "name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}\0" - -/* U-Boot general configuration */ -#define EXTRA_ENV_AM625_BOARD_SETTINGS \ - "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ - "findfdt=" \ - "setenv name_fdt ${default_device_tree};" \ - "setenv fdtfile ${name_fdt}\0" \ - "name_kern=Image\0" \ - "console=ttyS2,115200n8\0" \ - "args_all=setenv optargs ${optargs} earlycon=ns16550a,mmio32,0x02800000 " \ - "${mtdparts}\0" \ - "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0" - -/* U-Boot MMC-specific configuration */ -#define EXTRA_ENV_AM625_BOARD_SETTINGS_MMC \ - "boot=mmc\0" \ - "mmcdev=1\0" \ - "bootpart=1:2\0" \ - "bootdir=/boot\0" \ - "rd_spec=-\0" \ - "init_mmc=run args_all args_mmc\0" \ - "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0" \ - "get_overlay_mmc=" \ - "fdt address ${fdtaddr};" \ - "fdt resize 0x100000;" \ - "for overlay in $name_overlays;" \ - "do;" \ - "load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && " \ - "fdt apply ${dtboaddr};" \ - "done;\0" \ - "get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \ - "${bootdir}/${name_kern}\0" \ - "get_fit_mmc=load mmc ${bootpart} ${addr_fit} " \ - "${bootdir}/${name_fit}\0" \ - "partitions=" PARTS_DEFAULT - /* Incorporate settings into the U-Boot environment */ #define CFG_EXTRA_ENV_SETTINGS \ - DEFAULT_LINUX_BOOT_ENV \ - DEFAULT_MMC_TI_ARGS \ - EXTRA_ENV_AM625_BOARD_SETTINGS \ - EXTRA_ENV_AM625_BOARD_SETTINGS_MMC \ BOOTENV /* Now for the remaining common defines */ -- 2.17.1

2 1

[PATCH 1/1] doc: example heading should be h2
by Heinrich Schuchardt 23 Jan '23

23 Jan '23

The 'Example' heading should be on a lower level than 'bdinfo command'. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- doc/usage/cmd/bdinfo.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/usage/cmd/bdinfo.rst b/doc/usage/cmd/bdinfo.rst index 6b3cde2ccb..b287d0ff73 100644 --- a/doc/usage/cmd/bdinfo.rst +++ b/doc/usage/cmd/bdinfo.rst @@ -17,7 +17,7 @@ Description The *bdinfo* command prints information about the board. Example -======= +------- :: -- 2.38.1

2 1

[PATCH 1/1] doc: sleep man-page
by Heinrich Schuchardt 23 Jan '23

23 Jan '23

Provide a man-page for the sleep command. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- doc/usage/cmd/sleep.rst | 45 +++++++++++++++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + 2 files changed, 46 insertions(+) create mode 100644 doc/usage/cmd/sleep.rst diff --git a/doc/usage/cmd/sleep.rst b/doc/usage/cmd/sleep.rst new file mode 100644 index 0000000000..d19e5b3af8 --- /dev/null +++ b/doc/usage/cmd/sleep.rst @@ -0,0 +1,45 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. Copyright 2023, Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> + +sleep command +============= + +Synopsis +-------- + +:: + + sleep <delay> + +Description +----------- + +The *sleep* command waits for *delay* seconds. It can be interrupted by +CTRL+C. + +delay + delay in seconds. The value is decimal and can be fractional. + +Example +------- + +The current data and time is display before and after sleeping for 3.2 +seconds: + +:: + + => date; sleep 3.2; date + Date: 2023-01-21 (Saturday) Time: 16:02:41 + Date: 2023-01-21 (Saturday) Time: 16:02:44 + => + +Configuration +------------- + +The command is only available if CONFIG_CMD_SLEEP=y. + +Return value +------------ + +The return value $? is 0 (true) if the command completes. +The return value is 1 (false) if the command is interrupted by CTRL+C. diff --git a/doc/usage/index.rst b/doc/usage/index.rst index 7d4a1cbc10..72c15ca17a 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -76,6 +76,7 @@ Shell commands cmd/scp03 cmd/setexpr cmd/size + cmd/sleep cmd/sound cmd/source cmd/temperature -- 2.38.1

2 1

[PATCH 1/1] doc: update font man-page
by Heinrich Schuchardt 23 Jan '23

23 Jan '23

* add return values * move configuration to separate section to match other man-pages * fix typo Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- doc/usage/cmd/font.rst | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/doc/usage/cmd/font.rst b/doc/usage/cmd/font.rst index 6fb0823270..0974b2dcc1 100644 --- a/doc/usage/cmd/font.rst +++ b/doc/usage/cmd/font.rst @@ -12,33 +12,27 @@ Synopis font select <name> [<size>] font size <size> - Description ----------- The *font* command allows selection of the font to use on the video console. -This is available when the Truetype console is in use. This is the case when -`CONFIG_CONSOLE_TRUETYPE` is enabled. - +This is available when the TrueType console is in use. font list ~~~~~~~~~ This lists the available fonts, using the name of the font file in the build. - font select ~~~~~~~~~~~ This selects a new font and optionally changes the size. - font size ~~~~~~~~~ This changes the font size only. - Examples -------- @@ -50,3 +44,14 @@ Examples => font size 40 => font select cantoraone_regular 20 => + +Configuration +------------- + +The command is only available if CONFIG_CONSOLE_TRUETYPE=y. + +Return value +------------ + +The return value $? is 0 (true) if the command completes. +The return value is 1 (false) if the command fails. -- 2.38.1

2 1

[PATCH v5 0/3] Timer support for ARM Tegra
by Svyatoslav Ryhel 23 Jan '23

23 Jan '23

- ARM: tegra: remap clock_osc_freq for all Tegra family Enum clock_osc_freq was designed to use only with T20. This patch remaps it to use additional frequencies, added in T30+ SoC while maintaining backwards compatibility with T20. - drivers: timer: add timer driver for ARMv7 based Tegra devices Add timer support for T20/T30/T114 and T124 based devices. Driver is based on DM, has device tree support and can be used on SPL and early boot stage. - ARM: tegra: include timer as default option Enable TIMER as default option for add Tegra devices and enable TEGRA_TIMER for TEGRA_ARMV7_COMMON. Additionally enable SPL_TIMER if build as SPL part and drop deprecated configs from common header. P. S. I have no arm64 Tegra and according to comment in tegra-common.h Use the Tegra US timer on ARMv7, but the architected timer on ARMv8. Svyatoslav Ryhel (3): ARM: tegra: remap clock_osc_freq for all Tegra family drivers: timer: add timer driver for ARMv7 based Tegra devices ARM: tegra: include timer as default option arch/arm/Kconfig | 1 + arch/arm/include/asm/arch-tegra/clock.h | 9 +- arch/arm/mach-tegra/Kconfig | 2 + arch/arm/mach-tegra/clock.c | 17 +++- arch/arm/mach-tegra/cpu.c | 70 ++++++++++--- arch/arm/mach-tegra/tegra114/clock.c | 13 +-- arch/arm/mach-tegra/tegra124/clock.c | 13 +-- arch/arm/mach-tegra/tegra20/clock.c | 4 +- arch/arm/mach-tegra/tegra210/clock.c | 22 +---- arch/arm/mach-tegra/tegra30/clock.c | 10 +- drivers/timer/Kconfig | 8 ++ drivers/timer/Makefile | 1 + drivers/timer/tegra-timer.c | 126 ++++++++++++++++++++++++ drivers/usb/host/ehci-tegra.c | 46 +++++++-- include/configs/tegra-common.h | 6 -- 15 files changed, 269 insertions(+), 79 deletions(-) create mode 100644 drivers/timer/tegra-timer.c -- 2.37.2

3 5

[RFC][PATCH] usb: dwc3: gadget: workaround for Netconsole hang
by Niel Fourie 23 Jan '23

23 Jan '23

In dwc3_remove_requests(), the while loops clearing out request lists req_queued and request_list may loop infinitely as the last remaining elements in these lists end up not pointing to their respective list_head structures. This workaround detects and replaces the last element with the expected list_head to break out of these loops. No memory is leaked as the previous last element gets reused. This issue occurs when Netconsole is active over Ethernet gadget, and the cause it is still unclear. Any ideas? Signed-off-by: Niel Fourie <lusus(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> --- drivers/usb/dwc3/gadget.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index eb416b832a..61f3e367cb 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -538,6 +538,14 @@ static void dwc3_remove_requests(struct dwc3 *dwc, struct dwc3_ep *dep) req = next_request(&dep->req_queued); dwc3_gadget_giveback(dep, req, -ESHUTDOWN); + /* FIXME! */ + if (dep->req_queued.next == dep->req_queued.prev && + dep->req_queued.next != &dep->req_queued) { + printf("Stuck? Emptying req_queued... head=%lx, next=%lx;\n", + (ulong)&dep->req_queued, (ulong)dep->req_queued.next); + dep->req_queued.next = &dep->req_queued; + dep->req_queued.prev = &dep->req_queued; + } } } @@ -545,6 +553,14 @@ static void dwc3_remove_requests(struct dwc3 *dwc, struct dwc3_ep *dep) req = next_request(&dep->request_list); dwc3_gadget_giveback(dep, req, -ESHUTDOWN); + /* FIXME! */ + if (dep->request_list.next == dep->request_list.prev && + dep->request_list.next != &dep->request_list) { + printf("Stuck? Emptying request_list... head=%lx, next=%lx;\n", + (ulong)&dep->request_list, (ulong)dep->request_list.next); + dep->request_list.next = &dep->request_list; + dep->request_list.prev = &dep->request_list; + } } } -- 2.39.0

1 0

[RFC PATCH 1/1] efi_loader: get rid of ad-hoc EFI subsystem init
by Ilias Apalodimas 23 Jan '23

23 Jan '23

Up to now the EFI subsystem was left out of the main U-Boot init process. This has led to various hacks over the years, with the most notable one being sprinkling around the efi init call to various places such as U-Boot commands, the early boot code etc. Since EFI has it's own Kconfig option and people can remove it, let's wire up the EFI init call on an event for EVT_MAIN_LOOP. This will also get rid of ad-hoc code in the main event loop, which was trying to initialize the subsystem early and perform capsule updates. TODO: - The efi_tcg protocol implicitly initializes the TPM, as a result some of the tpm selftests will fail with the RFC. If everyone agrees that this is a good idea, I'll clean up the TPM hacks as well - We still need to run capsule updates on the main_loop() code since in some cases (e.g sandbox) we need preboot commands. - wider tests, I've only run QEMU for now Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- boot/bootm_os.c | 8 -------- cmd/bootefi.c | 8 -------- cmd/bootmenu.c | 9 --------- cmd/eficonfig.c | 8 -------- cmd/efidebug.c | 9 --------- cmd/nvedit_efi.c | 17 ----------------- common/main.c | 8 +++----- include/efi_loader.h | 2 -- lib/efi_loader/Kconfig | 10 ---------- lib/efi_loader/efi_setup.c | 25 ++++++++++++++++++------- lib/fwu_updates/Kconfig | 1 - lib/fwu_updates/fwu.c | 3 --- 12 files changed, 21 insertions(+), 87 deletions(-) diff --git a/boot/bootm_os.c b/boot/bootm_os.c index 99ff0e6c02d2..4775cecb4e64 100644 --- a/boot/bootm_os.c +++ b/boot/bootm_os.c @@ -505,14 +505,6 @@ static int do_bootm_efi(int flag, int argc, char *const argv[], if (ret) return ret; - /* Initialize EFI drivers */ - efi_ret = efi_init_obj_list(); - if (efi_ret != EFI_SUCCESS) { - printf("## Failed to initialize UEFI sub-system: r = %lu\n", - efi_ret & ~EFI_ERROR_MASK); - return 1; - } - /* Install device tree */ efi_ret = efi_install_fdt(images->ft_len ? images->ft_addr : EFI_FDT_USE_INTERNAL); diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 2a7d42925d65..5d56448ee6ce 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -668,14 +668,6 @@ static int do_bootefi(struct cmd_tbl *cmdtp, int flag, int argc, if (argc < 2) return CMD_RET_USAGE; - /* Initialize EFI drivers */ - ret = efi_init_obj_list(); - if (ret != EFI_SUCCESS) { - log_err("Error: Cannot initialize UEFI sub-system, r = %lu\n", - ret & ~EFI_ERROR_MASK); - return CMD_RET_FAILURE; - } - if (argc > 2) { uintptr_t fdt_addr; diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c index 3236ca5d7994..1c604c79e01d 100644 --- a/cmd/bootmenu.c +++ b/cmd/bootmenu.c @@ -449,15 +449,6 @@ static void handle_uefi_bootnext(void) efi_status_t ret; efi_uintn_t size; - /* Initialize EFI drivers */ - ret = efi_init_obj_list(); - if (ret != EFI_SUCCESS) { - log_err("Error: Cannot initialize UEFI sub-system, r = %lu\n", - ret & ~EFI_ERROR_MASK); - - return; - } - /* If UEFI BootNext variable is set, boot the BootNext load option */ size = sizeof(u16); ret = efi_get_variable_int(u"BootNext", diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index d830e4af53b8..16025d451901 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -2545,14 +2545,6 @@ static int do_eficonfig(struct cmd_tbl *cmdtp, int flag, int argc, char *const a if (argc > 1) return CMD_RET_USAGE; - ret = efi_init_obj_list(); - if (ret != EFI_SUCCESS) { - log_err("Error: Cannot initialize UEFI sub-system, r = %lu\n", - ret & ~EFI_ERROR_MASK); - - return CMD_RET_FAILURE; - } - ret = eficonfig_init(); if (ret != EFI_SUCCESS) return CMD_RET_FAILURE; diff --git a/cmd/efidebug.c b/cmd/efidebug.c index e6959ede930f..9ad253da91b2 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -1464,21 +1464,12 @@ static int do_efidebug(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct cmd_tbl *cp; - efi_status_t r; if (argc < 2) return CMD_RET_USAGE; argc--; argv++; - /* Initialize UEFI drivers */ - r = efi_init_obj_list(); - if (r != EFI_SUCCESS) { - printf("Error: Cannot initialize UEFI sub-system, r = %lu\n", - r & ~EFI_ERROR_MASK); - return CMD_RET_FAILURE; - } - cp = find_cmd_tbl(argv[0], cmd_efidebug_sub, ARRAY_SIZE(cmd_efidebug_sub)); if (!cp) diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c index 24944ab81e23..1ac1114d4c89 100644 --- a/cmd/nvedit_efi.c +++ b/cmd/nvedit_efi.c @@ -210,15 +210,6 @@ int do_env_print_efi(struct cmd_tbl *cmdtp, int flag, int argc, const efi_guid_t *guid_p = NULL; efi_guid_t guid; bool verbose = true; - efi_status_t ret; - - /* Initialize EFI drivers */ - ret = efi_init_obj_list(); - if (ret != EFI_SUCCESS) { - printf("Error: Cannot initialize UEFI sub-system, r = %lu\n", - ret & ~EFI_ERROR_MASK); - return CMD_RET_FAILURE; - } for (argc--, argv++; argc > 0 && argv[0][0] == '-'; argc--, argv++) { if (!strcmp(argv[0], "-guid")) { @@ -388,14 +379,6 @@ int do_env_set_efi(struct cmd_tbl *cmdtp, int flag, int argc, if (argc == 1) return CMD_RET_USAGE; - /* Initialize EFI drivers */ - ret = efi_init_obj_list(); - if (ret != EFI_SUCCESS) { - printf("Error: Cannot initialize UEFI sub-system, r = %lu\n", - ret & ~EFI_ERROR_MASK); - return CMD_RET_FAILURE; - } - /* * attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | * EFI_VARIABLE_RUNTIME_ACCESS; diff --git a/common/main.c b/common/main.c index 682f3359ea38..edb5f4c20682 100644 --- a/common/main.c +++ b/common/main.c @@ -54,11 +54,9 @@ void main_loop(void) if (IS_ENABLED(CONFIG_UPDATE_TFTP)) update_tftp(0UL, NULL, NULL); - if (IS_ENABLED(CONFIG_EFI_CAPSULE_ON_DISK_EARLY)) { - /* efi_init_early() already called */ - if (efi_init_obj_list() == EFI_SUCCESS) - efi_launch_capsules(); - } + /* EFI subsystem will be initialized from an event */ + if (IS_ENABLED(CONFIG_EFI_CAPSULE_ON_DISK)) + efi_launch_capsules(); s = bootdelay_process(); if (cli_process_fdt(&s)) diff --git a/include/efi_loader.h b/include/efi_loader.h index f9e427f09059..3a801cbbc4c1 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -513,8 +513,6 @@ extern struct list_head efi_register_notify_events; /* called at pre-initialization */ int efi_init_early(void); -/* Initialize efi execution environment */ -efi_status_t efi_init_obj_list(void); /* Set up console modes */ void efi_setup_console_size(void); /* Install device tree */ diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index b630d88ef9e2..f3aaa51bb36a 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -153,16 +153,6 @@ config EFI_IGNORE_OSINDICATIONS without setting the EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SUPPORTED flag in variable OsIndications. -config EFI_CAPSULE_ON_DISK_EARLY - bool "Initiate capsule-on-disk at U-Boot boottime" - depends on EFI_CAPSULE_ON_DISK - help - Normally, without this option enabled, capsules will be - executed only at the first time of invoking one of efi command. - If this option is enabled, capsules will be enforced to be - executed as part of U-Boot initialisation so that they will - surely take place whatever is set to distro_bootcmd. - config EFI_CAPSULE_FIRMWARE bool diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index f0f01d3b1d5a..e2317aed1ec2 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -215,7 +215,7 @@ out: * * Return: status code */ -efi_status_t efi_init_obj_list(void) +static efi_status_t efi_init_obj_list(void) { efi_status_t ret = EFI_SUCCESS; @@ -335,14 +335,25 @@ efi_status_t efi_init_obj_list(void) /* Initialize EFI runtime services */ ret = efi_reset_system_init(); - if (ret != EFI_SUCCESS) - goto out; - /* Execute capsules after reboot */ - if (IS_ENABLED(CONFIG_EFI_CAPSULE_ON_DISK) && - !IS_ENABLED(CONFIG_EFI_CAPSULE_ON_DISK_EARLY)) - ret = efi_launch_capsules(); out: efi_obj_list_initialized = ret; return ret; } + +static int efi_evt_int(void *ctx, struct event *event) +{ + efi_status_t ret; + int r = 0; + + ret = efi_init_obj_list(); + if (ret != EFI_SUCCESS) { + log_err("Error: Cannot initialize UEFI sub-system, r = %lu\n", + ret & ~EFI_ERROR_MASK); + r = -1; + } + + return r; +} + +EVENT_SPY(EVT_MAIN_LOOP, efi_evt_int); diff --git a/lib/fwu_updates/Kconfig b/lib/fwu_updates/Kconfig index 78759e6618df..6ff577cb53b3 100644 --- a/lib/fwu_updates/Kconfig +++ b/lib/fwu_updates/Kconfig @@ -3,7 +3,6 @@ config FWU_MULTI_BANK_UPDATE depends on EFI_CAPSULE_ON_DISK select PARTITION_TYPE_GUID select EFI_SETUP_EARLY - imply EFI_CAPSULE_ON_DISK_EARLY select EVENT help Feature for updating firmware images on platforms having diff --git a/lib/fwu_updates/fwu.c b/lib/fwu_updates/fwu.c index 5313d0730202..e4256bea7a2c 100644 --- a/lib/fwu_updates/fwu.c +++ b/lib/fwu_updates/fwu.c @@ -700,9 +700,6 @@ static int fwu_boottime_checks(void *ctx, struct event *event) return 0; } - if (efi_init_obj_list() != EFI_SUCCESS) - return 0; - ret = fwu_get_dev_mdata(&dev, &mdata); if (ret) return ret; -- 2.38.1

4 7