January 2025 - U-Boot

[PATCH v2 0/4] Enable bloblist support on Vexpress64
by Harrison Mutai 27 Jan '25

27 Jan '25

This series of patches enhances the vexpress64 platform by enabling bloblist support. It also introduces support for CONFIG_BLOBLIST_PASSAGE. This is necessary to boot vexpress64 and other boards without manually specifying a fixed address and size for the bloblist. After this change, all the bloblist init modes are supported (i.e., fixed, alloc, passage) and Vexpress64 boots with CONFIG_BLOBLIST_PASSAGE. Changes in v2: * The commit body for the typo fix was expanded. * The default BLOBLIST_RELOC_SIZE was removed when CONFIG_BLOBLIST_PASSAGE is enabled, the relocation size depends on the size of bloblist received. Harrison Mutai (4): bloblist: fix typo in code comments board: vexpress64: default to hardware device tree bloblist: add support for CONFIG_BLOBLIST_PASSAGE board: vexpress64: enable bloblist for SPL handoff board/armltd/vexpress64/Makefile | 3 ++- board/armltd/vexpress64/vexpress64.c | 4 ++++ common/Kconfig | 10 ++++++++-- common/bloblist.c | 5 ++++- configs/vexpress_fvp_bloblist_defconfig | 5 +++++ doc/board/armltd/vexpress64.rst | 16 ++++++++++++++++ include/bloblist.h | 2 +- include/configs/vexpress_aemv8.h | 6 ++++-- 8 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 configs/vexpress_fvp_bloblist_defconfig -- 2.46.2

3 14

[PATCH v2 0/2] efi_loader: efi_net: Fix net_dp handling
by Adriano Cordova 27 Jan '25

27 Jan '25

Fixes commit e55a4acb54e8 ("efi_loader: net: set EFI bootdevice device path to HTTP when loaded from wget") which generates an use after free, but first it is necessary to expose efi_reinstall_protocol_interfaces in efi_loader.h, which is done in a separated patch. Adriano Cordova (2): efi_loader: Expose efi_reinstall_protocol_interface in efi_loader.h efi_loader: efi_net: let efi_net_set_dp properly update the device path include/efi_loader.h | 5 +++ lib/efi_loader/efi_boottime.c | 2 +- lib/efi_loader/efi_net.c | 61 +++++++++++++++++++++++++++++------ 3 files changed, 58 insertions(+), 10 deletions(-) -- 2.43.0

4 6

[PATCH v3 1/2] efi_loader: Expose efi_reinstall_protocol_interface in efi_loader.h
by Adriano Cordova 27 Jan '25

27 Jan '25

