July 2023 - U-Boot

[PATCH] Add support for SPL MMC load redundant U-Boot
by Ayrton Leyssens 20 Jul '23

20 Jul '23

>From 99512830410551132e8f7577615b3af4f5f1c137 Mon Sep 17 00:00:00 2001 From: Ayrton Leyssens <ayrton.leyssens(a)scioteq.com> Date: Wed, 19 Jul 2023 11:27:19 +0200 Subject: [PATCH Add support for SPL mmc load redundant U-Boot This patch adds support for loading a redundant / second U-Boot from a MMC. In some cases you want to update U-Boot, to have a "selectable" bootloader and keep the "old" and "new" one. In this patch we use the environment for a user-defined variable. Maybe this could be extended to some other ways as well. Signed-off-by: Ayrton Leyssens <ayrton.leyssens(a)scioteq.com> --- common/spl/Kconfig | 29 +++++++++++++++++++++++++++++ common/spl/spl_mmc.c | 10 ++++++++++ 2 files changed, 39 insertions(+) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index bee231b583..2c0ffd4363 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -824,6 +824,25 @@ config SYS_MMCSD_FS_BOOT Enable MMC FS Boot mode. Partition is selected by option SYS_MMCSD_FS_BOOT_PARTITION. +config SYS_MMCSD_FS_BOOT_PARTITION_FAILSAFE + bool "Use MMC Boot Partition Failsafe" + depends on SYS_MMCSD_FS_BOOT + depends on SPL_ENV_SUPPORT + default false + help + Use a redundant partition to load U-Boot from. + +config SYS_MMCSD_FS_BOOT_PARTITION_SELECTOR + string "MMC Boot Partition Selector" + depends on SYS_MMCSD_FS_BOOT + depends on SYS_MMCSD_FS_BOOT_PARTITION_FAILSAFE + default "" + help + Environment variable in U-Boot to use for the partition selection + to boot U-Boot from. + A 1 selects the "normal" partition, any other value selects the + redundant partition. + config SYS_MMCSD_FS_BOOT_PARTITION int "MMC Boot Partition" depends on SYS_MMCSD_FS_BOOT @@ -833,6 +852,16 @@ config SYS_MMCSD_FS_BOOT_PARTITION used in fs mode. Use -1 as a special value to use the first bootable partition. +config SYS_MMCSD_FS_BOOT_PARTITION_REDUNDANT + int "MMC Boot Partition Redundant" + depends on SYS_MMCSD_FS_BOOT + depends on SYS_MMCSD_FS_BOOT_PARTITION_FAILSAFE + default 2 + help + Redundant Partition on the MMC to load U-Boot from when the MMC is being + used in fs mode. + Use -1 as a special value to use the first bootable partition. + config SPL_MMC_TINY bool "Tiny MMC framework in SPL" depends on SPL_MMC diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index a665091b00..bf804fabcc 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -10,6 +10,7 @@ #include <log.h> #include <part.h> #include <spl.h> +#include <env.h> #include <linux/compiler.h> #include <errno.h> #include <asm/u-boot.h> @@ -281,6 +282,7 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, int err = -ENOSYS; __maybe_unused int partition = CONFIG_SYS_MMCSD_FS_BOOT_PARTITION; + __maybe_unused int env_partition_selector = 0; #if CONFIG_SYS_MMCSD_FS_BOOT_PARTITION == -1 { @@ -303,7 +305,15 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, } } #endif +#ifdef CONFIG_SYS_MMCSD_FS_BOOT_PARTITION_FAILSAFE + env_init(); + env_relocate(); + env_partition_selector = env_get_ulong(CONFIG_SYS_MMCSD_FS_BOOT_PARTITION_SELECTOR, 10, 0); + + if (env_partition_selector != 1) + partition = CONFIG_SYS_MMCSD_FS_BOOT_PARTITION_REDUNDANT; +#endif #ifdef CONFIG_SPL_FS_FAT if (!spl_start_uboot()) { err = spl_load_image_fat_os(spl_image, bootdev, mmc_get_blk_desc(mmc), -- 2.25.1

2 3

[PATCH v4 0/4] SPL NVMe support
by Mayuresh Chitale 20 Jul '23

20 Jul '23

This patchset adds support to load images of the SPL's next booting stage from a NVMe device. Changes in v4: - Drop patch 4 - Modify patch 2 to use generic fs.h APIs Changes in v3: - Add generic API to fetch payload from Ext or FAT filesystems - Remove reduntant SPL_PCI_PNP config check Changes in v2: - Rebase on v2023.07-rc1 - Use uclass ID for blk APIs - Add support to load FIT images from ext filesystem Mayuresh Chitale (5): spl: Add Kconfig options for NVME spl: blk: Support loading images from fs nvme: pci: Enable for SPL spl: Support loading a FIT from ext FS common: spl: Add spl NVMe boot support Mayuresh Chitale (4): spl: Add Kconfig options for NVME spl: blk: Support loading images from fs nvme: pci: Enable for SPL common: spl: Add spl NVMe boot support arch/riscv/include/asm/spl.h | 1 + common/spl/Kconfig | 27 +++++++ common/spl/Makefile | 2 + common/spl/spl_blk_fs.c | 134 +++++++++++++++++++++++++++++++++++ common/spl/spl_nvme.c | 32 +++++++++ disk/part.c | 10 +-- drivers/Makefile | 1 + drivers/block/Kconfig | 7 ++ drivers/nvme/Makefile | 2 +- drivers/pci/Kconfig | 6 ++ include/spl.h | 3 + 11 files changed, 220 insertions(+), 5 deletions(-) create mode 100644 common/spl/spl_blk_fs.c create mode 100644 common/spl/spl_nvme.c -- 2.34.1

4 11

[PATCH 0/3] mmc: sdhci-cadence: SD6 controller support
by Piyush Malgujar 20 Jul '23

20 Jul '23

Added changes to support SD6 controller - Renamed the function which will be SD4 specific - Added SD6 controller support - Added debug option Dhananjay Kangude (3): mmc: sdhci-cadence: Rename functions to SD4 specific mmc: sdhci-cadence: SD6 Controller support mmc: sdhci-cadence: Add debug option in sdhci-cadence driver drivers/mmc/Kconfig | 9 + drivers/mmc/sdhci-cadence.c | 1460 ++++++++++++++++++++++++++++++++++- 2 files changed, 1429 insertions(+), 40 deletions(-) -- 2.17.1

2 5

[PATCH] i2c: i2c-gpio: Correctly handle new {sda,scl}-gpios bindings
by Chris Packham 20 Jul '23

20 Jul '23

gpio_request_list_by_name() returns the number of gpios requested. Notably it swallows the underlying -ENOENT when the "gpios" property does not exist. Update the i2c-gpio driver to check for ret == 0 before trying the new sda-gpios/scl-gpios properties. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- drivers/i2c/i2c-gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/i2c-gpio.c b/drivers/i2c/i2c-gpio.c index 4ed9e9e7cddd..c1fc290bd253 100644 --- a/drivers/i2c/i2c-gpio.c +++ b/drivers/i2c/i2c-gpio.c @@ -339,7 +339,7 @@ static int i2c_gpio_of_to_plat(struct udevice *dev) /* "gpios" is deprecated and replaced by "sda-gpios" + "scl-gpios". */ ret = gpio_request_list_by_name(dev, "gpios", bus->gpios, ARRAY_SIZE(bus->gpios), 0); - if (ret == -ENOENT) { + if (ret == 0) { ret = gpio_request_by_name(dev, "sda-gpios", 0, &bus->gpios[PIN_SDA], 0); if (ret < 0) -- 2.41.0

1 0

[PATCH v2 0/6] introduce EFI_RAM_DISK_PROTOCOL
by Masahisa Kojima 20 Jul '23

20 Jul '23

This series introduces the EFI_RAM_DISK_PROTOCOL implementation. The major purpose of this series is a preparation for EFI HTTP(S) boot. Now U-Boot can download the distro installer ISO image via wget or tftpboot commands, but U-Boot can not mount the downloaded ISO image. By calling EFI_RAM_DISK_PROTOCOL->register API, user can mount the ISO image and boot the distro installer. Note that the installation process may not proceed after the distro installer calls ExitBootServices() since there is no hand-off process for the block device of memory mapped ISO image. The EFI_RAM_DISK_PROTOCOL was tested with the debian network installer[1] on qemu_arm64 platform. The example procedure is as follows. => tftpboot 41000000 mini.iso => efidebug disk mount 41000000 $filesize or => ramdisk mount 41000000 $filesize ramdisk command works without CONFIG_EFI_LOADER enabled. After these commands, ISO image is mounted like: => efidebug dh 000000007eec63f0 (ramdisk_blk#0) /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/RamDisk(0x41000000,4974afff,3d5abd30-4175-87ce-6d64-d2ade523c4bb,0x0) Block IO 000000007eec6560 (ramdisk_blk#0:1) /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/RamDisk(0x41000000,4974afff,3d5abd30-4175-87ce-6d64-d2ade523c4bb,0x0)/HD(1,0x01,0,0x0,0x33800) Block IO 000000007eec66d0 (ramdisk_blk#0:2) /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/RamDisk(0x41000000,4974afff,3d5abd30-4175-87ce-6d64-d2ade523c4bb,0x0)/HD(2,0x01,0,0x33800,0x10000) Block IO System Partition Simple File System => dm tree -s ramdisk 0 [ + ] ramdisk |-- ramdisk0 blk 0 [ + ] ramdisk_blk | `-- ramdisk_blk#0 partition 0 [ + ] blk_partition | |-- ramdisk_blk#0:1 partition 1 [ + ] blk_partition | `-- ramdisk_blk#0:2 Debian can be successfully installed with this ramdisk on QEMU. The created ramdisk can be accessed by the existing commands such as 'fatls': => fatls ramdisk 0:2 [TODO] - add ramdisk command documentation - add ramdisk command dm test [1] https://deb.debian.org/debian/dists/bookworm/main/installer-arm64/current/i… [Changelog] v1 -> v2 - implement ramdisk uclass and driver, then EFI_RAM_DISK_PROTOCOL is implemented based on the ramdisk uclass Masahisa Kojima (6): efi_loader: add RAM disk device path ramdisk: add ramdisk uclass and driver cmd: ramdisk: add ramdisk control command efi_loader: add EFI_RAM_DISK_PROTOCOL implementation cmd: efidebug: add RAM disk mount command efi_selftest: add EFI_RAM_DISK_PROTOCOL selftest cmd/Kconfig | 7 + cmd/Makefile | 1 + cmd/efidebug.c | 118 ++++++ cmd/ramdisk.c | 92 ++++ disk/part.c | 3 + drivers/block/Kconfig | 7 +- drivers/block/Makefile | 2 + drivers/block/blk-uclass.c | 1 + drivers/block/blk_ramdisk.c | 187 +++++++++ drivers/block/ramdisk-uclass.c | 14 + include/dm/uclass-id.h | 1 + include/efi_api.h | 32 ++ include/efi_loader.h | 4 + include/ramdisk.h | 32 ++ lib/efi_loader/Kconfig | 7 + lib/efi_loader/Makefile | 1 + lib/efi_loader/efi_device_path.c | 25 ++ lib/efi_loader/efi_device_path_to_text.c | 14 + lib/efi_loader/efi_ram_disk.c | 142 +++++++ lib/efi_loader/efi_setup.c | 6 + lib/efi_selftest/Makefile | 1 + lib/efi_selftest/efi_selftest_ram_disk.c | 511 +++++++++++++++++++++++ lib/uuid.c | 4 + 23 files changed, 1211 insertions(+), 1 deletion(-) create mode 100644 cmd/ramdisk.c create mode 100644 drivers/block/blk_ramdisk.c create mode 100644 drivers/block/ramdisk-uclass.c create mode 100644 include/ramdisk.h create mode 100644 lib/efi_loader/efi_ram_disk.c create mode 100644 lib/efi_selftest/efi_selftest_ram_disk.c base-commit: e2e2aea5733f0d23cd9593bbefe5c803c552dcb9 -- 2.34.1

4 16

[PATCH v3 0/9] rockchip: Fix PCIe and NVMe support on RK3568
by Jonas Karlman 19 Jul '23

19 Jul '23

This series fixes and enables PCIe and NVMe support on RK3568. Patch 1 adds a dev_read_addr_size_index_ptr function. Patch 2-3 fixes main issue in the driver to be usable on RK3568. Patch 4 fixes a long wait time during probe when no device is attached. Patch 5 hides BARs of the root complex that could claim the entire memory region during PCI autoconfig. Patch 6 adds support for the gpios prop to the fixed regulators driver. Patch 7 adds a missing clock to the clock driver. Patch 8 enables PCIe and NVMe support on rk3568-rock-3a. Patch 9 updates the device tree with new reg and ranges values. I have tested that a Samsung 970 EVO NVMe is detected on a ROCK 3A, BusDevFun VendorId DeviceId Device Class Sub-Class 01.00.00 0x1d87 0x3566 Bridge device 0x04 02.00.00 0x144d 0xa808 Mass storage controller 0x08 and I have also verified that the network controller continues to be detected on a ROCK 5B. BusDevFun VendorId DeviceId Device Class Sub-Class 00.00.00 0x1d87 0x3588 Bridge device 0x04 01.00.00 0x10ec 0x8125 Network controller 0x00 Changed in v3: - Rebased on master branch, all dependencies has been merged. - Remove rk3568-rock-3a pcie2x1 workaround added in v2, basic reference counting of gpio regulators series has been merged. - Enable options for AHCI/SCSI on rk3568-rock-3a. - Collect r-b tags. Changes in v2: - Rebased on custodians/u-boot-rockchip master branch and the defconfig and spi v2 series at [1]. - Drop dependency on basic reference counting of gpio regulators series, pcie2x1 is disabled for rk3568-rock-3a to avoid a system freeze due to disable of a shared vpcie3v3-supply regulator while in use by pcie3x2. - Add and use dev_read_addr_size_index_ptr function. - Update commit messages. - Collect r-b tags. This series can also be found at [2]. [1] https://patchwork.ozlabs.org/project/uboot/cover/20230517182624.1765359-1-j… [2] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3568-pcie-v3 Jonas Karlman (9): core: read: add dev_read_addr_size_index_ptr function pci: pcie_dw_rockchip: Get config region from reg prop pci: pcie_dw_rockchip: Use regulator_set_enable_if_allowed pci: pcie_dw_rockchip: Speed up link probe pci: pcie_dw_rockchip: Hide BARs of the root complex regulator: fixed: Add support for gpios prop rockchip: clk: clk_rk3568: Add CLK_PCIEPHY2_REF support rockchip: rk3568-rock-3a: Enable PCIe and NVMe support rockchip: rk356x: Update PCIe config, IO and memory regions arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 14 +++ arch/arm/dts/rk3568.dtsi | 14 +-- arch/arm/dts/rk356x.dtsi | 7 +- configs/rock-3a-rk3568_defconfig | 9 ++ drivers/clk/rockchip/clk_rk3568.c | 1 + drivers/core/read.c | 11 +++ drivers/pci/pcie_dw_common.c | 10 +- drivers/pci/pcie_dw_rockchip.c | 120 +++++++++++++++--------- drivers/power/regulator/fixed.c | 4 +- include/dm/read.h | 21 +++++ 10 files changed, 155 insertions(+), 56 deletions(-) -- 2.41.0

2 11

[PATCH v4 1/2] board/km/cent2: add include common.h
by christian.taedcke-oss＠weidmueller.com 19 Jul '23

19 Jul '23

From: Christian Taedcke <christian.taedcke(a)weidmueller.com> Including common.h before event.h is required, because the new fpga load event in event.h uses the size_t type. Signed-off-by: Christian Taedcke <christian.taedcke(a)weidmueller.com> --- Changes in v4: - add include common.h to kmcent2 board file board/keymile/kmcent2/kmcent2.c | 1 + 1 file changed, 1 insertion(+) diff --git a/board/keymile/kmcent2/kmcent2.c b/board/keymile/kmcent2/kmcent2.c index ed552c57b5..6dbaaa5457 100644 --- a/board/keymile/kmcent2/kmcent2.c +++ b/board/keymile/kmcent2/kmcent2.c @@ -6,6 +6,7 @@ * Copyright 2013 Freescale Semiconductor, Inc. */ +#include <common.h> #include <event.h> #include <asm/cache.h> #include <asm/fsl_fdt.h> -- 2.34.1

3 4

[PATCH v2 0/2] efi_loader: support all uclasses in device path
by Heinrich Schuchardt 19 Jul '23

19 Jul '23

On devices with multiple USB mass storage devices errors like Path /../USB(0x0,0x0)/USB(0x1,0x0)/Ctrl(0x0) already installed. are seen. This is due to creating non-unique device paths. To uniquely identify devices we must provide path nodes for all devices on the path from the root device. Add support for generating device path nodes for all uclasses. v2: Add a prerequisite patch for BLKMAP, HOST, VIRTIO block devices Heinrich Schuchardt (2): efi_loader: fix dp_fill() for BLKMAP, HOST, VIRTIO efi_loader: support all uclasses in device path include/efi_api.h | 7 ++++ lib/efi_loader/efi_device_path.c | 68 +++++++++++++------------------- 2 files changed, 35 insertions(+), 40 deletions(-) -- 2.40.1

1 2

[GIT PULL] Please pull u-boot-mmc master
by Jaehoon Chung 19 Jul '23

19 Jul '23

Dear Tom, Please pull u-boot-mmc master into u-boot master branch. If there is any problem, let me know, plz. Best Regards, Jaehoon Chung CI: https://source.denx.de/u-boot/custodians/u-boot-mmc/-/pipelines/16946 The following changes since commit 13aa090b87a0fbdfe690011669b9fdb96bb1ccc7: Merge https://source.denx.de/u-boot/custodians/u-boot-x86 (2023-07-17 10:38:28 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-mmc.git master for you to fetch changes up to 50dee4f3610331cc31f1f02f9d4116b716907011: mmc: Set clock when reverting to safe bus mode (2023-07-18 09:17:29 +0900) ---------------------------------------------------------------- Hai Pham (2): mmc: Introduce mmc_send_stop_transmission() mmc: renesas-sdhi: Send stop when MMC tuning command fails Marek Vasut (1): mmc: Fix MMC_CMD_STOP_TRANSMISSION response type and add comment Valentine Barshak (1): mmc: Set clock when reverting to safe bus mode drivers/mmc/mmc.c | 26 ++++++++++++++++++++++---- drivers/mmc/renesas-sdhi.c | 11 +++++++++++ include/mmc.h | 2 ++ 3 files changed, 35 insertions(+), 4 deletions(-)

2 1

Double free on xhci_register failure.
by Richard Habeeb 19 Jul '23

19 Jul '23

Hi all, drivers/core/device.c will call `device_free()` after xhci_register already frees the private device data. This causes a memory corruption and crash on my RPI4B. I believe the solution is to remove the free call in xhci_register ( https://github.com/u-boot/u-boot/blob/master/drivers/usb/host/xhci.c#L1421), thoughts? -Richard Habeeb

3 2