January 2025 - U-Boot

[PATCH v4 45/46] pxe_utils: Refactor to separate reading from booting
by Simon Glass 25 Jan '25

25 Jan '25

It is useful to be able to select a bootflow and read its images, without actually doing the boot. This allows adjusting the bootargs, for example. Provide support for this in the pxe_utils module, by adding a 'probe' method which selects a label and saves its settings, so it can be booted later, if desired. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v4: - Fix the force-prompt logic to leave the flag alone unless forced boot/pxe_utils.c | 71 ++++++++++++++++++++++++++++++++++++++++++--- include/pxe_utils.h | 41 ++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 4 deletions(-) diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 71347b19119..16608c6ebc8 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -802,8 +802,31 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) if (ctx->bflow) ctx->bflow->fdt_addr = hextoul(conf_fdt, NULL); - if (ctx->no_boot) + if (IS_ENABLED(CONFIG_BOOTSTD_FULL) && ctx->no_boot) { + ctx->label = label; + ctx->kernel_addr = strdup(kernel_addr); + if (initrd_addr_str) { + ctx->initrd_addr_str = strdup(initrd_addr_str); + ctx->initrd_filesize = strdup(initrd_filesize); + ctx->initrd_str = strdup(initrd_str); + } + ctx->conf_fdt = strdup(conf_fdt); + log_debug("Saving label '%s':\n", label->name); + log_debug("- kernel_addr '%s' conf_fdt '%s'\n", + ctx->kernel_addr, ctx->conf_fdt); + if (initrd_addr_str) { + log_debug("- initrd addr '%s' filesize '%s' str '%s'\n", + ctx->initrd_addr_str, ctx->initrd_filesize, + ctx->initrd_str); + } + if (!ctx->kernel_addr || !ctx->conf_fdt || + (initrd_addr_str && (!ctx->initrd_addr_str || + !ctx->initrd_filesize || !ctx->initrd_str))) { + printf("malloc fail (saving label)\n"); + return 1; + } return 0; + } label_run_boot(ctx, label, kernel_addr, initrd_addr_str, initrd_filesize, initrd_str, conf_fdt); @@ -1695,18 +1718,30 @@ void pxe_destroy_ctx(struct pxe_context *ctx) free(ctx->bootdir); } -int pxe_process(struct pxe_context *ctx, ulong pxefile_addr_r, bool prompt) +struct pxe_menu *pxe_prepare(struct pxe_context *ctx, ulong pxefile_addr_r, + bool prompt) { struct pxe_menu *cfg; cfg = parse_pxefile(ctx, pxefile_addr_r); if (!cfg) { printf("Error parsing config file\n"); - return 1; + return NULL; } if (prompt) - cfg->prompt = 1; + cfg->prompt = prompt; + + return cfg; +} + +int pxe_process(struct pxe_context *ctx, ulong pxefile_addr_r, bool prompt) +{ + struct pxe_menu *cfg; + + cfg = pxe_prepare(ctx, pxefile_addr_r, prompt); + if (!cfg) + return 1; handle_pxe_menu(ctx, cfg); @@ -1714,3 +1749,31 @@ int pxe_process(struct pxe_context *ctx, ulong pxefile_addr_r, bool prompt) return 0; } + +int pxe_probe(struct pxe_context *ctx, ulong pxefile_addr_r, bool prompt) +{ + ctx->cfg = pxe_prepare(ctx, pxefile_addr_r, prompt); + if (!ctx->cfg) + return -EINVAL; + ctx->no_boot = true; + + handle_pxe_menu(ctx, ctx->cfg); + + return 0; +} + +int pxe_do_boot(struct pxe_context *ctx) +{ + int ret; + + if (!ctx->label) + return log_msg_ret("pxb", -ENOENT); + + ret = label_run_boot(ctx, ctx->label, ctx->kernel_addr, + ctx->initrd_addr_str, ctx->initrd_filesize, + ctx->initrd_str, ctx->conf_fdt); + if (ret) + return log_msg_ret("lrb", ret); + + return 0; +} diff --git a/include/pxe_utils.h b/include/pxe_utils.h index beadd221475..6425e349d19 100644 --- a/include/pxe_utils.h +++ b/include/pxe_utils.h @@ -111,6 +111,16 @@ typedef int (*pxe_getfile_func)(struct pxe_context *ctx, const char *file_path, * "default" option as default * @no_boot: Stop show of actually booting and just return * @bflow: Bootflow being booted, or NULL if none (must be valid if @no_boot) + * @cfg: PXE menu (NULL if not yet probed) + * + * The following are only used when probing for a label + * @label: Label to process + * @kernel_addr: String containing kernel address (cannot be NULL) + * @initrd_addr_str: String containing initaddr address (NULL if none) + * @initrd_filesize: String containing initrd size (only used if + * @initrd_addr_str) + * @initrd_str: initrd string to process (only used if @initrd_addr_str) + * @conf_fdt: string containing the FDT address */ struct pxe_context { /** @@ -133,6 +143,15 @@ struct pxe_context { bool use_fallback; bool no_boot; struct bootflow *bflow; + struct pxe_menu *cfg; + + /* information on the selected label to boot */ + struct pxe_label *label; + char *kernel_addr; + char *initrd_addr_str; + char *initrd_filesize; + char *initrd_str; + char *conf_fdt; }; /** @@ -283,4 +302,26 @@ int pxe_get_file_size(ulong *sizep); */ int pxe_get(ulong pxefile_addr_r, char **bootdirp, ulong *sizep, bool use_ipv6); +/** + * pxe_probe() - Process a PXE file to find the label to boot + * + * This fills in the label, etc. fields in @ctx, assuming it funds something to + * boot. Then pxe_do_boot() can be called to boot it. + * + * @ctx: PXE context created with pxe_setup_ctx() + * @pxefile_addr_r: Address to load file + * @prompt: Force a prompt for the user + * Return: 0 if OK, -ve on error + */ +int pxe_probe(struct pxe_context *ctx, ulong pxefile_addr_r, bool prompt); + +/** + * pxe_do_boot() - Boot the selected label + * + * This boots the label discovered by pxe_probe() + * + * Return: Does not return, on success, otherwise returns a -ve error code + */ +int pxe_do_boot(struct pxe_context *ctx); + #endif /* __PXE_UTILS_H */ -- 2.43.0

2 2

secure boot, mkimage with external signing server
by Rosenschild, Klaus 25 Jan '25

25 Jan '25

Hello, I have a question regarding the signing of a FIT image using mkimage. I already contacted DENX, they referred me to this mailing list. mkimage supports the creation of a signed FIT image. To do this, we need to have an appropriate .its file and pass the private key as a parameter to the mkimage command: mkimage -f fitImage-sign.its -k keys/ fitImage-signed However, this approach does not work in our setup, as we do not have access to the private key. The private key resides on an HSM (Hardware security module) that is not directly accessible for us. We can invoke signing related functions via an external signing server that takes a sha256 hash as input and returns the signed hash. Then we need to add the signed hash to the FIT image. The replacement of a signature in a FIT image can be easily done using the FDT library. However, getting the sha256 hash that mkimage uses for the signing does not seems to be possible. I tried to reverse engineer the code, but it looks like that there are a lot of low level byte operations on the FIT image. Now my questions: Is there a way to get the SHA256 used for the signing somehow from the mkimage or via a different way? Is there somewhere a documentation how this hash is generated from the unsigned FIT image ? Any help is very much appreciated. Some more details below Our system runs on a raspberry pi CM 4 module. We use Yocto scarthgap to build the SW images. The raspberry bootloader loads the U-boot which then boots the further system using a fit image. We need to support secure boot for this platform. As part of it, we need to have a signed fit image. Currently, we achieve this using the mkimage tool with the -k option to pass the private key. Via this procedure we are able to execute the secure boot successfully. However, our organization requires to use a dedicated signing server that implements an organization wide security infrastructure. It requires a hash (sha256) as input and returns a signature that is generated using the private key inside the signing server. Our challenges are now: 1. Get the hashes that mkimage uses as a base for the signatures 2. Manipulate the fit image to include the configuration signatures The attachments may provide further details. Thank you very much and Regards Klaus Rosenschild IoT solution architect OP BU Tool Services Hilti Entwicklungsgesellschaft mbH Hiltistraße 6 | 86916 Kaufering E klaus.rosenschild(a)hilti.com<mailto:klaus.rosenschild@hilti.com> www.hilti.de<http://www.hilti.de/> Hilti Entwicklungsgesellschaft mbH Geschäftsführer: Dr. Olaf Schadoffsky Sitz der Gesellschaft: D-86916 Kaufering, Hiltistraße 6 Amtsgericht Augsburg HRB 16295

3 6

[PATCH] miiphy: define mii_devs with LIST_HEAD()
by Weijie Gao 25 Jan '25

25 Jan '25

When enabling net console and console multiplexing, a boot crash was observed using mtk_eth driver with stdin/stdout set to "serial,nc" in persistent environment: > CPU: MediaTek MT7981 > Model: OpenWrt One > DRAM: 1 GiB > Core: 35 devices, 15 uclasses, devicetree: separate > spi-nand: spi_nand spi_nand@0: Winbond SPI NAND was found. > spi-nand: spi_nand spi_nand@0: 128 MiB, block size: 128 KiB, page size: 2048, OOB size: 64 > Loading Environment from UBI... SF: Detected w25q128 with page size 256 Bytes, erase size 4 KiB, total 16 MiB > mtd: partition "ubi" extends beyond the end of device "spi-nand0" -- size truncated to 0x7f00000 > Read 126976 bytes from volume ubootenv to 000000007f7bf0c0 > Read 126976 bytes from volume ubootenv2 to 000000007f7de100 > OK > "Synchronous Abort" handler, esr 0x96000004, far 0xeafffffeea000018 > elr: 0000000041e63cd4 lr : 0000000041e1b844 (reloc) > elr: 000000007ff9ecd4 lr : 000000007ff56844 > x0 : eafffffeea000018 x1 : 000000007fb552e0 > x2 : 00000000000000fe x3 : 0000000000000000 The cause is that "serial,nc" forced the console subsystem to initialize the ethernet driver before ethernet subsystem initialization (console_init_r() is called before initr_net()). During the mtk_eth driver initialization, mdio_register() will be called, and miiphy_get_dev_by_name() will then be called. The miiphy_get_dev_by_name() will check the list "mii_devs" to see if the passed device name exists. However the mii_devs is defined without initialization: > static struct list_head mii_devs; and the actual initialization is done in the following chain: initr_net -> eth_initialize -> eth_common_init -> miiphy_init Since initr_net() hasn't be called, iterating over the mii_devs will access to physical address 0 (mii_devs.next == NULL) and will cause the crash. The fix is to define mii_devs using: > static LIST_HEAD(mii_devs); As the "current_mii" is defined as a static variable, it will always be NULL in board_r stage and initializing it will NULL is unnecessary. So the entire miiphy_init() can be remove. Signed-off-by: Weijie Gao <hackpascal(a)gmail.com> --- common/miiphyutil.c | 12 +----------- include/miiphy.h | 2 -- net/eth_common.c | 5 ----- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/common/miiphyutil.c b/common/miiphyutil.c index 9b8744e5d8..6169ea884a 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -30,7 +30,7 @@ #define debug(fmt, args...) #endif /* MII_DEBUG */ -static struct list_head mii_devs; +static LIST_HEAD(mii_devs); static struct mii_dev *current_mii; /* @@ -55,16 +55,6 @@ struct mii_dev *miiphy_get_dev_by_name(const char *devname) return NULL; } -/***************************************************************************** - * - * Initialize global data. Need to be called before any other miiphy routine. - */ -void miiphy_init(void) -{ - INIT_LIST_HEAD(&mii_devs); - current_mii = NULL; -} - struct mii_dev *mdio_alloc(void) { struct mii_dev *bus; diff --git a/include/miiphy.h b/include/miiphy.h index 5abffd8fb6..8e4b58c734 100644 --- a/include/miiphy.h +++ b/include/miiphy.h @@ -33,8 +33,6 @@ int miiphy_is_1000base_x(const char *devname, unsigned char addr); int miiphy_link(const char *devname, unsigned char addr); #endif -void miiphy_init(void); - int miiphy_set_current_dev(const char *devname); const char *miiphy_get_current_dev(void); struct mii_dev *mdio_get_current_dev(void); diff --git a/net/eth_common.c b/net/eth_common.c index 89b5bb3718..ba57d836b0 100644 --- a/net/eth_common.c +++ b/net/eth_common.c @@ -31,11 +31,6 @@ int eth_env_set_enetaddr_by_index(const char *base_name, int index, void eth_common_init(void) { bootstage_mark(BOOTSTAGE_ID_NET_ETH_START); -#if CONFIG_IS_ENABLED(ETH) -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB) - miiphy_init(); -#endif -#endif } int eth_mac_skip(int index) -- 2.34.1

1 0

[PATCH] bloblist: Drop BSD license
by Simon Glass 25 Jan '25

25 Jan '25

Linaro has decided to write their own version of bloblist from scratch, so there is no point in having a non-GPL license on this file. Change it, to better fit with the U-Boot project. Signed-off-by: Simon Glass <sjg(a)chromium.org> Link: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/22215 --- common/bloblist.c | 2 +- include/bloblist.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/bloblist.c b/common/bloblist.c index ecce3da9331..c441498ec56 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2018 Google, Inc * Written by Simon Glass <sjg(a)chromium.org> diff --git a/include/bloblist.h b/include/bloblist.h index 7d462e71914..be7303e1504 100644 --- a/include/bloblist.h +++ b/include/bloblist.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause */ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * This provides a standard way of passing information between boot phases * (TPL -> SPL -> U-Boot proper.) -- 2.43.0

3 10

[PATCH 1/2] net: ravb: Drop empty init callback
by Marek Vasut 25 Jan '25

25 Jan '25

The init function does nothing, the bb_miiphy_init() already checks whether the .init callback is assigned, and if not, skips calling it. Remove the empty init function. The entire init callback will be removed in follow up patches. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Christian Marangi <ansuelsmth(a)gmail.com> Cc: Evgeny Bachinin <EABachinin(a)salutedevices.com> Cc: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Cc: Jerome Forissier <jerome.forissier(a)linaro.org> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Mario Six <mario.six(a)gdsys.cc> Cc: Michal Simek <michal.simek(a)amd.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> Cc: Paul Barker <paul.barker.ct(a)bp.renesas.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Sughosh Ganu <sughosh.ganu(a)linaro.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)lists.denx.de --- drivers/net/ravb.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index 7286ad19598..f9c27f0f370 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -560,11 +560,6 @@ static int ravb_remove(struct udevice *dev) return 0; } -static int ravb_bb_init(struct bb_miiphy_bus *bus) -{ - return 0; -} - static int ravb_bb_mdio_active(struct bb_miiphy_bus *bus) { struct ravb_priv *eth = bus->priv; @@ -626,7 +621,7 @@ static int ravb_bb_delay(struct bb_miiphy_bus *bus) struct bb_miiphy_bus bb_miiphy_buses[] = { { .name = "ravb", - .init = ravb_bb_init, + .init = NULL, .mdio_active = ravb_bb_mdio_active, .mdio_tristate = ravb_bb_mdio_tristate, .set_mdio = ravb_bb_set_mdio, -- 2.45.2

3 4

[PATCH] net: miiphybb: Convert ifdef DEBUG to debug()
by Marek Vasut 25 Jan '25

25 Jan '25

Replace ifdeffery with plain debug() function call. No functional change. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Adam Ford <aford173(a)gmail.com> Cc: Hai Pham <hai.pham.ud(a)renesas.com> Cc: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Cc: Jerome Forissier <jerome.forissier(a)linaro.org> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Mario Six <mario.six(a)gdsys.cc> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> Cc: Paul Barker <paul.barker.ct(a)bp.renesas.com> Cc: Peter Robinson <pbrobinson(a)gmail.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Sumit Garg <sumit.garg(a)linaro.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)lists.denx.de --- drivers/net/phy/miiphybb.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c index 171c1719b5b..5497b838225 100644 --- a/drivers/net/phy/miiphybb.c +++ b/drivers/net/phy/miiphybb.c @@ -183,9 +183,7 @@ int bb_miiphy_read(struct mii_dev *miidev, int addr, int devad, int reg) bus->set_mdc(bus, 1); bus->delay(bus); -#ifdef DEBUG - printf("miiphy_read(0x%x) @ 0x%x = 0x%04x\n", reg, addr, rdreg); -#endif + debug("miiphy_read(0x%x) @ 0x%x = 0x%04x\n", reg, addr, rdreg); return rdreg; } -- 2.45.2

3 2

[PATCH] net: miiphybb: Fix short name length
by Marek Vasut 25 Jan '25

25 Jan '25

Multiple drivers copy MDIO name into struct bb_miiphy_bus name, but these two name fields have different length, the bb_miiphy_bus one is 16 bytes, the source one is 32 bytes. Make sure these two lengths are always synchronized, use MDIO_NAME_LEN for both. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Adam Ford <aford173(a)gmail.com> Cc: Hai Pham <hai.pham.ud(a)renesas.com> Cc: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Cc: Jerome Forissier <jerome.forissier(a)linaro.org> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Mario Six <mario.six(a)gdsys.cc> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> Cc: Paul Barker <paul.barker.ct(a)bp.renesas.com> Cc: Peter Robinson <pbrobinson(a)gmail.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Sumit Garg <sumit.garg(a)linaro.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)lists.denx.de --- include/miiphy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/miiphy.h b/include/miiphy.h index 2bb4f62ea76..1e6c7041fdc 100644 --- a/include/miiphy.h +++ b/include/miiphy.h @@ -64,7 +64,7 @@ void mdio_list_devices(void); #define BB_MII_DEVNAME "bb_miiphy" struct bb_miiphy_bus { - char name[16]; + char name[MDIO_NAME_LEN]; int (*init)(struct bb_miiphy_bus *bus); int (*mdio_active)(struct bb_miiphy_bus *bus); int (*mdio_tristate)(struct bb_miiphy_bus *bus); -- 2.45.2

3 2

[PATCH] net: miiphybb: Update debug() print
by Marek Vasut 25 Jan '25

25 Jan '25

Update the debug() print, use __func__ to always print matching function name, and also print bus name in case there are multiple busses. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Adam Ford <aford173(a)gmail.com> Cc: Hai Pham <hai.pham.ud(a)renesas.com> Cc: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Cc: Jerome Forissier <jerome.forissier(a)linaro.org> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Mario Six <mario.six(a)gdsys.cc> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> Cc: Paul Barker <paul.barker.ct(a)bp.renesas.com> Cc: Peter Robinson <pbrobinson(a)gmail.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Sumit Garg <sumit.garg(a)linaro.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)lists.denx.de --- drivers/net/phy/miiphybb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c index 5497b838225..9f5f9b12c9f 100644 --- a/drivers/net/phy/miiphybb.c +++ b/drivers/net/phy/miiphybb.c @@ -183,7 +183,7 @@ int bb_miiphy_read(struct mii_dev *miidev, int addr, int devad, int reg) bus->set_mdc(bus, 1); bus->delay(bus); - debug("miiphy_read(0x%x) @ 0x%x = 0x%04x\n", reg, addr, rdreg); + debug("%s[%s](0x%x) @ 0x%x = 0x%04x\n", __func__, miidev->name, reg, addr, rdreg); return rdreg; } -- 2.45.2

