February 2024 - U-Boot

[PATCH v2] pinctrl: Check pinconfig nodes pre-reloc status recursively
by Jonas Karlman 04 Mar '24

04 Mar '24

Pinconfig nodes normally bind recursively with PINCTRL_FULL and PINCONF_RECURSIVE enabled. However, during U-Boot proper pre-relocation any node marked with e.g. bootph-all will not bind unless its parent is also marked for pre-reloc. group1 { pinconf1 { bootph-all; }; }; This cause the following warning message to be shown during U-Boot proper pre-reloc stage on Rockchip devices, e.g on RK3568: ns16550_serial serial@fe660000: pinctrl_select_state_full: uclass_get_device_by_phandle_id: err=-19 and on RK3328: ns16550_serial serial@ff130000: pinctrl_select_state_full: uclass_get_device_by_phandle_id: err=-19 Check pinconfig nodes pre-reloc status recursively to fix this and to make pinconfig_post_bind work same at both U-Boot proper pre-reloc and at TPL/SPL stage. Signed-off-by: Jonas Karlman <jonas(a)kwiboo.se> --- v2: - No change A recent change to fdtgrep was believed to solve this however, fdtgrep is only applied to control fdt for xPL so this issue still exist at U-Boot proper pre-reloc stage. Link to v1: https://patchwork.ozlabs.org/patch/1817296/ --- drivers/pinctrl/pinctrl-uclass.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c index 73dd7b1038bb..fe2ba5021a78 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c @@ -100,6 +100,22 @@ static int pinctrl_select_state_full(struct udevice *dev, const char *statename) return 0; } +static bool ofnode_pre_reloc_recursive(ofnode parent) +{ + ofnode child; + + if (ofnode_pre_reloc(parent)) + return true; + + if (CONFIG_IS_ENABLED(PINCONF_RECURSIVE)) { + ofnode_for_each_subnode(child, parent) + if (ofnode_pre_reloc_recursive(child)) + return true; + } + + return false; +} + /** * pinconfig_post_bind() - post binding for PINCONFIG uclass * Recursively bind its children as pinconfig devices. @@ -119,7 +135,7 @@ static int pinconfig_post_bind(struct udevice *dev) dev_for_each_subnode(node, dev) { if (pre_reloc_only && - !ofnode_pre_reloc(node)) + !ofnode_pre_reloc_recursive(node)) continue; /* * If this node has "compatible" property, this is not -- 2.43.0

3 2

[PATCH v1] pci-host-ecam-generic: Convert to ofnode functions
by Maksim Kiselev 04 Mar '24

04 Mar '24

FDT functions is not working when OF_LIVE is enabled. Convert fdt parsing functions to ofnode parsing functions Signed-off-by: Maksim Kiselev <bigunclemax(a)gmail.com> --- drivers/pci/pcie_ecam_generic.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c index 2e089b0e03..f5bc6e3d92 100644 --- a/drivers/pci/pcie_ecam_generic.c +++ b/drivers/pci/pcie_ecam_generic.c @@ -10,7 +10,7 @@ #include <common.h> #include <dm.h> #include <pci.h> -#include <asm/global_data.h> +#include <linux/ioport.h> #include <linux/printk.h> #include <asm/io.h> @@ -133,18 +133,17 @@ static int pci_generic_ecam_write_config(struct udevice *bus, pci_dev_t bdf, static int pci_generic_ecam_of_to_plat(struct udevice *dev) { struct generic_ecam_pcie *pcie = dev_get_priv(dev); - struct fdt_resource reg_res; - DECLARE_GLOBAL_DATA_PTR; + ofnode node = dev_ofnode(dev); + struct resource reg_res; int err; - err = fdt_get_resource(gd->fdt_blob, dev_of_offset(dev), "reg", - 0, &reg_res); + err = ofnode_read_resource(node, 0, &reg_res); if (err < 0) { pr_err("\"reg\" resource not found\n"); return err; } - pcie->size = fdt_resource_size(&reg_res); + pcie->size = resource_size(&reg_res); pcie->cfg_base = map_physmem(reg_res.start, pcie->size, MAP_NOCACHE); return 0; -- 2.40.1

2 1

[PATCH] log: fixup log_head after relocating global data
by Thomas Weißschuh 04 Mar '24

04 Mar '24

