October 2023 - U-Boot

[PATCH v7 0/9] Add EFI HTTP boot support
by Masahisa Kojima 19 Oct '23

19 Oct '23

This series adds the EFI HTTP boot support. User can add the URI device path with "efidebug boot add" command. efibootmgr handles the URI device path, download the specified file using wget, mount the downloaded image with blkmap, then boot with the default file(e.g. EFI/BOOT/BOOTAA64.EFI) by selecting automatically created boot option when the new disk is detected. This version still does not include the test. To enable EFI HTTP boot, we need to enable the following Kconfig options. CONFIG_CMD_DNS CONFIG_CMD_WGET CONFIG_BLKMAP CONFIG_EFI_HTTP_BOOT On the Socionext Developerbox, enter the following commands then debian installer is downloaded into "loadaddr" and installer automatically starts. => dhcp => setenv serverip 192.168.1.1 => efidebug boot add -u 3 debian-netinst http://ftp.riken.jp/Linux/debian/debian-cd/12.1.0/arm64/iso-cd/debian-12.1.… => efidebug boot order 3 => bootefi bootmgr Note that this debian installer can not proceed the installation bacause RAM disk of installer image is not recogniged by the kernel. I'm still investigating this issue, but drivers/nvdimm/of_pmem.c in linux will be one of the solution to recognize RAM disk from kernel. (In EDK2, the equivalent solution is called ACPI NFIT.) On QEMU, I can not make DNS work from the QEMU guest. The following commands work on qemu_arm64(manually set the http server ip in URI). => dhcp => setenv gatewayip 10.0.2.2 => setenv httpserverip 134.160.38.1 => efidebug boot add -u 3 debian-netinst http://134.160.38.1/Linux/debian/debian-cd/12.1.0/arm64/iso-cd/debian-12.1.… => efidebug boot order 3 => bootefi bootmgr [TODO] - add test - stricter wget uri check - omit the dns process if the given uri has ip address -> this will be supported when the lwip migration completes - uri device path support in eficonfig [change log] v6 -> v7 - rename the funtion name from load_default_file_boot_option() to load_mounted_image() - move some fix from patch #5 "efi_loader: support boot from URI device path" to patch #4 "efi_loader: create default file boot option". - fix missing free() of default_file_path v5 -> v6 - add patch #4 "Boot var automatic management for removable medias" - boot from automatically created boot option rather than searching default file on the fly - introduce new CONFIG_EFI_HTTP_BOOT Kconfig option - comment in one place - use log_err() rather than printf() - use env_get_hex("filesize", 0) instead of return value of net_loop() - use more suitable error code - blkmap can be build for SPL/TPL - add CDROM short-form device path support v4 -> v5 - add missing else statement - add NULL check of efi_dp_find_obj() call - update document to remove "limitation" v3 -> v4 - patch#8 is added to simplify the bootmgr default boot process - add function comments v2 -> v3 - Patch#6 is added, reserve the whole ramdisk memory region - remove .efi file extension check for PE-COFF image - use "if IS_ENABLED(..)" as much as possible - 1024 should be sizeof(net_boot_file_name) - call net_set_state(NETLOOP_FAIL) when wget encounters error - describe DNS ip address host name limitation in document v1 -> v2 - carve out the network handling(wget and dns code) under net/wget.c - carve out ramdisk creation code under drivers/block/blkmap_helper.c - wget supports the valid range check to store the received blocks using lmb - support when the downloaded image have no partiton table but a file system - not start the .efi file in try_load_entry() - call efi_check_pe() for .efi file to check the file is PE-COFF image - add documentation for EFI HTTP Boot Masahisa Kojima (8): net: wget: prevent overwriting reserved memory net: wget: add wget with dns utility function blk: blkmap: add ramdisk creation utility function efi_loader: create default file boot option efi_loader: support boot from URI device path efi_loader: add CDROM short-form device path cmd: efidebug: add uri device path doc: uefi: add HTTP Boot support Raymond Mao (1): Boot var automatic management for removable medias cmd/efidebug.c | 50 +++ doc/develop/uefi/uefi.rst | 30 ++ drivers/block/Makefile | 3 +- drivers/block/blkmap.c | 15 - drivers/block/blkmap_helper.c | 53 ++++ include/blkmap.h | 29 ++ include/efi_loader.h | 2 + include/net.h | 17 ++ lib/efi_loader/Kconfig | 9 + lib/efi_loader/efi_bootmgr.c | 284 ++++++++++++++++-- lib/efi_loader/efi_device_path.c | 3 +- lib/efi_loader/efi_disk.c | 18 ++ lib/efi_loader/efi_dt_fixup.c | 2 +- lib/efi_loader/efi_setup.c | 7 + net/wget.c | 205 ++++++++++++- test/py/tests/test_efi_secboot/test_signed.py | 42 +-- .../test_efi_secboot/test_signed_intca.py | 14 +- .../tests/test_efi_secboot/test_unsigned.py | 14 +- .../test_fs/test_squashfs/test_sqfs_ls.py | 6 + 19 files changed, 720 insertions(+), 83 deletions(-) create mode 100644 drivers/block/blkmap_helper.c base-commit: c1ab04626d6b05c6e82dfe4d97d3f62f7310d612 -- 2.34.1