1 0

[PATCH v2] net: miiphybb: Fix short name length
by Marek Vasut 25 Jan '25

25 Jan '25

Multiple drivers copy the MDIO instance name from struct mii_phy to struct bb_miiphy_bus, but the name field in these two structs have different lengths, the bb_miiphy_bus one is 16 bytes, the source one is 32 bytes. Make sure these two lengths are always synchronized, use MDIO_NAME_LEN for both. Reviewed-by: Paul Barker <paul.barker.ct(a)bp.renesas.com> Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Adam Ford <aford173(a)gmail.com> Cc: Hai Pham <hai.pham.ud(a)renesas.com> Cc: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> Cc: Jerome Forissier <jerome.forissier(a)linaro.org> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Mario Six <mario.six(a)gdsys.cc> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> Cc: Paul Barker <paul.barker.ct(a)bp.renesas.com> Cc: Peter Robinson <pbrobinson(a)gmail.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Sumit Garg <sumit.garg(a)linaro.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)lists.denx.de --- V2: - Reword commit message - Add RB from Paul --- include/miiphy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/miiphy.h b/include/miiphy.h index 2bb4f62ea76..1e6c7041fdc 100644 --- a/include/miiphy.h +++ b/include/miiphy.h @@ -64,7 +64,7 @@ void mdio_list_devices(void); #define BB_MII_DEVNAME "bb_miiphy" struct bb_miiphy_bus { - char name[16]; + char name[MDIO_NAME_LEN]; int (*init)(struct bb_miiphy_bus *bus); int (*mdio_active)(struct bb_miiphy_bus *bus); int (*mdio_tristate)(struct bb_miiphy_bus *bus); -- 2.45.2

