December 2023 - U-Boot

[PATCH v2 0/9] Handoff bloblist from previous boot stage
by Raymond Mao 22 Dec '23

22 Dec '23

This patch set depends on another series: "[PATCH v3 00/14] Support Firmware Handoff spec via bloblist". This patch set implements Qemu-Arm platform custom functions to retrieve the bloblist (aka. Transfer List) from previous loader via boot arguments when CONFIG_OF_BOARD option is enabled and all boot arguments are compliant to the register conventions defined in the Firmware Handoff spec v0.9. Qemu-Arm platform custom function will load the FDT from the bloblist if it exists. Otherwise it fallbacks to get the FDT from the specified memory address. If a platform vendor wish to have different behaviors for loading bloblist or FDT from the previous boot stage, it is required to implement the custom functions board_bloblist_from_boot_arg() and board_fdt_blob_setup(). Raymond Mao (9): bloblist: add API to check the register conventions bloblist: check bloblist with specified buffer size bloblist: refactor of bloblist_reloc() arm: armv7: save boot arguments arm: armv8: save boot arguments qemu-arm: Get bloblist from boot arguments bloblist: Load the bloblist from the previous loader fdt: update the document and Kconfig description qemu-arm: get FDT from bloblist arch/arm/cpu/armv7/start.S | 12 +++++ arch/arm/cpu/armv8/start.S | 14 ++++++ board/emulation/qemu-arm/qemu-arm.c | 45 +++++++++++++++++- common/bloblist.c | 72 ++++++++++++++++++++--------- common/board_f.c | 8 +--- configs/qemu_arm64_defconfig | 3 ++ doc/develop/devicetree/control.rst | 6 +-- dts/Kconfig | 7 ++- include/bloblist.h | 34 ++++++++++++-- test/bloblist.c | 8 ++-- 10 files changed, 165 insertions(+), 44 deletions(-) -- 2.25.1

2 18

[PATCH 1/1] bootmeth: pass size to efi_binary_run()
by Heinrich Schuchardt 22 Dec '23

22 Dec '23