When `gd` is relocated during `spl_relocate_stack_gd()` the doubly-linked circular list in the `log_head` member is broken. The last element of the list should point back to the initial `list_head`, but as the initial `list_head` is moved the pointer becomes stale. As a result the loop in `log_dispatch` would never finish. Signed-off-by: Thomas Weißschuh <thomas.weissschuh(a)linutronix.de> --- This patch is a simpler alternative to https://lore.kernel.org/u-boot/20240212-spl-logging-v1-1-051cde837559@linut… This patch should also remove the special handling introduced in commit e7595aa350ae ("x86: Allow logging to be used in SPL reliably"). --- common/log.c | 4 ++++ common/spl/spl.c | 3 +++ include/log.h | 12 ++++++++++++ 3 files changed, 19 insertions(+) diff --git a/common/log.c b/common/log.c index b2de57fcb3b8..0ca2d1b4c8bc 100644 --- a/common/log.c +++ b/common/log.c @@ -428,6 +428,10 @@ int log_device_set_enable(struct log_driver *drv, bool enable) return 0; } +void log_fixup_for_gd_move(struct global_data *new_gd) { + new_gd->log_head.prev->next = &new_gd->log_head; +} + int log_init(void) { struct log_driver *drv = ll_entry_start(struct log_driver, log_driver); diff --git a/common/spl/spl.c b/common/spl/spl.c index b65c439e7aa9..e06bc75d36b2 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -909,6 +909,9 @@ ulong spl_relocate_stack_gd(void) #if CONFIG_IS_ENABLED(DM) dm_fixup_for_gd_move(new_gd); #endif +#if CONFIG_IS_ENABLED(LOG) + log_fixup_for_gd_move(new_gd); +#endif #if !defined(CONFIG_ARM) && !defined(CONFIG_RISCV) gd = new_gd; #endif diff --git a/include/log.h b/include/log.h index 6e84f080ef3d..fc0d59844728 100644 --- a/include/log.h +++ b/include/log.h @@ -688,4 +688,16 @@ static inline int log_get_default_format(void) (IS_ENABLED(CONFIG_LOGF_FUNC) ? BIT(LOGF_FUNC) : 0); } +struct global_data; +/** + * log_fixup_for_gd_move() - Handle global_data moving to a new place + * + * @new_gd: Pointer to the new global data + * + * The log_head list is part of global_data. Due to the way lists work, moving + * the list will cause it to become invalid. This function fixes that up so + * that the log_head list will work correctly. + */ +void log_fixup_for_gd_move(struct global_data *new_gd); + #endif --- base-commit: 73b5b47dd5b546d0b9106bcca54c72815380e6d3 change-id: 20240213-spl-logging-2-43a81ae0f147 Best regards, -- Thomas Weißschuh <thomas.weissschuh(a)linutronix.de>

2 1

[PATCH] FWU: developerbox: read boot index from NOR flash
by Masahisa Kojima 04 Mar '24

04 Mar '24

The FWU Multi Bank Update feature allows the platform to boot the firmware images from one of the partitions(banks). On the Developerbox, SCP-firmware running on the SCB(Cortex-M3) passes the value of the boot index on the NOR flash. Add a function to read the boot index value from the NOR flash. Signed-off-by: Masahisa Kojima <masahisa.kojima(a)linaro.org> --- board/socionext/developerbox/fwu_plat.c | 31 +++++++++++++++++++++++++ include/configs/synquacer.h | 1 + 2 files changed, 32 insertions(+) diff --git a/board/socionext/developerbox/fwu_plat.c b/board/socionext/developerbox/fwu_plat.c index e724e702bd..26031795b0 100644 --- a/board/socionext/developerbox/fwu_plat.c +++ b/board/socionext/developerbox/fwu_plat.c @@ -35,3 +35,34 @@ void set_dfu_alt_info(char *interface, char *devstr) env_set("dfu_alt_info", buf); } + +/** + * fwu_plat_get_bootidx() - Get the value of the boot index + * @boot_idx: Boot index value + * + * Get the value of the bank(partition) from which the platform + * has booted. This value is passed to U-Boot from the earlier + * stage bootloader which loads and boots all the relevant + * firmware images + */ +void fwu_plat_get_bootidx(uint *boot_idx) +{ + int ret; + u32 buf; + size_t readlen; + struct mtd_info *mtd; + + *boot_idx = 0; + + mtd_probe_devices(); + mtd = get_mtd_device_nm("nor1"); + if (IS_ERR_OR_NULL(mtd)) + return; + + ret = mtd_read(mtd, SCB_PLAT_METADATA_OFFSET, sizeof(buf), + &readlen, (u_char *)&buf); + if (ret < 0) + return; + + *boot_idx = buf; +} diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index e36e63e81e..f0867227ac 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -21,6 +21,7 @@ /* * Boot info */ +#define SCB_PLAT_METADATA_OFFSET (0x510000) /* * Hardware drivers support -- 2.34.1