This is done so that the device path protocol interface of the network device can be changed internally by u-boot when a new bootfile gets downloaded. Signed-off-by: Adriano Cordova <adriano.cordova(a)canonical.com> --- (no changes since v2) Changes in v2: added commit message include/efi_loader.h | 5 +++++ lib/efi_loader/efi_boottime.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index 9afbec35ebf..0d858c1e12e 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -711,6 +711,11 @@ efi_status_t efi_search_protocol(const efi_handle_t handle, efi_status_t efi_add_protocol(const efi_handle_t handle, const efi_guid_t *protocol, void *protocol_interface); +/* Reinstall a protocol on a handle */ +efi_status_t EFIAPI efi_reinstall_protocol_interface( + efi_handle_t handle, + const efi_guid_t *protocol, + void *old_interface, void *new_interface); /* Open protocol */ efi_status_t efi_protocol_open(struct efi_handler *handler, void **protocol_interface, void *agent_handle, diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 080e7f78ae3..58716fa7953 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -3733,7 +3733,7 @@ out: * * Return: status code */ -static efi_status_t EFIAPI efi_reinstall_protocol_interface( +efi_status_t EFIAPI efi_reinstall_protocol_interface( efi_handle_t handle, const efi_guid_t *protocol, void *old_interface, void *new_interface) { -- 2.43.0

1 1

[PATCH] net: fsl_enetc: Enable optional ENETREF clock on i.MX95
by Marek Vasut 27 Jan '25

27 Jan '25

The ENETCv4 port DT nodes on i.MX95 may contain optional clock phandle to IMX95_CLK_ENETREF "ref" clock. These "ref" clock must be enabled for the ethernet to work. These "ref" clock are enabled after cold boot, but when the system booted Linux and rebooted, those "ref" clock might have been disabled in the process, which would make ethernet inoperable after reboot. Make sure those "ref" clock are always correctly enabled. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Alice Guo <alice.guo(a)nxp.com> Cc: Fabio Estevam <festevam(a)denx.de> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Tim Harvey <tharvey(a)gateworks.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: Ye Li <ye.li(a)nxp.com> Cc: u-boot(a)lists.denx.de --- drivers/net/fsl_enetc.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c index 67ef5f34a8a..52fa820f518 100644 --- a/drivers/net/fsl_enetc.c +++ b/drivers/net/fsl_enetc.c @@ -5,6 +5,7 @@ * Copyright 2023-2025 NXP */ +#include <clk.h> #include <dm.h> #include <errno.h> #include <fdt_support.h> @@ -981,11 +982,31 @@ static const struct eth_ops enetc_ops_imx = { .read_rom_hwaddr = enetc_read_rom_hwaddr, }; +static int enetc_probe_imx(struct udevice *dev) +{ + struct clk *clk; + int ret; + + clk = devm_clk_get_optional(dev, "ref"); + if (IS_ERR(clk)) + return PTR_ERR(clk); + + ret = clk_enable(clk); + if (ret) + return ret; + + ret = enetc_probe(dev); + if (ret) + clk_disable(clk); + + return ret; +} + U_BOOT_DRIVER(eth_enetc_imx) = { .name = ENETC_DRIVER_NAME, .id = UCLASS_ETH, .bind = enetc_bind, - .probe = enetc_probe, + .probe = enetc_probe_imx, .remove = enetc_remove, .ops = &enetc_ops_imx, .priv_auto = sizeof(struct enetc_priv), -- 2.45.2

2 1

[PATCH 01/10] pinctrl: imx: Push imx_pinctrl_ops into drivers and staticize
by Marek Vasut 27 Jan '25

27 Jan '25

Move imx_pinctrl_ops into drivers and staticize. This is preparatory patch for follow up pinctrl drivers which will not use this variant of imx_pinctrl_ops content. This should not change size, as most of the deployments compiled in one pinctrl driver anyway. No functional change. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Alice Guo <alice.guo(a)nxp.com> Cc: Jesse Taube <mr.bossman075(a)gmail.com> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Peter Robinson <pbrobinson(a)gmail.com> Cc: Tim Harvey <tharvey(a)gateworks.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)lists.denx.de --- drivers/pinctrl/nxp/pinctrl-imx.c | 6 +----- drivers/pinctrl/nxp/pinctrl-imx.h | 4 ++-- drivers/pinctrl/nxp/pinctrl-imx5.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imx6.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imx7.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imx7ulp.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imx8.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imx8m.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imx8ulp.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imx93.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imxrt.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-vf610.c | 4 ++++ 12 files changed, 43 insertions(+), 7 deletions(-) diff --git a/drivers/pinctrl/nxp/pinctrl-imx.c b/drivers/pinctrl/nxp/pinctrl-imx.c index 54cec37327c..3f055321c73 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx.c +++ b/drivers/pinctrl/nxp/pinctrl-imx.c @@ -18,7 +18,7 @@ DECLARE_GLOBAL_DATA_PTR; -static int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config) +int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config) { struct imx_pinctrl_priv *priv = dev_get_priv(dev); struct imx_pinctrl_soc_info *info = priv->info; @@ -194,10 +194,6 @@ static int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config) return 0; } -const struct pinctrl_ops imx_pinctrl_ops = { - .set_state = imx_pinctrl_set_state, -}; - int imx_pinctrl_probe(struct udevice *dev, struct imx_pinctrl_soc_info *info) { diff --git a/drivers/pinctrl/nxp/pinctrl-imx.h b/drivers/pinctrl/nxp/pinctrl-imx.h index fa4c084e2fc..02f05fdf20e 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx.h +++ b/drivers/pinctrl/nxp/pinctrl-imx.h @@ -28,8 +28,6 @@ struct imx_pinctrl_priv { struct imx_pinctrl_soc_info *info; }; -extern const struct pinctrl_ops imx_pinctrl_ops; - #define IMX_NO_PAD_CTL 0x80000000 /* no pin config need */ #define IMX_PAD_SION 0x40000000 /* set SION */ @@ -54,6 +52,8 @@ int imx_pinctrl_probe(struct udevice *dev, struct imx_pinctrl_soc_info *info); int imx_pinctrl_remove(struct udevice *dev); +int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config); + #ifdef CONFIG_PINCTRL_IMX_SCU int imx_pinctrl_scu_conf_pins(struct imx_pinctrl_soc_info *info, u32 *pin_data, int npins); diff --git a/drivers/pinctrl/nxp/pinctrl-imx5.c b/drivers/pinctrl/nxp/pinctrl-imx5.c index 6b690fdce8f..c17d396d2b2 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx5.c +++ b/drivers/pinctrl/nxp/pinctrl-imx5.c @@ -31,6 +31,10 @@ static const struct udevice_id imx5_pinctrl_match[] = { { /* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; + U_BOOT_DRIVER(imx5_pinctrl) = { .name = "imx5-pinctrl", .id = UCLASS_PINCTRL, diff --git a/drivers/pinctrl/nxp/pinctrl-imx6.c b/drivers/pinctrl/nxp/pinctrl-imx6.c index 322eec87ff5..2d3d4ceaa2b 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx6.c +++ b/drivers/pinctrl/nxp/pinctrl-imx6.c @@ -40,6 +40,10 @@ static const struct udevice_id imx6_pinctrl_match[] = { { /* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; + U_BOOT_DRIVER(fsl_imx6q_iomuxc) = { .name = "fsl_imx6q_iomuxc", .id = UCLASS_PINCTRL, diff --git a/drivers/pinctrl/nxp/pinctrl-imx7.c b/drivers/pinctrl/nxp/pinctrl-imx7.c index a8275e26456..2505f5df4a4 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx7.c +++ b/drivers/pinctrl/nxp/pinctrl-imx7.c @@ -28,6 +28,10 @@ static const struct udevice_id imx7_pinctrl_match[] = { { /* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; + U_BOOT_DRIVER(imx7_pinctrl) = { .name = "imx7-pinctrl", .id = UCLASS_PINCTRL, diff --git a/drivers/pinctrl/nxp/pinctrl-imx7ulp.c b/drivers/pinctrl/nxp/pinctrl-imx7ulp.c index 7ea2dbe7d36..7d732f5a505 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx7ulp.c +++ b/drivers/pinctrl/nxp/pinctrl-imx7ulp.c @@ -32,6 +32,10 @@ static const struct udevice_id imx7ulp_pinctrl_match[] = { { /* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; + U_BOOT_DRIVER(imx7ulp_pinctrl) = { .name = "imx7ulp-pinctrl", .id = UCLASS_PINCTRL, diff --git a/drivers/pinctrl/nxp/pinctrl-imx8.c b/drivers/pinctrl/nxp/pinctrl-imx8.c index 4e9a9ea6808..930de19075a 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx8.c +++ b/drivers/pinctrl/nxp/pinctrl-imx8.c @@ -29,6 +29,10 @@ static const struct udevice_id imx8_pinctrl_match[] = { { /* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; + U_BOOT_DRIVER(imx8_pinctrl) = { .name = "imx8_pinctrl", .id = UCLASS_PINCTRL, diff --git a/drivers/pinctrl/nxp/pinctrl-imx8m.c b/drivers/pinctrl/nxp/pinctrl-imx8m.c index 6ea66a080b2..d30a6eef351 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx8m.c +++ b/drivers/pinctrl/nxp/pinctrl-imx8m.c @@ -26,6 +26,10 @@ static const struct udevice_id imx8m_pinctrl_match[] = { { /* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; + U_BOOT_DRIVER(imx8mq_pinctrl) = { .name = "imx8mq-pinctrl", .id = UCLASS_PINCTRL, diff --git a/drivers/pinctrl/nxp/pinctrl-imx8ulp.c b/drivers/pinctrl/nxp/pinctrl-imx8ulp.c index 73d3c009d5b..0fb116a9893 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx8ulp.c +++ b/drivers/pinctrl/nxp/pinctrl-imx8ulp.c @@ -31,6 +31,10 @@ static const struct udevice_id imx8ulp_pinctrl_match[] = { { /* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; + U_BOOT_DRIVER(imx8ulp_pinctrl) = { .name = "imx8ulp-pinctrl", .id = UCLASS_PINCTRL, diff --git a/drivers/pinctrl/nxp/pinctrl-imx93.c b/drivers/pinctrl/nxp/pinctrl-imx93.c index 8d8ffec6d9a..2d027cd844e 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx93.c +++ b/drivers/pinctrl/nxp/pinctrl-imx93.c @@ -26,6 +26,10 @@ static const struct udevice_id imx93_pinctrl_match[] = { { /* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; + U_BOOT_DRIVER(imx93_pinctrl) = { .name = "imx93-pinctrl", .id = UCLASS_PINCTRL, diff --git a/drivers/pinctrl/nxp/pinctrl-imxrt.c b/drivers/pinctrl/nxp/pinctrl-imxrt.c index 23f07f8d1e0..fdb3cbe8190 100644 --- a/drivers/pinctrl/nxp/pinctrl-imxrt.c +++ b/drivers/pinctrl/nxp/pinctrl-imxrt.c @@ -27,6 +27,10 @@ static const struct udevice_id imxrt_pinctrl_match[] = { { /* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; + U_BOOT_DRIVER(imxrt_pinctrl) = { .name = "imxrt-pinctrl", .id = UCLASS_PINCTRL, diff --git a/drivers/pinctrl/nxp/pinctrl-vf610.c b/drivers/pinctrl/nxp/pinctrl-vf610.c index adf3073f1be..86514ebdb20 100644 --- a/drivers/pinctrl/nxp/pinctrl-vf610.c +++ b/drivers/pinctrl/nxp/pinctrl-vf610.c @@ -27,6 +27,10 @@ static const struct udevice_id vf610_pinctrl_match[] = { { /* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; + U_BOOT_DRIVER(vf610_pinctrl) = { .name = "vf610-pinctrl", .id = UCLASS_PINCTRL, -- 2.45.2

3 14

[PATCH] arm: dts: imx8m*-u-boot: remove optional from tee-os entry
by Yannic Moog 27 Jan '25

27 Jan '25

tee-os node is guarded by CONFIG_OPTEE. Since OPTEE adds driver support for OP-TEE, the binary should then be packaged in the bootable image. Remove the optional property to enforce this requirement. Signed-off-by: Yannic Moog <y.moog(a)phytec.de> --- arch/arm/dts/imx8mm-u-boot.dtsi | 1 - arch/arm/dts/imx8mn-u-boot.dtsi | 1 - arch/arm/dts/imx8mp-u-boot.dtsi | 1 - arch/arm/dts/imx8mq-u-boot.dtsi | 1 - 4 files changed, 4 deletions(-) diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi index 8608fa004fd..abb3aa5b635 100644 --- a/arch/arm/dts/imx8mm-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-u-boot.dtsi @@ -176,7 +176,6 @@ tee-os { filename = "tee.bin"; - optional; }; }; #endif diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi index bf2bb0f17c7..96a6df94c6c 100644 --- a/arch/arm/dts/imx8mn-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-u-boot.dtsi @@ -252,7 +252,6 @@ tee-os { filename = "tee.bin"; - optional; }; }; #endif diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi index 9e590c3bba0..6de9ab5d37c 100644 --- a/arch/arm/dts/imx8mp-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -197,7 +197,6 @@ tee-os { filename = "tee.bin"; - optional; }; }; #endif diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi index 458657fc474..8a536b16e8f 100644 --- a/arch/arm/dts/imx8mq-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-u-boot.dtsi @@ -156,7 +156,6 @@ tee-os { filename = "tee.bin"; - optional; }; }; #endif --- base-commit: e38a490810af76169f7cf1d298966ea9ba3c005b change-id: 20250122-optee_guard_fixup-d30e7d19201a Best regards, -- Yannic Moog <y.moog(a)phytec.de>