4 32

[PATCH v1] usb: xhci: Check return value of wait for TRB_TRANSFER event
by Minda Chen 19 Oct '23

19 Oct '23

xhci_wait_for_event() waiting TRB_TRANSFER event may return NULL. Checking the return value to avoid crash. Signed-off-by: Minda Chen <minda.chen(a)starfivetech.com> --- drivers/usb/host/xhci-ring.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index c8260cbdf9..5f02ff0769 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -544,6 +544,8 @@ static void abort_td(struct usb_device *udev, int ep_index) xhci_queue_command(ctrl, 0, udev->slot_id, ep_index, TRB_STOP_RING); event = xhci_wait_for_event(ctrl, TRB_TRANSFER); + if (!event) + return; field = le32_to_cpu(event->trans_event.flags); BUG_ON(TRB_TO_SLOT_ID(field) != udev->slot_id); BUG_ON(TRB_TO_EP_INDEX(field) != ep_index); -- 2.17.1

2 9

[PATCH v4] imx8mp-dhcom-pdk3-overlay-rev100: Pass #address-cells/size-cells
by Fabio Estevam 18 Oct '23

18 Oct '23

From: Fabio Estevam <festevam(a)denx.de> Pass #address-cells/size-cells in the mdio node to avoid the following DTC warning: DTCO arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dtbo Warning (reg_format): /fragment@0/__overlay__:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) Warning (avoid_default_addr_size): /fragment@0/__overlay__: Relying on default #address-cells value Warning (avoid_default_addr_size): /fragment@0/__overlay__: Relying on default #size-cells value Also change the Ethernet PHY address to 5, as per Marek's feedback. Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- Changes since v3: - Change the Ethernet PHY address to 5 for good :-). (Marek) arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts b/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts index f27e6429abe4..bad015536166 100644 --- a/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts +++ b/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts @@ -5,6 +5,13 @@ /dts-v1/; /plugin/; -&ethphy0g { - reg = <7>; +&eqos { + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethernet-phy@5 { + reg = <5>; + }; + }; }; -- 2.34.1

2 1

[PATCH v3] imx8mp-dhcom-pdk3-overlay-rev100: Pass #address-cells/size-cells
by Fabio Estevam 18 Oct '23

18 Oct '23

From: Fabio Estevam <festevam(a)denx.de> Pass #address-cells/size-cells in the mdio node to avoid the following DTC warning: DTCO arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dtbo Warning (reg_format): /fragment@0/__overlay__:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) Warning (avoid_default_addr_size): /fragment@0/__overlay__: Relying on default #address-cells value Warning (avoid_default_addr_size): /fragment@0/__overlay__: Relying on default #size-cells value Also change the Ethernet PHY address to 5, as per Marek's feedback. Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- Changes since v2: - Change the Ethernet PHY address to 5. (Marek) arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts b/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts index f27e6429abe4..bad015536166 100644 --- a/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts +++ b/arch/arm/dts/imx8mp-dhcom-pdk3-overlay-rev100.dts @@ -5,6 +5,13 @@ /dts-v1/; /plugin/; -&ethphy0g { - reg = <7>; +&eqos { + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethernet-phy@7 { + reg = <7>; + }; + }; }; -- 2.34.1

2 1

[PATCH v2 2/4] ARM: imx: Factor out parsing of ROM log
by sbabic＠denx.de 18 Oct '23

18 Oct '23

> From: Fedor Ross <fedor.ross(a)ifm.com> > Factor out parsing of ROM log in function spl_mmc_emmc_boot_partition(). > This can be helpful to detect a secondary image boot without fiddling > around with MMC partitions. This way for example, U-Boot is able to > detect a secondary image boot and can enter some fallback scenario like > starting a recovery mode. > Signed-off-by: Fedor Ross <fedor.ross(a)ifm.com> > Signed-off-by: Marek Vasut <marex(a)denx.de> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[PATCH 2/2] dm: adc: imx93-adc depends on ADC (fix boot)
by sbabic＠denx.de 18 Oct '23

18 Oct '23