2 1

[PATCH] net: macb: Add support for fixed link
by belouargamohamed＠gmail.com 04 Mar '24

04 Mar '24

From: BELOUARGA Mohamed <m.belouarga(a)technologyandstrategy.com> The actual driver does not work when there is no linked PHY. These changes add support for fixed-link feature in the device tree. Signed-off-by: BELOUARGA Mohamed <m.belouarga(a)technologyandstrategy.com> --- drivers/net/macb.c | 189 ++++++++++++++++++++++++++++----------------- 1 file changed, 117 insertions(+), 72 deletions(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index bfc48dac07..05d638cd77 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -128,6 +128,8 @@ struct macb_device { unsigned long dummy_desc_dma; const struct device *dev; + unsigned int duplex; + unsigned int speed; unsigned short phy_addr; struct mii_dev *bus; #ifdef CONFIG_PHYLIB @@ -178,6 +180,12 @@ static int gem_is_gigabit_capable(struct macb_device *macb) return macb_is_gem(macb) && !cpu_is_sama5d2() && !cpu_is_sama5d4(); } +/* Is the port a fixed link */ +static int macb_port_is_fixed_link(struct macb_device *macb) +{ + return macb->phy_addr > PHY_MAX_ADDR; +} + static void macb_mdio_write(struct macb_device *macb, u8 phy_adr, u8 reg, u16 value) { @@ -666,97 +674,110 @@ static int macb_phy_init(struct udevice *dev, const char *name) int i; arch_get_mdio_control(name); - /* Auto-detect phy_addr */ - ret = macb_phy_find(macb, name); - if (ret) - return ret; + /* If port is not fixed -> setup PHY */ + if (!macb_port_is_fixed_link(macb)) { + /* Auto-detect phy_addr */ + ret = macb_phy_find(macb, name); + if (ret) + return ret; - /* Check if the PHY is up to snuff... */ - phy_id = macb_mdio_read(macb, macb->phy_addr, MII_PHYSID1); - if (phy_id == 0xffff) { - printf("%s: No PHY present\n", name); - return -ENODEV; - } + /* Check if the PHY is up to snuff... */ + phy_id = macb_mdio_read(macb, macb->phy_addr, MII_PHYSID1); + if (phy_id == 0xffff) { + printf("%s: No PHY present\n", name); + return -ENODEV; + } #ifdef CONFIG_PHYLIB - macb->phydev = phy_connect(macb->bus, macb->phy_addr, dev, - macb->phy_interface); - if (!macb->phydev) { - printf("phy_connect failed\n"); - return -ENODEV; - } + macb->phydev = phy_connect(macb->bus, macb->phy_addr, dev, + macb->phy_interface); + if (!macb->phydev) { + printf("phy_connect failed\n"); + return -ENODEV; + } - phy_config(macb->phydev); + phy_config(macb->phydev); #endif - status = macb_mdio_read(macb, macb->phy_addr, MII_BMSR); - if (!(status & BMSR_LSTATUS)) { - /* Try to re-negotiate if we don't have link already. */ - macb_phy_reset(macb, name); - - for (i = 0; i < MACB_AUTONEG_TIMEOUT / 100; i++) { - status = macb_mdio_read(macb, macb->phy_addr, MII_BMSR); - if (status & BMSR_LSTATUS) { - /* - * Delay a bit after the link is established, - * so that the next xfer does not fail - */ - mdelay(10); - break; + status = macb_mdio_read(macb, macb->phy_addr, MII_BMSR); + if (!(status & BMSR_LSTATUS)) { + /* Try to re-negotiate if we don't have link already. */ + macb_phy_reset(macb, name); + + for (i = 0; i < MACB_AUTONEG_TIMEOUT / 100; i++) { + status = macb_mdio_read(macb, macb->phy_addr, MII_BMSR); + if (status & BMSR_LSTATUS) { + /* + * Delay a bit after the link is established, + * so that the next xfer does not fail + */ + mdelay(10); + break; + } + udelay(100); } - udelay(100); } - } - if (!(status & BMSR_LSTATUS)) { - printf("%s: link down (status: 0x%04x)\n", - name, status); - return -ENETDOWN; - } + if (!(status & BMSR_LSTATUS)) { + printf("%s: link down (status: 0x%04x)\n", + name, status); + return -ENETDOWN; + } - /* First check for GMAC and that it is GiB capable */ - if (gem_is_gigabit_capable(macb)) { - lpa = macb_mdio_read(macb, macb->phy_addr, MII_STAT1000); + /* First check for GMAC and that it is GiB capable */ + if (gem_is_gigabit_capable(macb)) { + lpa = macb_mdio_read(macb, macb->phy_addr, MII_STAT1000); - if (lpa & (LPA_1000FULL | LPA_1000HALF | LPA_1000XFULL | - LPA_1000XHALF)) { - duplex = ((lpa & (LPA_1000FULL | LPA_1000XFULL)) ? - 1 : 0); + if (lpa & (LPA_1000FULL | LPA_1000HALF | LPA_1000XFULL | + LPA_1000XHALF)) { + duplex = ((lpa & (LPA_1000FULL | LPA_1000XFULL)) ? + 1 : 0); - printf("%s: link up, 1000Mbps %s-duplex (lpa: 0x%04x)\n", - name, - duplex ? "full" : "half", - lpa); + printf("%s: link up, 1000Mbps %s-duplex (lpa: 0x%04x)\n", + name, + duplex ? "full" : "half", + lpa); - ncfgr = macb_readl(macb, NCFGR); - ncfgr &= ~(MACB_BIT(SPD) | MACB_BIT(FD)); - ncfgr |= GEM_BIT(GBE); + ncfgr = macb_readl(macb, NCFGR); + ncfgr &= ~(MACB_BIT(SPD) | MACB_BIT(FD)); + ncfgr |= GEM_BIT(GBE); - if (duplex) - ncfgr |= MACB_BIT(FD); + if (duplex) + ncfgr |= MACB_BIT(FD); - macb_writel(macb, NCFGR, ncfgr); + macb_writel(macb, NCFGR, ncfgr); - ret = macb_linkspd_cb(dev, _1000BASET); - if (ret) - return ret; + ret = macb_linkspd_cb(dev, _1000BASET); + if (ret) + return ret; - return 0; + return 0; + } } - } - /* fall back for EMAC checking */ - adv = macb_mdio_read(macb, macb->phy_addr, MII_ADVERTISE); - lpa = macb_mdio_read(macb, macb->phy_addr, MII_LPA); - media = mii_nway_result(lpa & adv); - speed = (media & (ADVERTISE_100FULL | ADVERTISE_100HALF) - ? 1 : 0); - duplex = (media & ADVERTISE_FULL) ? 1 : 0; - printf("%s: link up, %sMbps %s-duplex (lpa: 0x%04x)\n", - name, - speed ? "100" : "10", - duplex ? "full" : "half", - lpa); + /* fall back for EMAC checking */ + adv = macb_mdio_read(macb, macb->phy_addr, MII_ADVERTISE); + lpa = macb_mdio_read(macb, macb->phy_addr, MII_LPA); + media = mii_nway_result(lpa & adv); + speed = (media & (ADVERTISE_100FULL | ADVERTISE_100HALF) + ? 1 : 0); + duplex = (media & ADVERTISE_FULL) ? 1 : 0; + printf("%s: link up, %sMbps %s-duplex (lpa: 0x%04x)\n", + name, + speed ? "100" : "10", + duplex ? "full" : "half", + lpa); + } + else { + /* if macb port is a fixed link */ + /* TODO : manage gigabit capable processors */ + speed = macb->speed; + duplex = macb->duplex; + printf("%s: link up, %sMbps %s-duplex\n", + name, + speed ? "100" : "10", + duplex ? "full" : "half"); + } ncfgr = macb_readl(macb, NCFGR); ncfgr &= ~(MACB_BIT(SPD) | MACB_BIT(FD) | GEM_BIT(GBE)); @@ -1276,6 +1297,30 @@ int __weak macb_late_eth_of_to_plat(struct udevice *dev) static int macb_eth_of_to_plat(struct udevice *dev) { struct eth_pdata *pdata = dev_get_plat(dev); + struct macb_device *macb = dev_get_priv(dev); + void *blob = (void *)gd->fdt_blob; + int node = dev_of_offset(dev); + int fl_node, speed_fdt; + + /* fetch 'fixed-link' property */ + fl_node = fdt_subnode_offset(blob, node, "fixed-link"); + if (fl_node >= 0) { + /* set phy_addr to invalid value for fixed link */ + macb->phy_addr = PHY_MAX_ADDR + 1; + macb->duplex = fdtdec_get_bool(blob, fl_node, "full-duplex"); + speed_fdt = fdtdec_get_int(blob, fl_node, "speed", 0); + if (speed_fdt == 100) { + macb->speed = 1; + } + else if (speed_fdt == 10) { + macb->speed = 0; + } + else { + printf("%s: The given speed %d of ethernet in the DT is not supported\n", + __func__, speed_fdt); + return -EINVAL; + } + } pdata->iobase = (uintptr_t)dev_remap_addr(dev); if (!pdata->iobase) -- 2.25.1

2 1

[PATCH 0/2] Drop reiserfs support
by Peter Robinson 04 Mar '24

04 Mar '24

The reiserfs filesystem was only enabled by the ethernut5 which appears to use jffs on nand for all default usecases (Nut/OS, Yocto) and doesn't have USB Storage support enabled, but does have MMC. It's also scheduled for removal in upstream Linux. Looking at the logs for ethernut5 it doesn't actually appear to be actively maintained either for the best part of 10+ years but I don't remove that as part of this PR but leave it to someone who may know the AT91 ecosystem better than me. Peter Robinson (2): configs: ethernut5: Drop reiserfs fs: drop reiserfs cmd/Kconfig | 9 - cmd/reiser.c | 171 ------ configs/ethernut5_defconfig | 1 - fs/Kconfig | 2 - fs/Makefile | 1 - fs/reiserfs/Kconfig | 0 fs/reiserfs/Makefile | 10 - fs/reiserfs/dev.c | 28 - fs/reiserfs/mode_string.c | 124 ----- fs/reiserfs/reiserfs.c | 971 --------------------------------- fs/reiserfs/reiserfs_private.h | 509 ----------------- include/reiserfs.h | 72 --- 12 files changed, 1898 deletions(-) delete mode 100644 cmd/reiser.c delete mode 100644 fs/reiserfs/Kconfig delete mode 100644 fs/reiserfs/Makefile delete mode 100644 fs/reiserfs/dev.c delete mode 100644 fs/reiserfs/mode_string.c delete mode 100644 fs/reiserfs/reiserfs.c delete mode 100644 fs/reiserfs/reiserfs_private.h delete mode 100644 include/reiserfs.h -- 2.43.1

2 4

[PATCH] cmd: remove common.h from exception command implementations
by Heinrich Schuchardt 04 Mar '24

04 Mar '24

The common.h should not be used anymore. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/arm/exception.c | 1 - cmd/riscv/exception.c | 1 - cmd/sandbox/exception.c | 1 - cmd/x86/exception.c | 1 - 4 files changed, 4 deletions(-) diff --git a/cmd/arm/exception.c b/cmd/arm/exception.c index 522f6dff53f..98a9795b68c 100644 --- a/cmd/arm/exception.c +++ b/cmd/arm/exception.c @@ -5,7 +5,6 @@ * Copyright (c) 2018, Heinrich Schuchardt <xypron.glpk(a)gmx.de> */ -#include <common.h> #include <command.h> static int do_unaligned(struct cmd_tbl *cmdtp, int flag, int argc, diff --git a/cmd/riscv/exception.c b/cmd/riscv/exception.c index f38f454a0b1..14ad6c440a5 100644 --- a/cmd/riscv/exception.c +++ b/cmd/riscv/exception.c @@ -5,7 +5,6 @@ * Copyright (c) 2018, Heinrich Schuchardt <xypron.glpk(a)gmx.de> */ -#include <common.h> #include <command.h> static int do_compressed(struct cmd_tbl *cmdtp, int flag, int argc, diff --git a/cmd/sandbox/exception.c b/cmd/sandbox/exception.c index c082401ce6b..cfa153da260 100644 --- a/cmd/sandbox/exception.c +++ b/cmd/sandbox/exception.c @@ -5,7 +5,6 @@ * Copyright (c) 2020, Heinrich Schuchardt <xypron.glpk(a)gmx.de> */ -#include <common.h> #include <command.h> static int do_sigsegv(struct cmd_tbl *cmdtp, int flag, int argc, diff --git a/cmd/x86/exception.c b/cmd/x86/exception.c index 82faaa913e5..14b6bd6f493 100644 --- a/cmd/x86/exception.c +++ b/cmd/x86/exception.c @@ -5,7 +5,6 @@ * Copyright (c) 2018, Heinrich Schuchardt <xypron.glpk(a)gmx.de> */ -#include <common.h> #include <command.h> static int do_undefined(struct cmd_tbl *cmdtp, int flag, int argc, -- 2.43.0

2 2

[PATCH 1/1] rng: eliminate common.h include from RNG drivers
by Heinrich Schuchardt 04 Mar '24

04 Mar '24

Usage of common.h is deprecated. * Remove common.h from RNG drivers. * Sort includes. * Add time.h to sandbox driver. * Add linux/types.h to rng.h to provide size_t. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- drivers/rng/arm_rndr.c | 3 +-- drivers/rng/iproc_rng200.c | 3 +-- drivers/rng/meson-rng.c | 1 - drivers/rng/msm_rng.c | 5 ++--- drivers/rng/npcm_rng.c | 1 - drivers/rng/optee_rng.c | 2 -- drivers/rng/rng-uclass.c | 1 - drivers/rng/rockchip_rng.c | 6 +++--- drivers/rng/sandbox_rng.c | 3 +-- drivers/rng/smccc_trng.c | 1 - drivers/rng/stm32_rng.c | 4 +--- include/rng.h | 2 ++ 12 files changed, 11 insertions(+), 21 deletions(-) diff --git a/drivers/rng/arm_rndr.c b/drivers/rng/arm_rndr.c index 4512330e68..bf54aec4f1 100644 --- a/drivers/rng/arm_rndr.c +++ b/drivers/rng/arm_rndr.c @@ -9,11 +9,10 @@ #define LOG_CATEGORY UCLASS_RNG -#include <common.h> #include <dm.h> -#include <linux/kernel.h> #include <rng.h> #include <asm/system.h> +#include <linux/kernel.h> #define DRIVER_NAME "arm-rndr" diff --git a/drivers/rng/iproc_rng200.c b/drivers/rng/iproc_rng200.c index 85ac15bf9c..4c49aa9e44 100644 --- a/drivers/rng/iproc_rng200.c +++ b/drivers/rng/iproc_rng200.c @@ -5,11 +5,10 @@ * Driver for Raspberry Pi hardware random number generator */ -#include <common.h> #include <dm.h> -#include <linux/delay.h> #include <rng.h> #include <asm/io.h> +#include <linux/delay.h> #define usleep_range(a, b) udelay((b)) diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c index fd2988e91b..49037d1165 100644 --- a/drivers/rng/meson-rng.c +++ b/drivers/rng/meson-rng.c @@ -5,7 +5,6 @@ * Driver for Amlogic hardware random number generator */ -#include <common.h> #include <clk.h> #include <dm.h> #include <rng.h> diff --git a/drivers/rng/msm_rng.c b/drivers/rng/msm_rng.c index 29e7354ece..658c153d3e 100644 --- a/drivers/rng/msm_rng.c +++ b/drivers/rng/msm_rng.c @@ -9,12 +9,11 @@ * Based on Linux driver */ -#include <asm/io.h> #include <clk.h> -#include <common.h> #include <dm.h> -#include <linux/bitops.h> #include <rng.h> +#include <asm/io.h> +#include <linux/bitops.h> /* Device specific register offsets */ #define PRNG_DATA_OUT 0x0000 diff --git a/drivers/rng/npcm_rng.c b/drivers/rng/npcm_rng.c index 70c1c032b6..3922acad5b 100644 --- a/drivers/rng/npcm_rng.c +++ b/drivers/rng/npcm_rng.c @@ -3,7 +3,6 @@ * Copyright (c) 2022 Nuvoton Technology Corp. */ -#include <common.h> #include <dm.h> #include <malloc.h> #include <rng.h> diff --git a/drivers/rng/optee_rng.c b/drivers/rng/optee_rng.c index 410dfc053f..f692681022 100644 --- a/drivers/rng/optee_rng.c +++ b/drivers/rng/optee_rng.c @@ -4,8 +4,6 @@ */ #define LOG_CATEGORY UCLASS_RNG -#include <common.h> - #include <rng.h> #include <tee.h> #include <dm/device.h> diff --git a/drivers/rng/rng-uclass.c b/drivers/rng/rng-uclass.c index 53108e1b31..06ddfa14ac 100644 --- a/drivers/rng/rng-uclass.c +++ b/drivers/rng/rng-uclass.c @@ -5,7 +5,6 @@ #define LOG_CATEGORY UCLASS_RNG -#include <common.h> #include <dm.h> #include <rng.h> diff --git a/drivers/rng/rockchip_rng.c b/drivers/rng/rockchip_rng.c index 705b424cf3..ce5cbee30a 100644 --- a/drivers/rng/rockchip_rng.c +++ b/drivers/rng/rockchip_rng.c @@ -2,14 +2,14 @@ /* * Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd */ + +#include <dm.h> +#include <rng.h> #include <asm/arch-rockchip/hardware.h> #include <asm/io.h> -#include <common.h> -#include <dm.h> #include <linux/bitops.h> #include <linux/iopoll.h> #include <linux/string.h> -#include <rng.h> #define RK_HW_RNG_MAX 32 diff --git a/drivers/rng/sandbox_rng.c b/drivers/rng/sandbox_rng.c index cc5e1f6e25..071a3228e8 100644 --- a/drivers/rng/sandbox_rng.c +++ b/drivers/rng/sandbox_rng.c @@ -3,11 +3,10 @@ * Copyright (c) 2019, Linaro Limited */ -#include <common.h> #include <dm.h> #include <rand.h> #include <rng.h> - +#include <time.h> #include <linux/string.h> static int sandbox_rng_read(struct udevice *dev, void *data, size_t len) diff --git a/drivers/rng/smccc_trng.c b/drivers/rng/smccc_trng.c index 3a4bb33941..5bb7ebe8a4 100644 --- a/drivers/rng/smccc_trng.c +++ b/drivers/rng/smccc_trng.c @@ -5,7 +5,6 @@ #define LOG_CATEGORY UCLASS_RNG -#include <common.h> #include <dm.h> #include <linker_lists.h> #include <log.h> diff --git a/drivers/rng/stm32_rng.c b/drivers/rng/stm32_rng.c index c397b4d95c..61d5ed6158 100644 --- a/drivers/rng/stm32_rng.c +++ b/drivers/rng/stm32_rng.c @@ -5,16 +5,14 @@ #define LOG_CATEGORY UCLASS_RNG -#include <common.h> #include <clk.h> #include <dm.h> #include <log.h> #include <reset.h> #include <rng.h> +#include <asm/io.h> #include <linux/bitops.h> #include <linux/delay.h> - -#include <asm/io.h> #include <linux/iopoll.h> #include <linux/kernel.h> diff --git a/include/rng.h b/include/rng.h index 37af554363..87e26f5647 100644 --- a/include/rng.h +++ b/include/rng.h @@ -6,6 +6,8 @@ #if !defined _RNG_H_ #define _RNG_H_ +#include <linux/types.h> + struct udevice; /** -- 2.43.0

2 1

[PATCH] bootstd: support scanning a single partition
by Nam Cao 04 Mar '24

04 Mar '24

The "bootflow" command currently doesn't support scanning a single partition. This is inconvenient in setups with multiple bootable partitions within a single disk, but only one is desired. Support scanning a single disk partition. Specifically, support the syntax: bootflow scan mmc1:4 which scans only mmc device 1, partition 4. Signed-off-by: Nam Cao <namcao(a)linutronix.de> --- boot/bootdev-uclass.c | 35 +++++++++++++++++++++++++++++++++-- boot/bootflow.c | 3 +++ doc/develop/bootstd.rst | 4 ++++ include/bootflow.h | 3 +++ 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c index 35afb93c0e..64e09fa0d0 100644 --- a/boot/bootdev-uclass.c +++ b/boot/bootdev-uclass.c @@ -173,8 +173,10 @@ int bootdev_find_in_blk(struct udevice *dev, struct udevice *blk, */ iter->max_part = MAX_PART_PER_BOOTDEV; - /* If this is the whole disk, check if we have bootable partitions */ - if (!iter->part) { + if (iter->flags & BOOTFLOWIF_SINGLE_PARTITION) { + /* a particular partition was specified, scan it without checking */ + } else if (!iter->part) { + /* This is the whole disk, check if we have bootable partitions */ iter->first_bootable = part_get_bootable(desc); log_debug("checking bootable=%d\n", iter->first_bootable); } else if (allow_any_part) { @@ -711,8 +713,37 @@ int bootdev_setup_iter(struct bootflow_iter *iter, const char *label, struct udevice *bootstd, *dev = NULL; bool show = iter->flags & BOOTFLOWIF_SHOW; int method_flags; + char buf[32]; int ret; + if (label) { + const char *end = strchr(label, ':'); + + if (end) { + size_t len = (size_t)(end - label); + const char *part = end + 1; + + if (len + 1 > sizeof(buf)) { + log_err("label \"%s\" is way too long\n", label); + return -EINVAL; + } + + memcpy(buf, label, len); + buf[len] = '\0'; + label = buf; + + unsigned long tmp; + + if (strict_strtoul(part, 0, &tmp)) { + log_err("Invalid partition number: %s\n", part); + return -EINVAL; + } + + iter->flags |= BOOTFLOWIF_SINGLE_PARTITION; + iter->part = tmp; + } + } + ret = uclass_first_device_err(UCLASS_BOOTSTD, &bootstd); if (ret) { log_err("Missing bootstd device\n"); diff --git a/boot/bootflow.c b/boot/bootflow.c index 05484fd5b1..68bf99329a 100644 --- a/boot/bootflow.c +++ b/boot/bootflow.c @@ -217,6 +217,9 @@ static int iter_incr(struct bootflow_iter *iter) } } + if (iter->flags & BOOTFLOWIF_SINGLE_PARTITION) + return BF_NO_MORE_DEVICES; + /* No more bootmeths; start at the first one, and... */ iter->cur_method = 0; iter->method = iter->method_order[iter->cur_method]; diff --git a/doc/develop/bootstd.rst b/doc/develop/bootstd.rst index 496e24bc7a..a07a72581e 100644 --- a/doc/develop/bootstd.rst +++ b/doc/develop/bootstd.rst @@ -531,6 +531,10 @@ Then the iterator is set up to according to the parameters given: `BOOTFLOWIF_SINGLE_MEDIA` is set. In this case, moving to the next bootdev processes just the children of the media device. Hunters are used, in this example just the "mmc" hunter. + - If `label` indicates a particular partition in a particular media device + (e.g. "mmc1:3") then `BOOTFLOWIF_SINGLE_PARTITION` is set. In this case, + only a single partition within a bootdev is processed. Hunters are used, in + this example just the "mmc" hunter. - If `label` indicates a media uclass (e.g. "mmc") then `BOOTFLOWIF_SINGLE_UCLASS` is set. In this case, all bootdevs in that uclass are used. Hunters are used, in this example just the "mmc" hunter diff --git a/include/bootflow.h b/include/bootflow.h index 42112874f6..080ee85012 100644 --- a/include/bootflow.h +++ b/include/bootflow.h @@ -133,6 +133,8 @@ struct bootflow { * this uclass (used with things like "mmc") * @BOOTFLOWIF_SINGLE_MEDIA: (internal) Scan one media device in the uclass (used * with things like "mmc1") + * @BOOTFLOWIF_SINGLE_PARTITION: (internal) Scan one partition in media device + * (used with things like "mmc1:3") */ enum bootflow_iter_flags_t { BOOTFLOWIF_FIXED = 1 << 0, @@ -148,6 +150,7 @@ enum bootflow_iter_flags_t { BOOTFLOWIF_SKIP_GLOBAL = 1 << 17, BOOTFLOWIF_SINGLE_UCLASS = 1 << 18, BOOTFLOWIF_SINGLE_MEDIA = 1 << 19, + BOOTFLOWIF_SINGLE_PARTITION = 1 << 20, }; /** -- 2.39.2

2 1

[PATCH] bootstd: fix build error when CONFIG_MMC is disabled
by Dan Carpenter 04 Mar '24

04 Mar '24

This code assumes that CONFIG_MMC and it causes a build error when the config is disabled. aarch64-linux-gnu-ld.bfd: test/boot/bootstd_common.o: in function `bootstd_test_check_mmc_hunter': test/boot/bootstd_common.c:83:(.text.bootstd_test_check_mmc_hunter+0x70): undefined reference to `_u_boot_list_2_bootdev_hunter_2_mmc_bootdev_hunter' Fixes: 66e3dce78750 ("bootstd: Allow hunting for a bootdev by label") Signed-off-by: Dan Carpenter <dan.carpenter(a)linaro.org> --- test/boot/bootstd_common.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/boot/bootstd_common.c b/test/boot/bootstd_common.c index e71a2975c53c..cc97e255e5cb 100644 --- a/test/boot/bootstd_common.c +++ b/test/boot/bootstd_common.c @@ -74,6 +74,9 @@ int bootstd_test_check_mmc_hunter(struct unit_test_state *uts) struct bootstd_priv *std; uint seq; + if (!IS_ENABLED(CONFIG_MMC)) + return 0; + /* get access to the used hunters */ ut_assertok(bootstd_get_priv(&std)); -- 2.43.0

2 1