2 1

[PATCH v3 0/5] Add pmem node for preserving distro ISO's
by Sughosh Ganu 27 Jan '25

27 Jan '25

When installing a distro via EFI HTTP boot some OS installers expect the .iso image to be preserved and treat it as a "CDROM" to install packages. This is problematic in EFI, since U-Boot mounts the image, starts the installer, and eventually calls ExitBootServices. At that point the image U-Boot mounted disappears. Some distros don't care and download the missing packages from a web archive, while others halt the installation complaining they can't find certain packages. If the firmware uses ACPI, this is supported by using NFIT which provides NVDIMM ramdisks to the OS and preserves the image. We don't have anything in place for Device Trees though. Since DT supports persistent memory nodes (pmem) use those and preserve the .iso for installers. The issue can be reproduced by attempting an EFI HTTP boot with Ubuntu live server ISO, or a Rocky Linux ISO. The installation would fail with the failure to locate certain packages. The earlier version had aligned the addition of pmem nodes with the EFI HTTP boot feature. This has been changed, based on a review comment from Heinrich to instead be done by looping through the memory based blkmamp devices. Changes since V2: * Fix a checkpatch error for putting a blank line after a function * Use blkmap device based scanning for adding the pmem nodes Ilias Apalodimas (2): efi_loader: add a function to remove memory from the EFI map efi_loader: preserve installer images in pmem Masahisa Kojima (1): fdt: add support for adding pmem nodes Sughosh Ganu (2): blkmap: store type of blkmap device in corresponding structure blkmap: add pmem nodes for blkmap mem mapping devices boot/fdt_support.c | 40 ++++++++++++- boot/image-fdt.c | 9 +++ cmd/blkmap.c | 16 ++++-- drivers/block/blkmap.c | 90 +++-------------------------- drivers/block/blkmap_helper.c | 47 +++++++++++++++- include/blkmap.h | 103 +++++++++++++++++++++++++++++++++- include/efi_loader.h | 11 ++-- include/fdt_support.h | 13 +++++ lib/efi_loader/efi_bootmgr.c | 22 ++++++-- lib/efi_loader/efi_memory.c | 51 ++++++++++++----- lib/lmb.c | 4 +- test/dm/blkmap.c | 16 +++--- 12 files changed, 302 insertions(+), 120 deletions(-) -- 2.34.1

