July 2023 - U-Boot

RE: [PATCH] mmc:Remove thr legacy mode clock setting operation
by Jaehoon Chung 13 Jul '23

13 Jul '23

Hi, > -----Original Message----- > From: 869470483(a)qq.com <869470483(a)qq.com> > Sent: Wednesday, July 12, 2023 4:19 PM > To: u-boot(a)lists.denx.de > Cc: peng.fan(a)nxp.com; jh80.chung(a)samsung.com; xiefei <xf_hqu(a)163.com> > Subject: [PATCH] mmc:Remove thr legacy mode clock setting operation > > From: xiefei <xf_hqu(a)163.com> > > Due to the need to read the register value before > switching to hs mode, the standard protocol does > not explicitly specify that the setting before > switching to hs mode is in legacy mode. Therefore, > the code at this point may cause communication > abnormalities between the host and card Thanks for resend patch after updated. Which board and driver does it occur the issue? Best Regards, Jaehoon Chung > > Signed-off-by: xiefei <xf_hqu(a)163.com> > --- > drivers/mmc/mmc.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c > index 1af6af82e6..96cc7e7332 100644 > --- a/drivers/mmc/mmc.c > +++ b/drivers/mmc/mmc.c > @@ -2136,9 +2136,7 @@ static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps) > mmc->selected_mode == MMC_HS_400 || > mmc->selected_mode == MMC_HS_400_ES) > mmc_set_card_speed(mmc, MMC_HS, true); > - else > #endif > - mmc_set_clock(mmc, mmc->legacy_speed, MMC_CLK_ENABLE); > > for_each_mmc_mode_by_pref(card_caps, mwt) { > for_each_supported_width(card_caps & mwt->widths, > -- > 2.17.1

1 0

[PATCH v4] phy: phy-imx8mq-usb: add vbus regulator support
by Tim Harvey 12 Jul '23

12 Jul '23

Add support for enabling and disabling vbus-supply regulator found on several imx8mp boards in the usb3_phy0 and usb3_phy1 nodes. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> Reviewed-by: Adam Ford <aford173(a)gmail.com> Reviewed-by: Marek Vasut <marex(a)denx.de> --- v4: - use regulator_set_enable_if_allowed to handle regulator reference counting errors - added Marek's rb tag v3: - change pr_err to dev_err - add #if CONFIG_IS_ENABLED around vbus_supply in struct - add fail path to disable clock if regulator enable failed v2: - protect ret with __maybe_unused in case CONFIG_CLK and CONFIG_DM_REGULATOR not defined - add error prints on failures - add Adam's rb tag --- drivers/phy/phy-imx8mq-usb.c | 39 ++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/drivers/phy/phy-imx8mq-usb.c b/drivers/phy/phy-imx8mq-usb.c index 69f01de55538..6cbcb2338cfe 100644 --- a/drivers/phy/phy-imx8mq-usb.c +++ b/drivers/phy/phy-imx8mq-usb.c @@ -14,6 +14,8 @@ #include <linux/delay.h> #include <linux/err.h> #include <clk.h> +#include <dm/device_compat.h> +#include <power/regulator.h> #define PHY_CTRL0 0x0 #define PHY_CTRL0_REF_SSP_EN BIT(2) @@ -81,6 +83,9 @@ struct imx8mq_usb_phy { #endif void __iomem *base; enum imx8mpq_phy_type type; +#if CONFIG_IS_ENABLED(DM_REGULATOR) + struct udevice *vbus_supply; +#endif }; static const struct udevice_id imx8mq_usb_phy_of_match[] = { @@ -172,10 +177,10 @@ static int imx8mq_usb_phy_power_on(struct phy *usb_phy) { struct udevice *dev = usb_phy->dev; struct imx8mq_usb_phy *imx_phy = dev_get_priv(dev); + __maybe_unused int ret; u32 value; #if CONFIG_IS_ENABLED(CLK) - int ret; ret = clk_enable(&imx_phy->phy_clk); if (ret) { printf("Failed to enable usb phy clock\n"); @@ -183,18 +188,31 @@ static int imx8mq_usb_phy_power_on(struct phy *usb_phy) } #endif + if (CONFIG_IS_ENABLED(DM_REGULATOR) && imx_phy->vbus_supply) { + ret = regulator_set_enable_if_allowed(imx_phy->vbus_supply, true); + if (ret && ret != -ENOSYS) { + dev_err(dev, "Failed to enable VBUS regulator: %d\n", ret); + goto err; + } + } + /* Disable rx term override */ value = readl(imx_phy->base + PHY_CTRL6); value &= ~PHY_CTRL6_RXTERM_OVERRIDE_SEL; writel(value, imx_phy->base + PHY_CTRL6); return 0; + +err: + clk_disable(&imx_phy->phy_clk); + return ret; } static int imx8mq_usb_phy_power_off(struct phy *usb_phy) { struct udevice *dev = usb_phy->dev; struct imx8mq_usb_phy *imx_phy = dev_get_priv(dev); + __maybe_unused int ret; u32 value; /* Override rx term to be 0 */ @@ -206,6 +224,14 @@ static int imx8mq_usb_phy_power_off(struct phy *usb_phy) clk_disable(&imx_phy->phy_clk); #endif + if (CONFIG_IS_ENABLED(DM_REGULATOR) && imx_phy->vbus_supply) { + ret = regulator_set_enable_if_allowed(imx_phy->vbus_supply, false); + if (ret && ret != -ENOSYS) { + dev_err(dev, "Failed to disable VBUS regulator: %d\n", ret); + return ret; + } + } + return 0; } @@ -224,6 +250,7 @@ struct phy_ops imx8mq_usb_phy_ops = { int imx8mq_usb_phy_probe(struct udevice *dev) { struct imx8mq_usb_phy *priv = dev_get_priv(dev); + __maybe_unused int ret; priv->type = dev_get_driver_data(dev); priv->base = dev_read_addr_ptr(dev); @@ -232,7 +259,6 @@ int imx8mq_usb_phy_probe(struct udevice *dev) return -EINVAL; #if CONFIG_IS_ENABLED(CLK) - int ret; /* Assigned clock already set clock */ ret = clk_get_by_name(dev, "phy", &priv->phy_clk); @@ -242,6 +268,15 @@ int imx8mq_usb_phy_probe(struct udevice *dev) } #endif + if (CONFIG_IS_ENABLED(DM_REGULATOR)) { + ret = device_get_supply_regulator(dev, "vbus-supply", + &priv->vbus_supply); + if (ret && ret != -ENOENT) { + dev_err(dev, "Failed to get VBUS regulator: %d\n", ret); + return ret; + } + } + return 0; } -- 2.25.1