> The i.MX93 11x11 EVK fails to boot with following error: > Model: NXP i.MX93 11X11 EVK board > DRAM: 2 GiB > Error binding driver 'imx93-adc': -96 > Some drivers failed to bind > Error binding driver 'simple_bus': -96 > Some drivers failed to bind > Error binding driver 'simple_bus': -96 > Some drivers failed to bind > initcall sequence 00000000fffb8f28 failed at call 000000008021e0d4 (err=-96) > ### ERROR ### Please RESET the board ### > That's because since commit e7ff54d96303 ("imx93_evk: defconfig: add adc > support") CONFIG_ADC_IMX93 is enabled but CONFIG_ADC is not. > Fix this by enabling CONFIG_ADC in imx93_11x11_evk_defconfig. > Make sure this situation won't happen again in future i.MX93 defconfig by > making CONFIG_ADC_IMX93 depend on CONFIG_ADC. > Signed-off-by: Sébastien Szymanski <sebastien.szymanski(a)armadeus.com> > Reviewed-by: Fabio Estevam <festevam(a)gmail.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[PATCH 1/2] arm: dts: imx93-11x11-evk: add bootph-some-ram property
by sbabic＠denx.de 18 Oct '23

18 Oct '23

> i.MX93 11x11 EVK fails to boot: > U-Boot SPL 2023.10-00558-g65b9b3462bec-dirty (Oct 03 2023 - 17:40:10 +0200) > SOC: 0xa0009300 > LC: 0x40010 > M33 prepare ok > Normal Boot > Trying to boot from BOOTROM > Boot Stage: Primary boot > image offset 0x8000, pagesize 0x200, ivt offset 0x0 > Load image from 0x44400 by ROM_API > NOTICE: BL31: v2.8(release):android-13.0.0_2.0.0-0-ge4b2dbfa52f5 > NOTICE: BL31: Built : 17:52:46, Sep 28 2023 > That's because commit 9e644284ab81 ("dm: core: Report > bootph-pre-ram/sram node as pre-reloc after relocation"): > "[This] changes behavior of what nodes are bound in the U-Boot > proper pre-relocation phase. Change to bootph-all or add > bootph-some-ram prop to restore prior behavior." > Fix this by adding bootph-some-ram prop as suggested by the commit > above. > Fixes: 9e644284ab81 ("dm: core: Report bootph-pre-ram/sram node as pre-reloc after relocation") > Signed-off-by: Sébastien Szymanski <sebastien.szymanski(a)armadeus.com> > Reviewed-by: Fabio Estevam <festevam(a)gmail.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[PATCH v2 3/4] ARM: imx: Use correct U-Boot offset in case of secondary boot from eMMC
by sbabic＠denx.de 18 Oct '23

18 Oct '23

> From: Fedor Ross <fedor.ross(a)ifm.com> > In case of a secondary image boot from the user area of an eMMC device, > the correct offset must be calculated. The offset is fused in the fuse > IMG_CNTN_SET1_OFFSET of the i.MX8M Nano and Plus. The calculation of the > offset is described in the reference manual (IMX8MNRM Rev. 2, 07/2022 > and IMX8MPRM Rev. 1, 06/2021): > The fuse IMG_CNTN_SET1_OFFSET (0x490[22:19]) is defined as follows: > * Secondary boot is disabled if fuse value is bigger than 10, > n = fuse value bigger than 10. > * n == 0: Offset = 4MB > * n == 2: Offset = 1MB > * Others & n <= 10 : Offset = 1MB*2^n > Signed-off-by: Fedor Ross <fedor.ross(a)ifm.com> > Signed-off-by: Marek Vasut <marex(a)denx.de> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[PATCH v2 1/4] spl: mmc: Introduce proper layering for spl_mmc_get_uboot_raw_sector()
by sbabic＠denx.de 18 Oct '23

18 Oct '23

> Introduce two new weak functions, arch_spl_mmc_get_uboot_raw_sector() and > board_spl_mmc_get_uboot_raw_sector(), each of which can be overridden at > a matching level, that is arch/ and board/ , in addition to the existing > weak function spl_mmc_get_uboot_raw_sector(). > This way, architecture code can define a default architecture specific > implementation of arch_spl_mmc_get_uboot_raw_sector(), while the board > code can override that using board_spl_mmc_get_uboot_raw_sector() which > takes precedence over the architecture code. In some sort of unlikely > special case where code has to take precedence over board code too, the > spl_mmc_get_uboot_raw_sector() is still left out to be a weak function, > but it should be unlikely that this is ever needed to be overridden. > Signed-off-by: Marek Vasut <marex(a)denx.de> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0

[PATCH v2 4/4] ARM: imx: Add support for detecting primary/secondary bmode on MX8M
by sbabic＠denx.de 18 Oct '23

18 Oct '23

> From: Fedor Ross <fedor.ross(a)ifm.com> > Implement the 'getprisec' subcommand of 'bmode' command for i.MX8M by > reading out the ROM log events. This event is set by the BootROM if it > switched to the secondary copy due to primary copy being corrupted. > Signed-off-by: Fedor Ross <fedor.ross(a)ifm.com> > Signed-off-by: Marek Vasut <marex(a)denx.de> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

1 0