5 26

[PATCH 1/8] cyclic: Prevent corruption of cyclic list on reassignment
by Marek Vasut 27 Jan '25

27 Jan '25

Make cyclic_register() return error code, 0 in case of success, -EALREADY in case the called attempts to re-register already registered struct cyclic_info. The re-registration would lead to corruption of gd->cyclic_list because the re-registration would memset() one of its nodes, prevent that. Unregister only initialized struct cyclic_info. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Aaron Williams <awilliams(a)marvell.com> Cc: Anatolij Gustschin <agust(a)denx.de> Cc: Angelo Dureghello <angelo(a)kernel-space.org> Cc: Christian Marangi <ansuelsmth(a)gmail.com> Cc: Devarsh Thakkar <devarsht(a)ti.com> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Cc: Jaehoon Chung <jh80.chung(a)samsung.com> Cc: Michael Polyntsov <michael.polyntsov(a)iopsys.eu> Cc: Michael Trimarchi <michael(a)amarulasolutions.com> Cc: Nikhil M Jain <n-jain1(a)ti.com> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Peter Robinson <pbrobinson(a)gmail.com> Cc: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> Cc: Ronald Wahl <ronald.wahl(a)legrand.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Stefan Roese <sr(a)denx.de> Cc: Tim Harvey <tharvey(a)gateworks.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)lists.denx.de --- common/cyclic.c | 14 +++++++++++--- include/cyclic.h | 9 ++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/common/cyclic.c b/common/cyclic.c index 196797fd61e..53156a704cc 100644 --- a/common/cyclic.c +++ b/common/cyclic.c @@ -27,9 +27,13 @@ struct hlist_head *cyclic_get_list(void) return (struct hlist_head *)&gd->cyclic_list; } -void cyclic_register(struct cyclic_info *cyclic, cyclic_func_t func, - uint64_t delay_us, const char *name) +int cyclic_register(struct cyclic_info *cyclic, cyclic_func_t func, + uint64_t delay_us, const char *name) { + /* Reassignment of function would corrupt cyclic list, exit */ + if (cyclic->func) + return -EALREADY; + memset(cyclic, 0, sizeof(*cyclic)); /* Store values in struct */ @@ -38,11 +42,15 @@ void cyclic_register(struct cyclic_info *cyclic, cyclic_func_t func, cyclic->delay_us = delay_us; cyclic->start_time_us = timer_get_us(); hlist_add_head(&cyclic->list, cyclic_get_list()); + + return 0; } void cyclic_unregister(struct cyclic_info *cyclic) { - hlist_del(&cyclic->list); + /* Unregister only initialized struct cyclic_info */ + if (cyclic->func) + hlist_del(&cyclic->list); } static void cyclic_run(void) diff --git a/include/cyclic.h b/include/cyclic.h index c6c463d68e9..c86ac407332 100644 --- a/include/cyclic.h +++ b/include/cyclic.h @@ -60,8 +60,10 @@ typedef void (*cyclic_func_t)(struct cyclic_info *c); * The function @func will be called with @cyclic as its * argument. @cyclic will usually be embedded in some device-specific * structure, which the callback can retrieve using container_of(). + * + * @return 0 on success, -EALREADY on repeated registration, -ve otherwise */ -void cyclic_register(struct cyclic_info *cyclic, cyclic_func_t func, +int cyclic_register(struct cyclic_info *cyclic, cyclic_func_t func, uint64_t delay_us, const char *name); /** @@ -89,9 +91,10 @@ struct hlist_head *cyclic_get_list(void); #else -static inline void cyclic_register(struct cyclic_info *cyclic, cyclic_func_t func, - uint64_t delay_us, const char *name) +static inline int cyclic_register(struct cyclic_info *cyclic, cyclic_func_t func, + uint64_t delay_us, const char *name) { + return 0; } static inline void cyclic_unregister(struct cyclic_info *cyclic) -- 2.45.2

4 13

[PATCH 1/1] examples/api: improve determination of LOAD_ADDR
by Heinrich Schuchardt 27 Jan '25

27 Jan '25

The current load address for the 'demo' binary does not work for qemu_arm_defconfig. The suitability of an address to load an ELF binary and run it does not only depend on the architecture but also on the memory layout of the board. On most boards we can assume that 8 MiB of memory is available above $loadaddr. So $loadaddr + 0x400000 should work there. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- examples/api/Makefile | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/examples/api/Makefile b/examples/api/Makefile index 722c7e45904..be97b8015bd 100644 --- a/examples/api/Makefile +++ b/examples/api/Makefile @@ -5,26 +5,9 @@ # Provide symbol API_BUILD to signal that the API example is being built. KBUILD_CPPFLAGS += -DAPI_BUILD -ifeq ($(ARCH),powerpc) -LOAD_ADDR = 0x40000 -endif -ifeq ($(ARCH),arm) -ifdef CONFIG_64BIT -LOAD_ADDR = 0x40400000 -else -LOAD_ADDR = 0x1000000 -endif -endif -ifeq ($(ARCH),mips) -ifdef CONFIG_64BIT -LOAD_ADDR = 0xffffffff80200000 -else -LOAD_ADDR = 0x80200000 -endif -endif -ifeq ($(ARCH),riscv) -LOAD_ADDR = 0x84000000 -endif +# Environment variable loadaddr is set from CONFIG_SYS_LOAD_ADDR. +# Run the examples 4 MiB above this address. +LOAD_ADDR:=${shell printf 0x%X $$(( $(CONFIG_SYS_LOAD_ADDR) + 0x400000 ))} # Resulting ELF and binary exectuables will be named demo and demo.bin extra-y = demo -- 2.47.1

3 2

[PATCH v2] xilinx: Enable meminfo command with mapping
by Michal Simek 27 Jan '25

27 Jan '25

Enable meminfo command to be able to see where things are mapped. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- Changes in v2: - Also cover Kria configs/amd_versal2_virt_defconfig | 2 ++ configs/microblaze-generic_defconfig | 2 ++ configs/xilinx_versal_net_virt_defconfig | 2 ++ configs/xilinx_versal_virt_defconfig | 2 ++ configs/xilinx_zynq_virt_defconfig | 2 ++ configs/xilinx_zynqmp_kria_defconfig | 2 ++ configs/xilinx_zynqmp_virt_defconfig | 2 ++ 7 files changed, 14 insertions(+) diff --git a/configs/amd_versal2_virt_defconfig b/configs/amd_versal2_virt_defconfig index 22dad1b7076b..a7d8b035a714 100644 --- a/configs/amd_versal2_virt_defconfig +++ b/configs/amd_versal2_virt_defconfig @@ -30,6 +30,8 @@ CONFIG_SYS_PROMPT="versal2> " CONFIG_CMD_BOOTMENU=y CONFIG_CMD_GREPENV=y CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_SHA1SUM=y diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 2e618d81544d..87756cb26df5 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -42,6 +42,8 @@ CONFIG_CMD_IMLS=y CONFIG_CMD_SPL=y CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y CONFIG_CMD_GPIO=y CONFIG_CMD_SAVES=y CONFIG_BOOTP_BOOTFILESIZE=y diff --git a/configs/xilinx_versal_net_virt_defconfig b/configs/xilinx_versal_net_virt_defconfig index b40f7b7f8556..081ad424a9aa 100644 --- a/configs/xilinx_versal_net_virt_defconfig +++ b/configs/xilinx_versal_net_virt_defconfig @@ -32,6 +32,8 @@ CONFIG_CMD_SMBIOS=y CONFIG_CMD_BOOTMENU=y CONFIG_CMD_GREPENV=y CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_SHA1SUM=y diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index ccbd33ee1cf7..dd6e3ca34660 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -38,6 +38,8 @@ CONFIG_CMD_SMBIOS=y CONFIG_CMD_BOOTMENU=y CONFIG_CMD_GREPENV=y CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_SHA1SUM=y diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig index ed3d10194857..c2422c5b4dcf 100644 --- a/configs/xilinx_zynq_virt_defconfig +++ b/configs/xilinx_zynq_virt_defconfig @@ -56,6 +56,8 @@ CONFIG_CMD_IMLS=y CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_THOR_RESET_OFF=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_DFU=y diff --git a/configs/xilinx_zynqmp_kria_defconfig b/configs/xilinx_zynqmp_kria_defconfig index a68bd522f90a..ce44148dc0bc 100644 --- a/configs/xilinx_zynqmp_kria_defconfig +++ b/configs/xilinx_zynqmp_kria_defconfig @@ -63,6 +63,8 @@ CONFIG_CMD_SMBIOS=y CONFIG_CMD_BOOTMENU=y CONFIG_CMD_GREPENV=y CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_SHA1SUM=y diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index b13079cdf707..05ead1a41b4d 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -63,6 +63,8 @@ CONFIG_CMD_THOR_DOWNLOAD=y CONFIG_THOR_RESET_OFF=y CONFIG_CMD_GREPENV=y CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMINFO_MAP=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y CONFIG_CMD_SHA1SUM=y -- 2.43.0

1 0