3 10

[PATCH] arm: dts: imx8m: add OPTEE_LOAD_ADDRESS config and tee.bin
by Tim Harvey 12 Jul '23

12 Jul '23

Add a Kconfig for OPTEE_LOAD_ADDRESS which adds tee.bin to the imx8m{m,n,p} FIT image. Prior to using binman for image creation the presense of tee.bin in the directory would cause mkimage_fit_atf.sh to add the tee.bin node to the FIT image. Once boards moved away from using CONFIG_SPL_FIT_GENERATOR this was lost. This patch restores that functionality. A Kconfig option is added due to binman not being able to utilize env variables. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- arch/arm/dts/imx8mm-u-boot.dtsi | 19 +++++++++++++++++++ arch/arm/dts/imx8mn-u-boot.dtsi | 19 +++++++++++++++++++ arch/arm/dts/imx8mp-u-boot.dtsi | 19 +++++++++++++++++++ drivers/tee/optee/Kconfig | 7 +++++++ 4 files changed, 64 insertions(+) diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi index a843bb851eaf..61f907a4743b 100644 --- a/arch/arm/dts/imx8mm-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-u-boot.dtsi @@ -124,6 +124,21 @@ type = "atf-bl31"; }; }; + +#ifdef CONFIG_OPTEE_LOAD_ADDRESS + tee { + description = "TEE firmware"; + type = "firmware"; + arch = "arm64"; + compression = "none"; + load = <CONFIG_OPTEE_LOAD_ADDRESS>; + entry = <CONFIG_OPTEE_LOAD_ADDRESS>; + + tee_blob: blob-ext { + filename = "tee.bin"; + }; + }; +#endif #endif binman_fip: fip { @@ -154,7 +169,11 @@ fdt = "fdt-SEQ"; firmware = "uboot"; #ifndef CONFIG_ARMV8_PSCI +#ifdef CONFIG_OPTEE_LOAD_ADDRESS + loadables = "atf", "tee"; +#else loadables = "atf"; +#endif #endif }; }; diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi index 86c9a6cd67f0..15cec4ffab44 100644 --- a/arch/arm/dts/imx8mn-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-u-boot.dtsi @@ -181,6 +181,21 @@ type = "atf-bl31"; }; }; + +#ifdef CONFIG_OPTEE_LOAD_ADDRESS + tee { + description = "TEE firmware"; + type = "firmware"; + arch = "arm64"; + compression = "none"; + load = <CONFIG_OPTEE_LOAD_ADDRESS>; + entry = <CONFIG_OPTEE_LOAD_ADDRESS>; + + tee_blob: blob-ext { + filename = "tee.bin"; + }; + }; +#endif #endif binman_fip: fip { @@ -211,7 +226,11 @@ fdt = "fdt-SEQ"; firmware = "uboot"; #ifndef CONFIG_ARMV8_PSCI +#ifdef CONFIG_OPTEE_LOAD_ADDRESS + loadables = "atf", "tee"; +#else loadables = "atf"; +#endif #endif }; }; diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi index 8c9d6412ccb5..b46fc7eeed0d 100644 --- a/arch/arm/dts/imx8mp-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -145,6 +145,21 @@ type = "atf-bl31"; }; }; + +#ifdef CONFIG_OPTEE_LOAD_ADDRESS + tee { + description = "TEE firmware"; + type = "firmware"; + arch = "arm64"; + compression = "none"; + load = <CONFIG_OPTEE_LOAD_ADDRESS>; + entry = <CONFIG_OPTEE_LOAD_ADDRESS>; + + tee_blob: blob-ext { + filename = "tee.bin"; + }; + }; +#endif #endif @fdt-SEQ { @@ -166,7 +181,11 @@ fdt = "fdt-SEQ"; firmware = "uboot"; #ifndef CONFIG_ARMV8_PSCI +#ifdef CONFIG_OPTEE_LOAD_ADDRESS + loadables = "atf", "tee"; +#else loadables = "atf"; +#endif #endif }; }; diff --git a/drivers/tee/optee/Kconfig b/drivers/tee/optee/Kconfig index 9dc65b0501e2..09a8bbd2fafd 100644 --- a/drivers/tee/optee/Kconfig +++ b/drivers/tee/optee/Kconfig @@ -14,6 +14,13 @@ if OPTEE || SANDBOX menu "OP-TEE options" +config OPTEE_LOAD_ADDRESS + hex "Load address of OPTEE" + help + Defines the load and entry address used by U-Boot FIT images + for tee.bin. This address must match the link address that + tee.bin was built with. + config OPTEE_TA_AVB bool "Support AVB TA" default y -- 2.25.1