If we call efi_binary_run() with size parameter set to zero, we get an error Not a PE-COFF file Fill the missing value. Fixes: 1373ffde52e1 ("Merge tag 'v2024.01-rc5' into next") Fixes: 7017fc54a5bc ("bootmeth: use efi_loader interfaces instead of bootefi command") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- boot/bootmeth_efi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c index 00060f7d25..c4eb331d69 100644 --- a/boot/bootmeth_efi.c +++ b/boot/bootmeth_efi.c @@ -454,12 +454,12 @@ static int distro_efi_boot(struct udevice *dev, struct bootflow *bflow) if (bflow->flags & BOOTFLOWF_USE_BUILTIN_FDT) { log_debug("Booting with built-in fdt\n"); - if (efi_binary_run(map_sysmem(kernel, 0), 0, + if (efi_binary_run(map_sysmem(kernel, 0), bflow->size, EFI_FDT_USE_INTERNAL)) return log_msg_ret("run", -EINVAL); } else { log_debug("Booting with external fdt\n"); - if (efi_binary_run(map_sysmem(kernel, 0), 0, + if (efi_binary_run(map_sysmem(kernel, 0), bflow->size, map_sysmem(fdt, 0))) return log_msg_ret("run", -EINVAL); } -- 2.43.0

4 5

[PATCH v3 0/7] rpi5: initial support
by Ivan T. Ivanov 22 Dec '23

22 Dec '23

Hi, These patches are adding basic support for RPi5. They are based on v2 series from Dmitry Malkin[1]. With them I am able to _start_ current openSUSE Tumbleweed without modification. They are still a lot of things to be added to the upstream Linux before it runs flawlessly on this device, but at least in U-Booot SD controller used for uSD card and Frameboffer and HDMI0 devices are working fine now. It seems that PCIe controller is working fine too, but I have not tested it too much. Serial console and reset are also functional. Hopefully this will help others add missing pieces more easily. Happy hacking! Regards, Ivan [1] https://lore.kernel.org/all/CAKRNjQ0dsWozGo4n8g58m4cCEk3n=qx1R+L24WBgpo-iP1… Dmitry Malkin (2): rpi5: add initial memory map for bcm2712 rpi5: Use devicetree as alternative way to read IO base addresses Ivan T. Ivanov (5): rpi5: Use devicetree to retrieve board revision bcm2835: brcm,bcm2708-fb device is using r5g6b5 format mmc: bcmstb: Add support for bcm2712 SD controller configs: rpi_arm64: enable SDHCI BCMSTB driver pci: pcie-brcmstb: Add bcm2712 PCIe controller support arch/arm/mach-bcm283x/include/mach/base.h | 5 +- arch/arm/mach-bcm283x/include/mach/mbox.h | 3 +- arch/arm/mach-bcm283x/include/mach/sdhci.h | 3 +- arch/arm/mach-bcm283x/include/mach/timer.h | 3 +- arch/arm/mach-bcm283x/include/mach/wdog.h | 3 +- arch/arm/mach-bcm283x/init.c | 81 ++++++++-- board/raspberrypi/rpi/rpi.c | 22 ++- configs/rpi_arm64_defconfig | 1 + drivers/mmc/bcmstb_sdhci.c | 173 ++++++++++++++++++++- drivers/pci/pcie_brcmstb.c | 23 ++- drivers/video/bcm2835.c | 10 +- 11 files changed, 296 insertions(+), 31 deletions(-) -- 2.35.3

8 28

[PATCH v3 00/22] Complete decoupling of bootm logic from commands
by Simon Glass 22 Dec '23

22 Dec '23

This series continues refactoring the bootm code to allow it to be used with CONFIG_COMMAND disabled. The OS-handling code is refactored and a new bootm_run() function is created to run through the bootm stages. This completes the work. A booti_go() function is created also, in case it proves useful, but at last for now standard boot does not use this. This is cmdd (part d of CMDLINE refactoring) It depends on dm/bootstda-working which depends on dm/cmdc-working Changes in v3: - Rename addr_fit to addr_img in struct bootm_info - Rename addr_fit to addr_img in struct bootm_info - Enable CONFIG_MEASURED_BOOT always and rely on CONFIG_MEASURED_BOOT - Rename addr_fit to addr_img in struct bootm_info - Add new boot_run() function Changes in v2: - Add new patch to enable more bootm OS methods in sandbox - Split addition of struct bootm_info to its own patch - Split changing of boot_os_fn parameters to a separate patch - Split out adding the rest of struct bootm_info fields to separate patch - Split out patch to move do_bootm_states() comment to header - Split out booti removal of #ifdef - Split out bootz removal of #ifdef - Adjust patch to focus just on dropping the do_bootm_states() arguments - Split do_bootm_states() rename to a separate patch - Rework series to allow OS access to cmdline arguments for bootm Simon Glass (22): mips: Add a reset_cpu() function m68k: Add a reset_cpu() function ppc: Add a reset_cpu() function nios2: Add a reset_cpu() function riscv: Add a reset_cpu() function bootm: Adjust how the board is reset sandbox: bootm: Enable more bootm OS methods bootm: Create a struct for argument information bootm: Adjust arguments of boot_os_fn bootm: Add more fields to bootm_info bootm: Move do_bootm_states() comment to header file booti: Avoid use of #ifdef bootz: Avoid use of #ifdef bootm: Drop arguments from do_bootm_states() bootm: Rename do_bootm_states() to bootm_run_states() bootm: Tidy up boot_selected_os() bootm: Create a function to run through the bootm states stm32: Use local vars in stm32prog for initrd and fdt bootm: Create a function to run through the bootz states stm32: Use bootm_run() and bootz_run() bootm: Create a function to run through the booti states bootm: Create a new boot_run() function to handle booting arch/arc/lib/bootm.c | 5 +- arch/arm/lib/bootm.c | 6 +- .../cmd_stm32prog/cmd_stm32prog.c | 33 ++-- arch/m68k/lib/bootm.c | 5 +- arch/m68k/lib/traps.c | 7 + arch/microblaze/lib/bootm.c | 6 +- arch/mips/cpu/cpu.c | 8 +- arch/mips/lib/bootm.c | 8 +- arch/nios2/cpu/cpu.c | 8 +- arch/nios2/lib/bootm.c | 10 +- arch/powerpc/lib/bootm.c | 5 +- arch/powerpc/lib/traps.c | 10 ++ arch/riscv/cpu/cpu.c | 13 ++ arch/riscv/lib/bootm.c | 11 +- arch/riscv/lib/reset.c | 7 +- arch/sandbox/cpu/cpu.c | 8 + arch/sandbox/lib/bootm.c | 5 +- arch/sh/lib/bootm.c | 6 +- arch/x86/lib/bootm.c | 6 +- arch/xtensa/lib/bootm.c | 4 +- boot/bootm.c | 119 ++++++++------- boot/bootm_os.c | 78 +++++----- cmd/booti.c | 55 ++++--- cmd/bootm.c | 43 ++++-- cmd/bootz.c | 35 +++-- configs/sandbox_defconfig | 3 +- include/bootm.h | 142 ++++++++++++++++-- 27 files changed, 444 insertions(+), 202 deletions(-) -- 2.43.0.472.g3155946c3a-goog

2 30

[PATCH v3] pci: Enable dm_pci_map_bar() for 64-bit BARs
by Moritz Fischer 21 Dec '23

21 Dec '23

Allow dm_pci_map_bar() usage on systems with CONFIG_SYS_PCI_64BIT. Reviewed-by: Philip Oberfichtner <pro(a)denx.de> Reviewed-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Moritz Fischer <moritzf(a)google.com> --- Changes from V2: - Turned IS_ENABLED() into #if defined to allow building on platforms that don't define CONFIG_SYS_PCI_64BIT Changes from V1: - Reworded commit message / typo --- drivers/pci/pci-uclass.c | 12 ++++++++++++ include/pci.h | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index e0d01f6a85..04c82d3884 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1611,6 +1611,18 @@ void *dm_pci_map_bar(struct udevice *dev, int bar, size_t offset, size_t len, dm_pci_read_config32(udev, bar, &bar_response); pci_bus_addr = (pci_addr_t)(bar_response & ~0xf); +#if defined(CONFIG_SYS_PCI_64BIT) + /* + * This assumes that dm_pciauto_setup_device() will allocate + * a 64-bit address if CONFIG_SYS_PCI_64BIT is enabled and + * the device advertises that it supports it. + */ + if (bar_response & PCI_BASE_ADDRESS_MEM_TYPE_64) { + dm_pci_read_config32(udev, bar + 4, &bar_response); + pci_bus_addr |= (pci_addr_t)bar_response << 32; + } +#endif /* CONFIG_SYS_PCI_64BIT */ + if (~((pci_addr_t)0) - pci_bus_addr < offset) return NULL; diff --git a/include/pci.h b/include/pci.h index 2f5eb30b83..0d1ac7b015 100644 --- a/include/pci.h +++ b/include/pci.h @@ -1350,8 +1350,8 @@ pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t addr, size_t len, * * Looks up a base address register and finds the physical memory address * that corresponds to it. - * Can be used for 32b BARs 0-5 on type 0 functions and for 32b BARs 0-1 on - * type 1 functions. + * Can be used for 32b/64b BARs 0-5 on type 0 functions and for 32b BARs 0-1 + * on type 1 functions. * Can also be used on type 0 functions that support Enhanced Allocation for * 32b/64b BARs. Note that duplicate BEI entries are not supported. * -- 2.43.0.472.g3155946c3a-goog

1 0

[PATCH v2 RESEND] pci: Enable dm_pci_map_bar() for 64-bit BARs
by Moritz Fischer 21 Dec '23

21 Dec '23

Allow dm_pci_map_bar() usage on systems with CONFIG_SYS_PCI_64BIT. Reviewed-by: Philip Oberfichtner <pro(a)denx.de> Reviewed-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Moritz Fischer <moritzf(a)google.com> --- drivers/pci/pci-uclass.c | 11 +++++++++++ include/pci.h | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index e0d01f6a85..82308c7477 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -1611,6 +1611,17 @@ void *dm_pci_map_bar(struct udevice *dev, int bar, size_t offset, size_t len, dm_pci_read_config32(udev, bar, &bar_response); pci_bus_addr = (pci_addr_t)(bar_response & ~0xf); + /* + * This assumes that dm_pciauto_setup_device() will allocate + * a 64-bit address if CONFIG_SYS_PCI_64BIT is enabled and + * the device advertises that it supports it. + */ + if (IS_ENABLED(CONFIG_SYS_PCI_64BIT) && + (bar_response & PCI_BASE_ADDRESS_MEM_TYPE_64)) { + dm_pci_read_config32(udev, bar + 4, &bar_response); + pci_bus_addr |= (pci_addr_t)bar_response << 32; + } + if (~((pci_addr_t)0) - pci_bus_addr < offset) return NULL; diff --git a/include/pci.h b/include/pci.h index 2f5eb30b83..0d1ac7b015 100644 --- a/include/pci.h +++ b/include/pci.h @@ -1350,8 +1350,8 @@ pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t addr, size_t len, * * Looks up a base address register and finds the physical memory address * that corresponds to it. - * Can be used for 32b BARs 0-5 on type 0 functions and for 32b BARs 0-1 on - * type 1 functions. + * Can be used for 32b/64b BARs 0-5 on type 0 functions and for 32b BARs 0-1 + * on type 1 functions. * Can also be used on type 0 functions that support Enhanced Allocation for * 32b/64b BARs. Note that duplicate BEI entries are not supported. * -- 2.43.0.472.g3155946c3a-goog

2 2

[PATCH] lib: rsa: Print detailed error info in rsa_engine_init() on engine resolution failure
by Csókás Bence 21 Dec '23

21 Dec '23

Signed-off-by: Csókás Bence <csokas.bence(a)prolan.hu> --- lib/rsa/rsa-sign.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/rsa/rsa-sign.c b/lib/rsa/rsa-sign.c index d20bdb58a5..0d67a80b82 100644 --- a/lib/rsa/rsa-sign.c +++ b/lib/rsa/rsa-sign.c @@ -317,7 +317,8 @@ static int rsa_engine_init(const char *engine_id, ENGINE **pe) e = ENGINE_by_id(engine_id); if (!e) { - fprintf(stderr, "Engine isn't available\n"); + fprintf(stderr, "Engine '%s' isn't available\n", engine_id); + ERR_print_errors_fp(stderr); return -1; } -- 2.25.1

2 4

[PATCH] board/keymile/kmcent2: fix update-nor indentation
by Tomas Alvarez Vanoli 21 Dec '23

21 Dec '23

variable was indented as part of the value of the previous variable. Signed-off-by: Tomas Alvarez Vanoli <tomas.alvarez-vanoli(a)hitachienergy.com> Signed-off-by: Holger Brunck <holger.brunck(a)hitachienergy.com> --- board/keymile/kmcent2/kmcent2.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/keymile/kmcent2/kmcent2.env b/board/keymile/kmcent2/kmcent2.env index efa762e558..dc5508e315 100644 --- a/board/keymile/kmcent2/kmcent2.env +++ b/board/keymile/kmcent2/kmcent2.env @@ -21,7 +21,7 @@ update=protect off CONFIG_SYS_MONITOR_BASE +${filesize} && erase CONFIG_SYS_MONITOR_BASE +${filesize} && cp.b ${load_addr_r} CONFIG_SYS_MONITOR_BASE ${filesize} && protect on CONFIG_SYS_MONITOR_BASE +${filesize} - update-nor=protect off CONFIG_SYS_FLASH_BASE +${filesize} && +update-nor=protect off CONFIG_SYS_FLASH_BASE +${filesize} && erase CONFIG_SYS_FLASH_BASE +${filesize} && cp.b ${load_addr_r} CONFIG_SYS_FLASH_BASE ${filesize} && protect on CONFIG_SYS_MONITOR_BASE +CONFIG_SYS_MONITOR_LEN -- 2.39.3

2 1

[PATCH 0/3] Qualcomm quirky SMMU support
by Caleb Connolly 21 Dec '23

21 Dec '23

Qualcomm platforms are heavily locked down, in many cases offering no way for users to gain EL2 or EL3 code execution and including many additional security features. Among these are modifications made to the SMMU behaviour (done by having the hypervisor intercept register accesses). On many platforms it is not possible to disable the SMMU, and not possible to configure streams in BYPASS. To enable support for peripherals like USB which depend on DMA, we must allocate a context bank on the SMMU and configure an IDENTITY mapping. This patch series fixes support for building IOMMU without CONFIG_PCI. Then, it introduces first introduces support for a .connect() op in IOMMU drivers, this is called before the peripheral drivers .probe() function and allows for IOMMU devices to perform one-time setup. Lastly, introduce a new driver which supports the SMMU as found on Qualcomm platforms, when a DMA capable peripherals is probed, this driver will first see if the previous stage bootloader configured a context bank for the given stream ID already, and if not then it allocates and configures one so that DMA accesses will work. There are no in-tree users for this driver yet, however it is required for upcoming USB support on SDM845 and future Qualcomm platforms. --- Caleb Connolly (3): iommu: fix compilation when CONFIG_PCI disabled iommu: add a connect op iommu: add qcom-hyp-smmu drivers/iommu/Kconfig | 16 ++ drivers/iommu/Makefile | 1 + drivers/iommu/iommu-uclass.c | 16 +- drivers/iommu/qcom-hyp-smmu.c | 396 ++++++++++++++++++++++++++++++++++++++++++ include/iommu.h | 9 + 5 files changed, 436 insertions(+), 2 deletions(-) --- base-commit: 8806443ed784dad5b5daf351b0175acb3343e729 // Caleb (they/them)

4 11

[PATCH v1] configs: verdin-am62: Disable SPL FIT Overlay
by Francesco Dolcini 21 Dec '23

21 Dec '23

From: Francesco Dolcini <francesco.dolcini(a)toradex.com> Disable CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY, this is not required nor used on verdin am62, disable it to save precious binary size. Update defconfig using savedefconfig, this adds CONFIG_OF_LIBFDT_OVERLAY explicitly. Signed-off-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> --- configs/verdin-am62_a53_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/verdin-am62_a53_defconfig b/configs/verdin-am62_a53_defconfig index 780860180879..cdd6ba8baed4 100644 --- a/configs/verdin-am62_a53_defconfig +++ b/configs/verdin-am62_a53_defconfig @@ -17,6 +17,7 @@ CONFIG_ENV_OFFSET=0xFFFFDE00 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="k3-am625-verdin-wifi-dev" CONFIG_SPL_TEXT_BASE=0x80080000 +CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_SPL_MMC=y CONFIG_SPL_SERIAL=y @@ -33,7 +34,6 @@ CONFIG_SYS_MEMTEST_END=0xB0000000 CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000 -CONFIG_SPL_LOAD_FIT_APPLY_OVERLAY=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=1 -- 2.25.1

3 2