1 0

[resend v2 00/19] Add Cadence NAND Driver support
by dinesh.maniyam＠intel.com 25 Jan '25

25 Jan '25

From: Dinesh Maniyam <dinesh.maniyam(a)intel.com> This patchset add Cadence NAND driver support for Intel Agilex5 devices. The NAND driver is leveraged from the cadence-nand-controller.c from Linux version 6.11.2. U-Boot will support read, write and erase NAND with Cadence driver. The driver further enhanced in U-Boot to support NAND booting from FSBL and support boot to kernel via UBIFS. Patch status: Have changes: All patches expect Patch 19 Detail changelog can find in commit message. v1->v2: -------- Patch 1 - 18: - remove the "this patch is to" commit phrases Patch 4; - minor refactoring of code to match the stable version 6.11.2. Patch 14: - Add maintainer and "#include" mechanism for new variant Patch 16: - leverage the existing nand_spl_load_image History: -------- [v1]: https://patchwork.ozlabs.org/project/uboot/cover/20240919035512.13854-1-din… Dinesh Maniyam (19): dt: nand: add cadence nand dt-bindings arm: dts: agilex5: Enabled cdns-nand dts setting include: asm: Add support to read/write 64-bit drivers: mtd: nand: Add driver for Cadence Nand drivers: mtd: nand: cadence: Add support for read status command drivers: mtd: nand: cadence: Add support for readid command drivers: mtd: nand: cadence: Add support for NAND_CMD_PARAM drivers: mtd: nand: cadence: Add support for NAND_CMD_RESET drivers: mtd: nand: cadence: Support cmd SET_FEATURES & GET_FEATURES drivers: mtd: nand: cadence: Flush & invalidate dma descriptor drivers: mtd: nand: cadence: Poll for desc complete status drivers: mtd: nand: cadence: Use bounce buffer drivers: nand: Enabled Kconfig and Makefile for cdns-nand configs: nand2_defconfig: Enable configs for nand boot drivers: mtd: nand: base: Add support for Hardware ECC for check bad block drivers: mtd: nand: spl: Add support for nand SPL load image drivers: mtd: nand: Enabled Kconfig and Makefile for Cadence-SPL drivers: mtd: nand: Kconfig: Remove SYS_NAND_BLOCK_SIZE dependency drivers: mtd: nand: Kconfig: Enabled self-init for cdns-nand SPL arch/arm/dts/socfpga_agilex5.dtsi | 14 + .../arm/dts/socfpga_agilex5_socdk-u-boot.dtsi | 28 + arch/arm/include/asm/io.h | 25 + board/intel/agilex5-socdk/MAINTAINERS | 2 + configs/socfpga_agilex5_nand2_defconfig | 33 + .../mtd/cadence,nand.yaml | 98 + drivers/mtd/nand/raw/Kconfig | 19 +- drivers/mtd/nand/raw/Makefile | 2 + drivers/mtd/nand/raw/cadence_nand.c | 2424 +++++++++++++++++ drivers/mtd/nand/raw/cadence_spl.c | 59 + drivers/mtd/nand/raw/nand_base.c | 71 +- include/cadence-nand.h | 529 ++++ include/linux/mtd/rawnand.h | 14 + 13 files changed, 3293 insertions(+), 25 deletions(-) create mode 100644 configs/socfpga_agilex5_nand2_defconfig create mode 100644 doc/device-tree-bindings/mtd/cadence,nand.yaml create mode 100644 drivers/mtd/nand/raw/cadence_nand.c create mode 100644 drivers/mtd/nand/raw/cadence_spl.c create mode 100644 include/cadence-nand.h -- 2.19.0

4 29