3 3

[RFC PATCH] riscv: sifive: fu70: downclock CPU clock for stability
by Icenowy Zheng 12 Jul '23

12 Jul '23

When building the package `rustc` for AOSC OS on HiFive Unmatched, random SIGSEGV prevents the package from getting correctly built. Downclocking the CPU PLL clock seems to allow rustc to be built, although taking much more time. Downclock the CPU PLL frequency for stability. Signed-off-by: Icenowy Zheng <uwu(a)icenowy.me> --- arch/riscv/dts/fu740-c000-u-boot.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/dts/fu740-c000-u-boot.dtsi b/arch/riscv/dts/fu740-c000-u-boot.dtsi index 706224b384..6b80cab588 100644 --- a/arch/riscv/dts/fu740-c000-u-boot.dtsi +++ b/arch/riscv/dts/fu740-c000-u-boot.dtsi @@ -8,7 +8,7 @@ / { cpus { assigned-clocks = <&prci FU740_PRCI_CLK_COREPLL>; - assigned-clock-rates = <1200000000>; + assigned-clock-rates = <988000000>; bootph-pre-ram; cpu0: cpu@0 { clocks = <&prci FU740_PRCI_CLK_COREPLL>; -- 2.39.1

2 3

[PULL] u-boot-riscv/master
by Leo Liang 12 Jul '23

12 Jul '23

Hi Tom, The following changes since commit 8e21064cb3452950b09301baec06d86e37342471: Merge tag 'efi-2023-07-rc7' of https://source.denx.de/u-boot/custodians/u-boot-efi (2023-07-11 13:27:32 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-riscv.git master for you to fetch changes up to 478fedfda42ea2a444991de1696fa0adc8bb16d4: doc: t-head: lpi4a: document Lichee PI 4A board (2023-07-12 13:21:41 +0800) CI result shows no issue: https://source.denx.de/u-boot/custodians/u-boot-riscv/-/pipelines/16856 ---------------------------------------------------------------- - Add ethernet driver for StarFive JH7110 SoC - Add ACLINT mtimer and mswi devices support - Add Lichee PI 4A board ---------------------------------------------------------------- Bin Meng (3): riscv: timer: Update the sifive clint timer driver to support aclint riscv: clint: Update the sifive clint ipi driver to support aclint riscv: Rename SiFive CLINT to RISC-V ALINT Yanhong Wang (11): net: phy: Add driver for Motorcomm yt8531 gigabit ethernet phy net: dwc_eth_qos: Add StarFive ethernet driver glue layer riscv: dts: jh7110: Add ethernet device tree nodes riscv: dts: jh7110: Combine the board device tree files of 1.2A and 1.3B doc: board: starfive:　Reword the make defconfig information configs: starfive: Enable ethernet configuration for StarFive VisionFive2 eeprom: starfive: Enable ID EEPROM configuration riscv: dts: starfive: Add support eeprom device tree node configs: starfive: Enable ID EEPROM configuration ram: starfive: Read memory size information from EEPROM board: starfive: Dynamic configuration of DT for 1.2A and 1.3B Yixun Lan (4): riscv: t-head: licheepi4a: initial support added riscv: dts: t-head: Add basic device tree for Sipeed Lichee PI 4A board configs: th1520_lpi4a_defconfig: Add initial config doc: t-head: lpi4a: document Lichee PI 4A board MAINTAINERS | 2 +- arch/riscv/Kconfig | 17 +++-- arch/riscv/cpu/fu540/Kconfig | 2 +- arch/riscv/cpu/fu740/Kconfig | 2 +- arch/riscv/cpu/generic/Kconfig | 4 +- arch/riscv/cpu/jh7110/Kconfig | 2 +- arch/riscv/cpu/jh7110/spl.c | 32 ++++++++- arch/riscv/dts/Makefile | 4 +- arch/riscv/dts/{jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi => jh7110-starfive-visionfive-2-u-boot.dtsi} | 39 ++++++++++- arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a.dts | 12 ---- arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi | 69 ------------------- arch/riscv/dts/{jh7110-starfive-visionfive-2-v1.3b.dts => jh7110-starfive-visionfive-2.dts} | 3 +- arch/riscv/dts/jh7110-starfive-visionfive-2.dtsi | 40 +++++++++++ arch/riscv/dts/jh7110.dtsi | 69 +++++++++++++++++++ arch/riscv/dts/th1520-lichee-module-4a.dtsi | 34 +++++++++ arch/riscv/dts/th1520-lichee-pi-4a.dts | 32 +++++++++ arch/riscv/dts/th1520.dtsi | 406 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/riscv/include/asm/arch-jh7110/eeprom.h | 13 ++++ arch/riscv/include/asm/global_data.h | 4 +- arch/riscv/include/asm/syscon.h | 2 +- arch/riscv/lib/Makefile | 2 +- arch/riscv/lib/{sifive_clint.c => aclint_ipi.c} | 31 +++++++-- board/openpiton/riscv64/Kconfig | 2 +- board/sipeed/maix/Kconfig | 2 +- board/starfive/visionfive2/Makefile | 1 + board/starfive/visionfive2/spl.c | 157 ++++++++++++++++++++++++++++++++++++++++++ board/starfive/visionfive2/starfive_visionfive2.c | 13 ++++ board/starfive/visionfive2/visionfive2-i2c-eeprom.c | 561 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/thead/th1520_lpi4a/Kconfig | 42 ++++++++++++ board/thead/th1520_lpi4a/MAINTAINERS | 7 ++ board/thead/th1520_lpi4a/Makefile | 5 ++ board/thead/th1520_lpi4a/board.c | 15 ++++ configs/starfive_visionfive2_defconfig | 32 ++++++++- configs/th1520_lpi4a_defconfig | 82 ++++++++++++++++++++++ doc/board/index.rst | 1 + doc/board/starfive/visionfive2.rst | 6 +- doc/board/thead/index.rst | 9 +++ doc/board/thead/lpi4a.rst | 129 +++++++++++++++++++++++++++++++++++ drivers/net/Kconfig | 7 ++ drivers/net/Makefile | 1 + drivers/net/dwc_eth_qos.c | 6 ++ drivers/net/dwc_eth_qos.h | 1 + drivers/net/dwc_eth_qos_starfive.c | 249 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/phy/Kconfig | 6 ++ drivers/net/phy/Makefile | 1 + drivers/net/phy/motorcomm.c | 437 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/ram/starfive/starfive_ddr.c | 2 - drivers/timer/Makefile | 2 +- drivers/timer/riscv_aclint_timer.c | 74 ++++++++++++++++++++ drivers/timer/sifive_clint_timer.c | 68 ------------------ include/configs/qemu-riscv.h | 2 +- include/configs/sifive-unleashed.h | 2 +- include/configs/starfive-visionfive2.h | 1 + include/configs/th1520_lpi4a.h | 22 ++++++ 54 files changed, 2578 insertions(+), 188 deletions(-) rename arch/riscv/dts/{jh7110-starfive-visionfive-2-v1.2a-u-boot.dtsi => jh7110-starfive-visionfive-2-u-boot.dtsi} (58%) delete mode 100644 arch/riscv/dts/jh7110-starfive-visionfive-2-v1.2a.dts delete mode 100644 arch/riscv/dts/jh7110-starfive-visionfive-2-v1.3b-u-boot.dtsi rename arch/riscv/dts/{jh7110-starfive-visionfive-2-v1.3b.dts => jh7110-starfive-visionfive-2.dts} (65%) create mode 100644 arch/riscv/dts/th1520-lichee-module-4a.dtsi create mode 100644 arch/riscv/dts/th1520-lichee-pi-4a.dts create mode 100644 arch/riscv/dts/th1520.dtsi create mode 100644 arch/riscv/include/asm/arch-jh7110/eeprom.h rename arch/riscv/lib/{sifive_clint.c => aclint_ipi.c} (53%) create mode 100644 board/starfive/visionfive2/visionfive2-i2c-eeprom.c create mode 100644 board/thead/th1520_lpi4a/Kconfig create mode 100644 board/thead/th1520_lpi4a/MAINTAINERS create mode 100644 board/thead/th1520_lpi4a/Makefile create mode 100644 board/thead/th1520_lpi4a/board.c create mode 100644 configs/th1520_lpi4a_defconfig create mode 100644 doc/board/thead/index.rst create mode 100644 doc/board/thead/lpi4a.rst create mode 100644 drivers/net/dwc_eth_qos_starfive.c create mode 100644 drivers/net/phy/motorcomm.c create mode 100644 drivers/timer/riscv_aclint_timer.c delete mode 100644 drivers/timer/sifive_clint_timer.c create mode 100644 include/configs/th1520_lpi4a.h Best regards, Leo

2 1

[PATCH 0/2] board: rockchip: Add Hardkernel ODROID-M1
by Jonas Karlman 12 Jul '23

12 Jul '23

This series add support for Hardkernel ODROID-M1, a single board computer with a RK3568B2 SoC. First patch fixes a build issue in the dwc_ahci driver. Second patch import the device tree from linux v6.4 and add a defconfig for Hardkernel ODROID-M1. Following was tested on a ODROID-M1 8GB v1.0 2022-06-13: - SD-card boot - eMMC boot - SPI Flash boot - PCIe/NVMe/AHCI - SATA port - USB host This series have loose dependencies on the following series: - rockchip: Fix PCIe and NVMe support on RK3568 [1] - rockchip: rk3568: Use dwc3-generic driver [2] - rockchip: rk3568: Fix alloc space exhausted in SPL [3] - rockchip: rk3568: Device Tree updates [4] [1] https://patchwork.ozlabs.org/project/uboot/list/?series=355486 [2] https://patchwork.ozlabs.org/project/uboot/list/?series=357200 [3] https://patchwork.ozlabs.org/project/uboot/list/?series=361999 [4] https://patchwork.ozlabs.org/project/uboot/list/?series=362030 Jonas Karlman (2): ata: dwc_ahci: Fix support for other platforms board: rockchip: Add Hardkernel ODROID-M1 arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi | 46 ++ arch/arm/dts/rk3568-odroid-m1.dts | 744 ++++++++++++++++++++++ board/rockchip/evb_rk3568/MAINTAINERS | 7 + configs/odroid-m1-rk3568_defconfig | 103 +++ doc/board/rockchip/rockchip.rst | 1 + drivers/ata/dwc_ahci.c | 4 + 7 files changed, 906 insertions(+) create mode 100644 arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi create mode 100644 arch/arm/dts/rk3568-odroid-m1.dts create mode 100644 configs/odroid-m1-rk3568_defconfig -- 2.41.0

2 6

[PATCH] fdt: cmd: allow to add chosen properties
by Alexander Couzens 12 Jul '23

12 Jul '23

Add command fdt chosenu32/chosenstr to allow setting runtime properties. This is useful to pass information to the OS. E.g. which slot is currently booted in a A/B/recovery scheme. Or the reset reason which may only visitable to the u-boot. Scripts can use: > fdt chosenstr u-boot,abboot b To inform the OS which slot was booted. or pass u32 > fdt chosenu32 u-boot,try 3 Signed-off-by: Alexander Couzens <lynxis(a)fe80.eu> --- cmd/fdt.c | 10 +++++++ common/fdt_support.c | 69 +++++++++++++++++++++++++++++++++++++++++++ include/fdt_support.h | 2 ++ 3 files changed, 81 insertions(+) diff --git a/cmd/fdt.c b/cmd/fdt.c index aae3278526c4..050014cccd0e 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -278,6 +278,14 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return CMD_RET_SUCCESS; } + else if (strncmp(argv[1], "chosenstr", 3) == 0) { + if (argc != 4) + return CMD_RET_USAGE; + + fdt_chosen_set_str(argv[2], argv[3]); + return 0; + } + if (!working_fdt) { puts("No FDT memory address configured. Please configure\n" "the FDT address via \"fdt addr <address>\" command.\n" @@ -1147,6 +1155,8 @@ static char fdt_help_text[] = "fdt rsvmem delete <index> - Delete a mem reserves\n" "fdt chosen [<start> <size>] - Add/update the /chosen branch in the tree\n" " <start>/<size> - initrd start addr/size\n" + "fdt chosenu32 key value - Add key to /chosen with u32 value\n" + "fdt chosenstr key value - Add key to /chosen with string value\n" #if defined(CONFIG_FIT_SIGNATURE) "fdt checksign [<addr>] - check FIT signature\n" " <addr> - address of key blob\n" diff --git a/common/fdt_support.c b/common/fdt_support.c index 2053fe3bad83..33b22ebc94ad 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -10,10 +10,12 @@ #include <abuf.h> #include <env.h> #include <log.h> +#include <malloc.h> #include <mapmem.h> #include <net.h> #include <stdio_dev.h> #include <linux/ctype.h> +#include <linux/list.h> #include <linux/types.h> #include <asm/global_data.h> #include <linux/libfdt.h> @@ -22,6 +24,21 @@ #include <fdtdec.h> #include <version.h> +static LIST_HEAD(chosen_entries); + +enum fdt_chosen_type { + FDT_CHOSEN_TYPE_U32, + FDT_CHOSEN_TYPE_STR, +}; + +struct fdt_chosen_entry { + struct list_head list; + enum fdt_chosen_type type; + char *key; + char *str; + u32 u32; +}; + /** * fdt_getprop_u32_default_node - Return a node's property or a default * @@ -269,6 +286,34 @@ int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end) return 0; } +int fdt_chosen_set_str(char *key, char *value) +{ + struct fdt_chosen_entry *entry = calloc(1, sizeof(*entry)); + + if (!entry) + return 1; + + entry->type = FDT_CHOSEN_TYPE_STR; + entry->key = strdup(key); + entry->str = strdup(value); + list_add_tail(&entry->list, &chosen_entries); + return 0; +} + +int fdt_chosen_set_int(char *key, u32 value) +{ + struct fdt_chosen_entry *entry = calloc(1, sizeof(*entry)); + + if (!entry) + return 1; + + entry->type = FDT_CHOSEN_TYPE_U32; + entry->key = strdup(key); + entry->u32 = value; + list_add_tail(&entry->list, &chosen_entries); + return 0; +} + /** * board_fdt_chosen_bootargs - boards may override this function to use * alternative kernel command line arguments @@ -284,6 +329,7 @@ int fdt_chosen(void *fdt) int nodeoffset; int err; char *str; /* used to set string properties */ + struct list_head *entry; err = fdt_check_header(fdt); if (err < 0) { @@ -319,6 +365,29 @@ int fdt_chosen(void *fdt) } } + list_for_each(entry, &chosen_entries) { + struct fdt_chosen_entry *chosen = list_entry(entry, struct fdt_chosen_entry, list); + + switch (chosen->type) { + case FDT_CHOSEN_TYPE_STR: + err = fdt_setprop_string(fdt, nodeoffset, chosen->key, chosen->str); + if (err < 0) { + printf("WARNING: could not set fdt %s to %s. Error: %s.\n", + chosen->key, chosen->str, fdt_strerror(err)); + continue; + } + break; + case FDT_CHOSEN_TYPE_U32: + err = fdt_setprop_u32(fdt, nodeoffset, chosen->key, chosen->u32); + if (err < 0) { + printf("WARNING: could not set fdt %s to %d. Error: %s.\n", + chosen->key, chosen->u32, fdt_strerror(err)); + continue; + } + break; + } + } + /* add u-boot version */ err = fdt_setprop(fdt, nodeoffset, "u-boot,version", PLAIN_VERSION, strlen(PLAIN_VERSION) + 1); diff --git a/include/fdt_support.h b/include/fdt_support.h index 5638bd4f1655..b1c331f05370 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -51,6 +51,8 @@ int fdt_root(void *fdt); * Return: 0 if ok, or -FDT_ERR_... on error */ int fdt_chosen(void *fdt); +int fdt_chosen_set_str(char *key, char *value); +int fdt_chosen_set_int(char *key, u32 value); /** * Add initrd information to the FDT before booting the OS. -- 2.40.1

2 1

[PATCH 0/4] introduce EFI_RAM_DISK_PROTOCOL
by Masahisa Kojima 12 Jul '23

12 Jul '23

This series introduces the EFI_RAM_DISK_PROTOCOL implementation. The major purpose of this series is a preparation for EFI HTTP(S) boot. Now U-Boot can download the distro installer ISO image via wget or tftpboot commands, but U-Boot can not mount the downloaded ISO image. By calling EFI_RAM_DISK_PROTOCOL->register API, user can mount the ISO image and boot the distro installer. Note that the installation process may not proceed after the distro installer calls ExitBootServices() since there is no hand-off process for the block device of memory mapped ISO image. The EFI_RAM_DISK_PROTOCOL was tested with the debian network installer[1] on qemu_arm64 platform. The example procedure is as follows. => tftpboot 41000000 mini.iso => efidebug disk load 41000000 $filesize After these commands, ISO image is mounted like: => efidebug dh 000000007eec5910 (efiblk#0) /RamDisk(0x41000000,4974afff,3d5abd30-4175-87ce-6d64-d2ade523c4bb,0x0) Block IO 000000007eec6140 (efiblk#0:1) /RamDisk(0x41000000,4974afff,3d5abd30-4175-87ce-6d64-d2ade523c4bb,0x0)/HD(1,0x01,0,0x0,0x33800) Block IO 000000007eec62b0 (efiblk#0:2) /RamDisk(0x41000000,4974afff,3d5abd30-4175-87ce-6d64-d2ade523c4bb,0x0)/HD(2,0x01,0,0x33800,0x10000) Block IO System Partition Simple File System => dm tree blk 0 [ + ] efi_blk `-- efiblk#0 partition 0 [ + ] blk_partition |-- efiblk#0:1 partition 1 [ + ] blk_partition `-- efiblk#0:2 Debian can be successfully installed with this RAM disk on QEMU. [TODO] - udevices created in ./lib/efi_driver/efi_block_device.c::efi_bl_bind() are not removed when the efi_handle is removed. So after unload the RAM disk, udevices still exist. I plan to add a udevice removal process in ./lib/efi_driver/efi_uclass.c::efi_uc_stop(). In addition, I also plan to add unbind() callback in struct efi_driver_ops. [1] https://deb.debian.org/debian/dists/bookworm/main/installer-arm64/current/i… Masahisa Kojima (4): efi_loader: add RAM disk device path efi_loader: add EFI_RAM_DISK_PROTOCOL implementation cmd: efidebug: add RAM disk mount command efi_selftest: add EFI_RAM_DISK_PROTOCOL selftest cmd/efidebug.c | 117 ++++++ include/efi_api.h | 32 ++ include/efi_loader.h | 4 + lib/efi_driver/efi_uclass.c | 7 +- lib/efi_loader/Kconfig | 6 + lib/efi_loader/Makefile | 1 + lib/efi_loader/efi_device_path_to_text.c | 14 + lib/efi_loader/efi_ram_disk.c | 334 +++++++++++++++ lib/efi_loader/efi_setup.c | 6 + lib/efi_selftest/Makefile | 1 + lib/efi_selftest/efi_selftest_ram_disk.c | 511 +++++++++++++++++++++++ lib/uuid.c | 4 + 12 files changed, 1035 insertions(+), 2 deletions(-) create mode 100644 lib/efi_loader/efi_ram_disk.c create mode 100644 lib/efi_selftest/efi_selftest_ram_disk.c base-commit: e2e2aea5733f0d23cd9593bbefe5c803c552dcb9 -- 2.34.1

4 16

[PATCH v2 00/19] bootstd: Add a bootmeth for ChromiumOS on x86
by Simon Glass 12 Jul '23

12 Jul '23

This series adds a simple bootmeth for ChromiumOS on x86. It uses zimage to boot the kernel. Full verified boot is not included at this stage - that is still a separate chunk of code to be brought into standard boot at some point. For now it just obtains the kernel and command line and boots. This should be enough to boot Chrome OS from coreboot on all x86 machines in circulation, although only Brya (2022) and Coral (2017) have been tested. ChromiumOS needs quite large kernel parameters, to hold the DM verity settings and other pieces. This makes it painful to modify just one parameter, since the whole cmdline must be adjusted at once. To cope with this, a new cmdline-editing feature is provided: the 'bootflow cmdline' command allows individual parameters to be added, modified and deleted. To deal with enabling debug console, a variant supports setting 'earlycon' and 'console' automatically. The 'bdinfo' command is updated to show serial-port info also. Booting the zimage is now done programmatically, rather than running through the command-line interface. Minor tweaks are made to the coreboot and coral config so that booting works correctly. Note that the ACPI tables are not updated with the required firmware information in this series, so a warning is shown on boot. This will be addressed later since it requires quite a bit of configuration. Finally, this fixes a recently introduced bug in unit testing and updates the algorithm to avoid running flat-tree tests which don't actually use the devicetree. Changes in v2: - Add a comment that this is not a full revert - Update host_bootdev.c too - Correct 'it not known' typo - Explain why the setup information is not behind an #ifdef - Add comment for copy_in() - Avoid multiplication on a boolean - Add a comment as to why @len is needed - Show error messages when something goes wrong - Add new patch to create a little more room for U-Boot on qemu-x86_64 - Add new patch to switch x86 qemu to standard boot - Drop mention of NVMe support Simon Glass (19): test: Restore test behaviour on failure test: Skip flat-tree tests if devicetree is not used bootstd: Correct the name of the QEMU bootmeth bootstd: Use bootdev instead of bootdevice bootstd: Correct baudrate typo bootstd: Allow storing the OS command line in the bootflow bootstd: Use the bootargs env var for changing the cmdline bootstd: Allow storing x86 setup information bdinfo: Show information about the serial port bootstd: Add a function to update a command line bootstd: Add support for updating elements of the cmdline x86: qemu: Create a little more room for U-Boot x86: qemu: Switch to standard boot bootstd: Support automatically setting Linux parameters x86: Add a function to boot a zimage x86: zimage: Export the function to obtain the cmdline bootstd: Add a simple bootmeth for ChromiumOS x86: coreboot: Adjust various config options x86: coral: Adjust various config options arch/x86/include/asm/zimage.h | 27 +++ arch/x86/lib/zimage.c | 93 ++++++-- boot/Kconfig | 11 + boot/Makefile | 1 + boot/bootflow.c | 339 ++++++++++++++++++++++++++++- boot/bootmeth-uclass.c | 2 +- boot/bootmeth_cros.c | 212 ++++++++++++++++++ boot/bootmeth_qfw.c | 2 +- cmd/bdinfo.c | 21 ++ cmd/bootflow.c | 87 +++++++- configs/chromebook_coral_defconfig | 10 +- configs/coreboot_defconfig | 16 +- configs/qemu-x86_64_defconfig | 5 +- configs/qemu-x86_defconfig | 2 +- configs/tools-only_defconfig | 1 + doc/usage/cmd/bootflow.rst | 100 ++++++++- drivers/mmc/mmc_bootdev.c | 2 +- drivers/scsi/scsi_bootdev.c | 2 +- drivers/usb/host/usb_bootdev.c | 2 +- fs/sandbox/host_bootdev.c | 2 +- include/bootdev.h | 2 +- include/bootflow.h | 100 ++++++++- include/configs/qemu-x86.h | 8 - include/env_callback.h | 6 +- include/test/ut.h | 36 +-- net/eth_bootdev.c | 2 +- test/boot/bootflow.c | 263 ++++++++++++++++++++++ test/test-main.c | 3 +- 28 files changed, 1283 insertions(+), 74 deletions(-) create mode 100644 boot/bootmeth_cros.c -- 2.41.0.162.gfafddb0af9-goog

2 33

[PATCH v4 0/3] binman: Add support for externally encrypted blobs
by christian.taedcke-oss＠weidmueller.com 12 Jul '23

12 Jul '23

From: Christian Taedcke <christian.taedcke(a)weidmueller.com> This series adds the functionality to handle externally encrypted blobs to binman. It includes the functionality itself and the corresponding unit tests. The following block shows an example on how to use this functionality. In the device tree that is parsed by binman a new node encrypted is used: / { binman { filename = "u-boot.itb"; fit { ... images { some-bitstream { ... image_bitstream: blob-ext { filename = "bitstream.bin"; }; encrypted { content = <&image_bitstream>; algo = "aes256-gcm"; iv-filename = "bitstream.bin.iv"; key-filename = "bitstream.bin.key"; }; ... This results in an generated fit image containing the following information: \ { images { ... some-bitstream { ... data = [...] cipher { algo = "aes256-gcm"; key = <0x...>; iv = <0x...>; }; }; ... Changes in v4: - fix failing test testEncryptedKeyFile Changes in v3: - rebase on u-boot-dm/mkim-working - remove unnecessary test testEncryptedNoContent - update doc for functions ObtainContents and ProcessContents - update entries.rst - wrap some lines at 80 cols Changes in v2: - adapt tests for changed entry implementation - add entry documentation - remove global /cipher node - replace key-name-hint with key-source property Christian Taedcke (3): binman: Add support for externally encrypted blobs binman: Allow cipher node as special section binman: Add tests for etype encrypted tools/binman/entries.rst | 88 ++++++++++ tools/binman/etype/encrypted.py | 157 ++++++++++++++++++ tools/binman/etype/section.py | 2 +- tools/binman/ftest.py | 53 ++++++ tools/binman/test/291_encrypted_no_algo.dts | 19 +++ .../test/292_encrypted_invalid_iv_file.dts | 23 +++ .../binman/test/293_encrypted_missing_key.dts | 28 ++++ .../binman/test/294_encrypted_key_source.dts | 29 ++++ tools/binman/test/295_encrypted_key_file.dts | 29 ++++ 9 files changed, 427 insertions(+), 1 deletion(-) create mode 100644 tools/binman/etype/encrypted.py create mode 100644 tools/binman/test/291_encrypted_no_algo.dts create mode 100644 tools/binman/test/292_encrypted_invalid_iv_file.dts create mode 100644 tools/binman/test/293_encrypted_missing_key.dts create mode 100644 tools/binman/test/294_encrypted_key_source.dts create mode 100644 tools/binman/test/295_encrypted_key_file.dts -- 2.34.1

4 11