November 2024 - U-Boot

[PATCH v2] net: lwip: dhcp: support arguments for TFTP file download
by Jerome Forissier 26 Nov '24

26 Nov '24

The dhcp command is supposed to have the following syntax as per "help dhcp": dhcp [loadAddress] [[hostIPaddr:]bootfilename] In other words, any arguments should be passed to an implicit tftpboot command after the DHCP exchange has occurred. Add the missing code to the lwIP version of do_dhcp(). Signed-off-by: Jerome Forissier <jerome.forissier(a)linaro.org> --- net/lwip/dhcp.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/net/lwip/dhcp.c b/net/lwip/dhcp.c index 23b56226921..281f4620958 100644 --- a/net/lwip/dhcp.c +++ b/net/lwip/dhcp.c @@ -111,9 +111,21 @@ static int dhcp_loop(struct udevice *udev) int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { + int ret; + eth_set_current(); - return dhcp_loop(eth_get_dev()); + ret = dhcp_loop(eth_get_dev()); + if (ret) + return ret; + + if (argc > 1) { + struct cmd_tbl cmdtp = {}; + + return do_tftpb(&cmdtp, 0, argc, argv); + } + + return CMD_RET_SUCCESS; } int dhcp_run(ulong addr, const char *fname, bool autoload) -- 2.40.1

2 2

[PATCH 0/2] rng: msm: support newer SoCs
by Neil Armstrong 26 Nov '24

26 Nov '24

Add support for RNG on newer SoCs which shares the RNG hardware between different Execution Environments (EE). Also enable it by default to fill KASL seed when running Linux. Signed-off-by: Neil Armstrong <neil.armstrong(a)linaro.org> --- Neil Armstrong (2): rng: msm: add support for newer Qualcomm hwrandom IPs configs: qcom_defconfig: enable RNG driver and command configs/qcom_defconfig | 3 +++ drivers/rng/msm_rng.c | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) --- base-commit: dc1859f8d2ac3faaa5e2e1d465ec4bd8980520a5 change-id: 20241125-topic-sm8x50-rng-714cd0012391 Best regards, -- Neil Armstrong <neil.armstrong(a)linaro.org>

2 3

[PATCH v4 00/20] imx8qxp: siemens board: updates / sync with mainline
by Heiko Schocher 26 Nov '24

26 Nov '24

Updating the imx8qxp based siemens board. The current state of the siemens imx8qxp board is in an old not really working state. This series brings mainline back working on the siemens deneb board, the guedi board is dropped as not longer used. make all runs fine without having all the needed firmware images on board, and so CI @azure. If you want to have a working image you need to copy the following images to your build directory $BDIR: ATF : bl31-imx8dx.bin -> $BDIR/bl31.bin AHAB: mx8qxc0-ahab-container.img -> $BDIR/mx8qxc0-ahab-container.img SCFW: deneb-scfw-tcm.bin -> $BDIR/mx8qx-mek-scfw-tcm.bin and call make flash.bin There are also updates for ethernet and USB support, but not ready to push upstream currently, hopefully following soon. Azure build: https://dev.azure.com/hs0298/hs/_build/results?buildId=139&view=results series is based on mainline commit: 7fe55182d92 ("Merge tag 'xilinx-for-v2025.01-rc3-v2' of https://source.denx.de/u-boot/custodians/u-boot-microblaze") Ah yes, not to forget, we work at siemens also on a CI setup to have a mainline nightly build and test on hardware. We already have such a CI for internall U-Boot versions up and running, but we do not want again loose sync with mainline. Changes in v4: - rebased to mainline commit 7fe55182d92 ("Merge tag 'xilinx-for-v2025.01-rc3-v2' of https://source.denx.de/u-boot/custodians/u-boot-microblaze") and fixed merge problem in defconfig - remove hint that patch https://patchwork.ozlabs.org/project/uboot/patch/20241104180203.110395-1-hs… is needed as already in mainline now. - comment from Stefan rename sc_timer_control_pmic_wdog() to sc_timer_control_siemens_pmic_wdog() rename TIMER_FUNC_CTRL_PMIC_WDOG to TIMER_FUNC_CTRL_SIEMENS_PMIC_WDOG correct debug printf (fits into one line) added Reviewed-by from Stefan - add Reviewed-by from Alexander - add Reviewed-by from Alexander Changes in v3: - add Reviewed-by tag from Alexander - add comments from Igor fix spelling issues depends on ARCH_IMX8 instead of IMX8 Kconfig symbol - comment from Francesco and Stefan rename Kconfig symbol from WDT_SCU_PMIC to WDT_SIEMENS_PMIC rename scu_pmic_wdt.c to siemens_pmic_wdt.c - use renamed Kconfig symbol CONFIG_WDT_SIEMENS_PMIC Changes in v2: remove patch "siemens: capricorn: add missing ARCH_MISC_INIT" as we do not need this config option anymore. remove patch "siemens: imx8-capricorn-u-boot.dtsi: add fec2" as fec2 is not used in SPL! - work on comments from Stefan: - rename driver file from scu_wdt.c to scu_pmic_wdt.c - rename Kconfig symbol from CONFIG_WDT_IMX_SCU to CONFIG_WDT_SCU_PMIC - reworked Kconfig help text - add comment that TIMER_FUNC_CTRL_PMIC_WDOG is a siemens specific SCU API extension in their SCFW. - reworked commit message add Reviewed-by from Alexander - add "bootph-all" in A35_0 node to u-boot.dtsi not in dts for the board! - add comment from Walter fix typo: than -> then - add Reviewed-by from Alexander - add comments from Fabio fix typo: silicium -> silicon - add Reviewed-by from Alexander - use renamed Kconfig symbol CONFIG_WDT_SCU_PMIC - add comments rom Fabio and Enrico do not remove DMA for console remove u-boot specific property addition, instead add it in arch/arm/dts/imx8qxp-u-boot.dtsi - add comments from Fabio rename subject line and rework commit message, alse remove unneeded comment in checkboard() - add comment from Fabio add From line, as patch is from Alessandro fix typo in commit description: drace -> draco - remove CONFIG_XPL_BUILD in board_init as board_init is not called from SPL. add From tag reworked the commit message a little bit Add From tag - add Reviewed-by from Alexander Alessandro Zini (1): siemens: capricorn: add HW version information to boot log Enrico Leto (6): siemens: capricorn: move to cxg3 reference project with deneb board siemens: capricorn: get ram size from system controller siemens: capricorn: get module name from eeprom siemens: add ddr full memory test siemens: add ddr signal integrity test siemens: capricorn: update maintainers Heiko Schocher (13): wdt: imx8qxp: add option to control external PMIC wdt via IMX8 SCU net: fec_mxc: fix probing for imx8qxp tools: imx8image: Improve error message imx: imx_cntr_image.sh: prevent warning for missing spl imx8qxp: Fix build when using SPL siemens: imx8qxp-capricorn-u-boot.dtsi: fix boot siemens: capricorn: use DCD_SKIP entry siemens: imximage.cfg: correct comment siemens: imximage.cfg: sync image names siemens: configs/capricorn_cxg3_defconfig: updates siemens: capricorn: sync spl code with 8qxp-mek siemens: imx8-capricorn.dtsi: add wdt device siemens: capricorn: small board updates arch/arm/dts/Makefile | 3 +- arch/arm/dts/imx8-capricorn-cxg3.dts | 129 +++++++ ...u-boot.dtsi => imx8-capricorn-u-boot.dtsi} | 67 ++-- ...qxp-capricorn.dtsi => imx8-capricorn.dtsi} | 109 +----- arch/arm/dts/imx8-deneb.dts | 10 - arch/arm/dts/imx8-giedi.dts | 10 - arch/arm/dts/imx8qxp-u-boot.dtsi | 2 + arch/arm/mach-imx/imx8/Kconfig | 11 +- board/boundary/nitrogen6x/nitrogen6x.c | 2 +- board/siemens/capricorn/Kconfig | 25 +- board/siemens/capricorn/MAINTAINERS | 12 +- board/siemens/capricorn/Makefile | 2 + board/siemens/capricorn/board.c | 70 +++- board/siemens/capricorn/imximage.cfg | 21 +- board/siemens/capricorn/spl.c | 43 +++ board/siemens/capricorn/spl_memory_test.c | 158 ++++++++ board/siemens/capricorn/spl_memory_test.h | 7 + board/siemens/common/Kconfig | 4 + board/siemens/common/board.h | 44 +++ board/siemens/common/ddr_si_test.c | 348 ++++++++++++++++++ board/siemens/draco/board.h | 10 +- board/solidrun/mx6cuboxi/mx6cuboxi.c | 2 +- ...neb_defconfig => capricorn_cxg3_defconfig} | 21 +- configs/giedi_defconfig | 133 ------- drivers/misc/imx8/scu_api.c | 20 + drivers/net/fec_mxc.c | 14 +- drivers/watchdog/Kconfig | 7 + drivers/watchdog/Makefile | 1 + drivers/watchdog/siemens_pmic_wdt.c | 59 +++ include/configs/capricorn-common.h | 4 +- include/configs/deneb.h | 16 - include/firmware/imx/sci/rpc.h | 3 + include/firmware/imx/sci/sci.h | 1 + include/netdev.h | 2 +- tools/imx8image.c | 2 +- tools/imx_cntr_image.sh | 4 + 36 files changed, 1001 insertions(+), 375 deletions(-) create mode 100644 arch/arm/dts/imx8-capricorn-cxg3.dts rename arch/arm/dts/{imx8qxp-capricorn-u-boot.dtsi => imx8-capricorn-u-boot.dtsi} (54%) rename arch/arm/dts/{imx8qxp-capricorn.dtsi => imx8-capricorn.dtsi} (64%) delete mode 100644 arch/arm/dts/imx8-deneb.dts delete mode 100644 arch/arm/dts/imx8-giedi.dts create mode 100644 board/siemens/capricorn/spl_memory_test.c create mode 100644 board/siemens/capricorn/spl_memory_test.h create mode 100644 board/siemens/common/board.h create mode 100644 board/siemens/common/ddr_si_test.c rename configs/{deneb_defconfig => capricorn_cxg3_defconfig} (88%) delete mode 100644 configs/giedi_defconfig create mode 100644 drivers/watchdog/siemens_pmic_wdt.c delete mode 100644 include/configs/deneb.h -- 2.20.1

2 21

[PATCH] board: phytec: phycore-imx8mm: Add EEPROM detection initialisation
by Yunus Bas 26 Nov '24

26 Nov '24

Add EEPROM detection initialisation for phyCORE-i.MX8MM. Signed-off-by: Yunus Bas <y.bas(a)phytec.de> --- .../dts/imx8mm-phyboard-polis-rdk-u-boot.dtsi | 8 ++++++++ board/phytec/phycore_imx8mm/Kconfig | 1 + board/phytec/phycore_imx8mm/spl.c | 17 +++++++++++++++++ configs/phycore-imx8mm_defconfig | 1 + 4 files changed, 27 insertions(+) diff --git a/arch/arm/dts/imx8mm-phyboard-polis-rdk-u-boot.dtsi b/arch/arm/dts/imx8mm-phyboard-polis-rdk-u-boot.dtsi index 516e52e1f5d..512dbc9ee86 100644 --- a/arch/arm/dts/imx8mm-phyboard-polis-rdk-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-phyboard-polis-rdk-u-boot.dtsi @@ -14,6 +14,10 @@ }; }; +&pinctrl_i2c1 { + bootph-pre-ram; +}; + &pinctrl_uart3 { bootph-pre-ram; }; @@ -54,6 +58,10 @@ bootph-pre-ram; }; +&i2c1 { + bootph-pre-ram; +}; + &uart3 { bootph-pre-ram; }; diff --git a/board/phytec/phycore_imx8mm/Kconfig b/board/phytec/phycore_imx8mm/Kconfig index 25e4bf2f836..06449128ba8 100644 --- a/board/phytec/phycore_imx8mm/Kconfig +++ b/board/phytec/phycore_imx8mm/Kconfig @@ -12,4 +12,5 @@ config SYS_CONFIG_NAME config IMX_CONFIG default "board/phytec/phycore_imx8mm/imximage-8mm-sd.cfg" +source "board/phytec/common/Kconfig" endif diff --git a/board/phytec/phycore_imx8mm/spl.c b/board/phytec/phycore_imx8mm/spl.c index 8d858590a39..faff064779c 100644 --- a/board/phytec/phycore_imx8mm/spl.c +++ b/board/phytec/phycore_imx8mm/spl.c @@ -17,8 +17,13 @@ #include <log.h> #include <spl.h> +#include "../common/imx8m_som_detection.h" + DECLARE_GLOBAL_DATA_PTR; +#define EEPROM_ADDR 0x51 +#define EEPROM_ADDR_FALLBACK 0x59 + int spl_board_boot_device(enum boot_device boot_dev_spl) { switch (boot_dev_spl) { @@ -39,6 +44,18 @@ int spl_board_boot_device(enum boot_device boot_dev_spl) static void spl_dram_init(void) { + int ret; + + ret = phytec_eeprom_data_setup_fallback(NULL, 0, EEPROM_ADDR, + EEPROM_ADDR_FALLBACK); + if (ret) + goto out; + + ret = phytec_imx8m_detect(NULL); + if (!ret) + phytec_print_som_info(NULL); + +out: ddr_init(&dram_timing); } diff --git a/configs/phycore-imx8mm_defconfig b/configs/phycore-imx8mm_defconfig index c8fbcc910d8..3f4336837e9 100644 --- a/configs/phycore-imx8mm_defconfig +++ b/configs/phycore-imx8mm_defconfig @@ -11,6 +11,7 @@ CONFIG_ENV_OFFSET=0x3C0000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8mm-phyboard-polis-rdk" CONFIG_TARGET_PHYCORE_IMX8MM=y +CONFIG_PHYTEC_SOM_DETECTION=y CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y -- 2.25.1

2 1

[PATCH v4 0/3] Add support for all variants of the phyCORE-i.MX93 SOM
by Christoph Stoidner 26 Nov '24

26 Nov '24

The phyCORE-i.MX 93 is available in various variants (e.g. different ram sizes, eMMC HS400 yes/no). It's eeprom contains information which features the existing module supports. Extend the existing board-code to support all the SOM variants. The spl/u-boot evaluates the eeprom information and enables supported features accordingly. The resulting spl and u-boot binary is able to boot each phyCORE-i.MX 93 SOM variant on each carrier board. Changes in v4: patch #1: - none changes patch #2: - add missing pinctrls for eMMC 100mhz and 200mhz patch #3: - none changes Changes in v3: patch #1: - none changes patch #2: - remove unwanted dts node eepromid - correct typo in doc (PHYTEC_IMX93_VOLTAGE_3V3) - improve enum code-style (phytec_imx93_option_index) patch #3: - add comment about SoM-scope to imx93-phyboard-segin-u-boot.dtsi - rebase to the latest master - adapt doc according to new defconfig Changes in v2: patch #1: - remove multiple blank lines - add update of 1GB ram timings to commit message patch #2: - encapsulate handling of feature flag VOLTAGE into own function - move definition of enum phytec_imx93_ddr_eeprom_code into header file patch #3: - just rename imx93-phyboard-segin_defconfig and add needed CONFIGs, instead of creating an entirely new second defconfig - remove wrong comment from imx93-phyboard-segin-u-boot.dtsi - improve commit message Christoph Stoidner (3): board: phytec: phycore-imx93: Add 2GB LPDDR4X RAM timings board: phytec: imx93: Add eeprom-based hardware introspection board: phytec: imx93: Add phyCORE-i.MX 93 support for all SOM variants arch/arm/dts/imx93-phyboard-segin-u-boot.dtsi | 69 +- arch/arm/mach-imx/imx9/Kconfig | 2 + arch/arm/mach-imx/imx9/soc.c | 2 +- board/phytec/common/Kconfig | 8 + board/phytec/common/Makefile | 1 + board/phytec/common/imx93_som_detection.c | 111 +++ board/phytec/common/imx93_som_detection.h | 51 ++ board/phytec/phycore_imx93/Kconfig | 28 + board/phytec/phycore_imx93/MAINTAINERS | 7 +- board/phytec/phycore_imx93/lpddr4_timing.c | 793 ++++++++++++++++-- board/phytec/phycore_imx93/phycore-imx93.c | 51 ++ board/phytec/phycore_imx93/spl.c | 48 ++ ...egin_defconfig => imx93-phycore_defconfig} | 2 + ...3-phyboard-segin.rst => imx93-phycore.rst} | 8 +- doc/board/phytec/index.rst | 2 +- 15 files changed, 1112 insertions(+), 71 deletions(-) create mode 100644 board/phytec/common/imx93_som_detection.c create mode 100644 board/phytec/common/imx93_som_detection.h rename configs/{imx93-phyboard-segin_defconfig => imx93-phycore_defconfig} (98%) rename doc/board/phytec/{imx93-phyboard-segin.rst => imx93-phycore.rst} (91%) -- 2.34.1

5 10

[PATCH 0/2] configs: JH7110: enable EFI_LOADER_BOUNCE_BUFFER
by Heinrich Schuchardt 26 Nov '24

26 Nov '24

Our MMC driver for JH7110 boards only supports reading to the low 4 GiB of memory. Booting boards with more memory requires EFI_LOADER_BOUNCE_BUFFER. As a prerequisite we must allow CONFIG_EFI_LOADER_BOUNCE_BUFFER on RISC-V. Heinrich Schuchardt (2): efi_loader: allow EFI_LOADER_BOUNCE_BUFFER on all architectures configs: JH7110: enable EFI_LOADER_BOUNCE_BUFFER configs/starfive_visionfive2_defconfig | 1 + lib/efi_loader/Kconfig | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) -- 2.45.2

5 10

[PATCH 1/4] virtio: blk: introduce virtio-block erase support
by Dmitrii Merkurev 26 Nov '24

26 Nov '24

Co-developed-by: Cody Schuffelen <schuffelen(a)google.com> Signed-off-by: Cody Schuffelen <schuffelen(a)google.com> Signed-off-by: Dmitrii Merkurev <dimorinny(a)google.com> Cc: Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> Cc: Simon Glass <sjg(a)chromium.org> Cc: Mattijs Korpershoek <mkorpershoek(a)baylibre.com> Cc: Ying-Chun Liu (PaulLiu) <paul.liu(a)linaro.org> --- drivers/virtio/virtio_blk.c | 91 +++++++++++++++++++++++++++++++------ drivers/virtio/virtio_blk.h | 47 +++++++++++++++++++ 2 files changed, 124 insertions(+), 14 deletions(-) diff --git a/drivers/virtio/virtio_blk.c b/drivers/virtio/virtio_blk.c index 9581058286..225b65c4d1 100644 --- a/drivers/virtio/virtio_blk.c +++ b/drivers/virtio/virtio_blk.c @@ -19,30 +19,82 @@ struct virtio_blk_priv { struct virtqueue *vq; }; +static const u32 feature[] = { + VIRTIO_BLK_F_WRITE_ZEROES +}; + +static void virtio_blk_init_header_sg(struct udevice *dev, u64 sector, u32 type, + struct virtio_blk_outhdr *out_hdr, struct virtio_sg *sg) +{ + const bool sector_is_needed = type == VIRTIO_BLK_T_IN || + type == VIRTIO_BLK_T_OUT; + + out_hdr->type = cpu_to_virtio32(dev, type); + out_hdr->sector = cpu_to_virtio64(dev, sector_is_needed ? sector : 0); + + sg->addr = out_hdr; + sg->length = sizeof(*out_hdr); +} + +static void virtio_blk_init_write_zeroes_sg(struct udevice *dev, u64 sector, lbaint_t blkcnt, + struct virtio_blk_discard_write_zeroes *wz, + struct virtio_sg *sg) +{ + wz->sector = cpu_to_virtio64(dev, sector); + wz->num_sectors = cpu_to_virtio32(dev, blkcnt); + wz->flags = cpu_to_virtio32(dev, 0); + + sg->addr = wz; + sg->length = sizeof(*wz); +} + +static void virtio_blk_init_status_sg(u8 *status, struct virtio_sg *sg) +{ + sg->addr = status; + sg->length = sizeof(*status); +} + +static void virtio_blk_init_data_sg(void *buffer, lbaint_t blkcnt, struct virtio_sg *sg) +{ + sg->addr = buffer; + sg->length = blkcnt * 512; +} + static ulong virtio_blk_do_req(struct udevice *dev, u64 sector, lbaint_t blkcnt, void *buffer, u32 type) { struct virtio_blk_priv *priv = dev_get_priv(dev); + struct virtio_blk_outhdr out_hdr; + struct virtio_blk_discard_write_zeroes wz_hdr; unsigned int num_out = 0, num_in = 0; + struct virtio_sg hdr_sg, wz_sg, data_sg, status_sg; struct virtio_sg *sgs[3]; u8 status; int ret; - struct virtio_blk_outhdr out_hdr = { - .type = cpu_to_virtio32(dev, type), - .sector = cpu_to_virtio64(dev, sector), - }; - struct virtio_sg hdr_sg = { &out_hdr, sizeof(out_hdr) }; - struct virtio_sg data_sg = { buffer, blkcnt * 512 }; - struct virtio_sg status_sg = { &status, sizeof(status) }; - + virtio_blk_init_header_sg(dev, sector, type, &out_hdr, &hdr_sg); sgs[num_out++] = &hdr_sg; - if (type & VIRTIO_BLK_T_OUT) - sgs[num_out++] = &data_sg; - else - sgs[num_out + num_in++] = &data_sg; - + switch (type) { + case VIRTIO_BLK_T_IN: + case VIRTIO_BLK_T_OUT: + virtio_blk_init_data_sg(buffer, blkcnt, &data_sg); + if (type & VIRTIO_BLK_T_OUT) + sgs[num_out++] = &data_sg; + else + sgs[num_out + num_in++] = &data_sg; + break; + + case VIRTIO_BLK_T_WRITE_ZEROES: + virtio_blk_init_write_zeroes_sg(dev, sector, blkcnt, &wz_hdr, &wz_sg); + sgs[num_out++] = &wz_sg; + break; + + default: + return -EINVAL; + } + + virtio_blk_init_status_sg(&status, &status_sg); sgs[num_out + num_in++] = &status_sg; log_debug("dev=%s, active=%d, priv=%p, priv->vq=%p\n", dev->name, device_active(dev), priv, priv->vq); @@ -76,6 +128,15 @@ static ulong virtio_blk_write(struct udevice *dev, lbaint_t start, VIRTIO_BLK_T_OUT); } +static ulong virtio_blk_erase(struct udevice *dev, lbaint_t start, + lbaint_t blkcnt) +{ + if (!virtio_has_feature(dev, VIRTIO_BLK_F_WRITE_ZEROES)) + return -EOPNOTSUPP; + + return virtio_blk_do_req(dev, start, blkcnt, NULL, VIRTIO_BLK_T_WRITE_ZEROES); +} + static int virtio_blk_bind(struct udevice *dev) { struct virtio_dev_priv *uc_priv = dev_get_uclass_priv(dev->parent); @@ -105,7 +166,8 @@ static int virtio_blk_bind(struct udevice *dev) desc->bdev = dev; /* Indicate what driver features we support */ - virtio_driver_features_init(uc_priv, NULL, 0, NULL, 0); + virtio_driver_features_init(uc_priv, feature, ARRAY_SIZE(feature), + NULL, 0); return 0; } @@ -132,6 +194,7 @@ static int virtio_blk_probe(struct udevice *dev) static const struct blk_ops virtio_blk_ops = { .read = virtio_blk_read, .write = virtio_blk_write, + .erase = virtio_blk_erase, }; U_BOOT_DRIVER(virtio_blk) = { diff --git a/drivers/virtio/virtio_blk.h b/drivers/virtio/virtio_blk.h index 8d8e02fa2e..b37ba264df 100644 --- a/drivers/virtio/virtio_blk.h +++ b/drivers/virtio/virtio_blk.h @@ -17,6 +17,8 @@ #define VIRTIO_BLK_F_BLK_SIZE 6 /* Block size of disk is available */ #define VIRTIO_BLK_F_TOPOLOGY 10 /* Topology information is available */ #define VIRTIO_BLK_F_MQ 12 /* Support more than one vq */ +#define VIRTIO_BLK_F_DISCARD 13 /* Discard is supported */ +#define VIRTIO_BLK_F_WRITE_ZEROES 14 /* Write zeroes is supported */ /* Legacy feature bits */ #ifndef VIRTIO_BLK_NO_LEGACY @@ -65,6 +67,39 @@ struct __packed virtio_blk_config { /* number of vqs, only available when VIRTIO_BLK_F_MQ is set */ __u16 num_queues; + + /* the next 3 entries are guarded by VIRTIO_BLK_F_DISCARD */ + /* + * The maximum discard sectors (in 512-byte sectors) for + * one segment. + */ + __u32 max_discard_sectors; + /* + * The maximum number of discard segments in a + * discard command. + */ + __u32 max_discard_seg; + /* Discard commands must be aligned to this number of sectors. */ + __u32 discard_sector_alignment; + + /* the next 3 entries are guarded by VIRTIO_BLK_F_WRITE_ZEROES */ + /* + * The maximum number of write zeroes sectors (in 512-byte sectors) in + * one segment. + */ + __u32 max_write_zeroes_sectors; + /* + * The maximum number of segments in a write zeroes + * command. + */ + __u32 max_write_zeroes_seg; + /* + * Set if a VIRTIO_BLK_T_WRITE_ZEROES request may result in the + * deallocation of one or more of the sectors. + */ + __u8 write_zeroes_may_unmap; + + __u8 unused1[3]; }; /* @@ -93,6 +128,9 @@ struct __packed virtio_blk_config { /* Get device ID command */ #define VIRTIO_BLK_T_GET_ID 8 +/* Write zeroes command */ +#define VIRTIO_BLK_T_WRITE_ZEROES 13 + #ifndef VIRTIO_BLK_NO_LEGACY /* Barrier before this op */ #define VIRTIO_BLK_T_BARRIER 0x80000000 @@ -112,6 +150,15 @@ struct virtio_blk_outhdr { __virtio64 sector; }; +struct virtio_blk_discard_write_zeroes { + /* discard/write zeroes start sector */ + __virtio64 sector; + /* number of discard/write zeroes sectors */ + __virtio32 num_sectors; + /* flags for this range */ + __virtio32 flags; +}; + #ifndef VIRTIO_BLK_NO_LEGACY struct virtio_scsi_inhdr { __virtio32 errors; -- 2.44.0.278.ge034bb2e1d-goog

4 11

[PATCH] board: theobroma-systems: Update TF-A setup steps for RK3588 boards
by Daniel Semkowicz 26 Nov '24

26 Nov '24

ddrbin_tool interface has been changed. Additional chip_name argument is now required to modify ddr binary file. Update documentation to be consistent with the new interface. Update BL31 and ROCKCHIP_TPL file paths to match current version of binaries available in the rkbin repository. Signed-off-by: Daniel Semkowicz <dse(a)thaumatec.com> --- doc/board/theobroma-systems/jaguar_rk3588.rst | 6 +++--- doc/board/theobroma-systems/tiger_rk3588.rst | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/board/theobroma-systems/jaguar_rk3588.rst b/doc/board/theobroma-systems/jaguar_rk3588.rst index db15f945d3b..cba4fd066ab 100644 --- a/doc/board/theobroma-systems/jaguar_rk3588.rst +++ b/doc/board/theobroma-systems/jaguar_rk3588.rst @@ -40,10 +40,10 @@ Get the TF-A and DDR init (TPL) binaries git clone https://github.com/rockchip-linux/rkbin cd rkbin export RKBIN=$(pwd) - export BL31=$RKBIN/bin/rk35/rk3588_bl31_v1.38.elf - export ROCKCHIP_TPL=$RKBIN/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin + export BL31=$RKBIN/bin/rk35/rk3588_bl31_v1.47.elf + export ROCKCHIP_TPL=$RKBIN/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin sed -i 's/^uart baudrate=.*$/uart baudrate=115200/' tools/ddrbin_param.txt - ./tools/ddrbin_tool tools/ddrbin_param.txt "$ROCKCHIP_TPL" + ./tools/ddrbin_tool rk3588 tools/ddrbin_param.txt "$ROCKCHIP_TPL" ./tools/boot_merger RKBOOT/RK3588MINIALL.ini export RKDB=$RKBIN/rk3588_spl_loader_v1.11.112.bin diff --git a/doc/board/theobroma-systems/tiger_rk3588.rst b/doc/board/theobroma-systems/tiger_rk3588.rst index a73eec7fb9b..a01c0500b49 100644 --- a/doc/board/theobroma-systems/tiger_rk3588.rst +++ b/doc/board/theobroma-systems/tiger_rk3588.rst @@ -40,11 +40,11 @@ Get the TF-A and DDR init (TPL) binaries git clone https://github.com/rockchip-linux/rkbin cd rkbin export RKBIN=$(pwd) - export BL31=$RKBIN/bin/rk35/rk3588_bl31_v1.38.elf - export ROCKCHIP_TPL=$RKBIN/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.11.bin + export BL31=$RKBIN/bin/rk35/rk3588_bl31_v1.47.elf + export ROCKCHIP_TPL=$RKBIN/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin sed -i 's/^uart baudrate=.*$/uart baudrate=115200/' tools/ddrbin_param.txt sed -i 's/^uart iomux=.*$/uart iomux=2/' tools/ddrbin_param.txt - ./tools/ddrbin_tool tools/ddrbin_param.txt "$ROCKCHIP_TPL" + ./tools/ddrbin_tool rk3588 tools/ddrbin_param.txt "$ROCKCHIP_TPL" ./tools/boot_merger RKBOOT/RK3588MINIALL.ini export RKDB=$RKBIN/rk3588_spl_loader_v1.11.112.bin -- 2.47.0

2 1

[PATCH] drivers: fastboot: Enable flashing support for UFS
by Varadarajan Narayanan 26 Nov '24

26 Nov '24

MMC and UFS seem to execute very similar steps to identify the partition and write to it. Hence try to enable fastboot flashing support in UFS leveraging the MMC functions. Tested on rb3gen2 platform. Signed-off-by: Varadarajan Narayanan <quic_varada(a)quicinc.com> --- drivers/fastboot/Kconfig | 19 +++++++++++++++--- drivers/fastboot/Makefile | 1 + drivers/fastboot/fb_command.c | 6 ++++-- drivers/fastboot/fb_mmc.c | 36 ++++++++++++++++++++++++----------- 4 files changed, 46 insertions(+), 16 deletions(-) diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig index 1eb460f5a0..5c41fc4684 100644 --- a/drivers/fastboot/Kconfig +++ b/drivers/fastboot/Kconfig @@ -92,7 +92,7 @@ config FASTBOOT_USB_DEV config FASTBOOT_FLASH bool "Enable FASTBOOT FLASH command" default y if ARCH_SUNXI || ARCH_ROCKCHIP - depends on MMC || (MTD_RAW_NAND && CMD_MTDPARTS) + depends on MMC || UFS || (MTD_RAW_NAND && CMD_MTDPARTS) select IMAGE_SPARSE help The fastboot protocol includes a "flash" command for writing @@ -120,6 +120,10 @@ config FASTBOOT_FLASH_NAND bool "FASTBOOT on NAND" depends on MTD_RAW_NAND && CMD_MTDPARTS +config FASTBOOT_FLASH_UFS + bool "FASTBOOT on UFS" + depends on UFS && EFI_PARTITION + endchoice config FASTBOOT_FLASH_MMC_DEV @@ -133,6 +137,15 @@ config FASTBOOT_FLASH_MMC_DEV regarding the non-volatile storage device. Define this to the eMMC device that fastboot should use to store the image. +config FASTBOOT_FLASH_UFS_DEV + int "Define FASTBOOT UFS FLASH default device" + depends on FASTBOOT_FLASH_UFS + default 0 if CONFIG_ARCH_SNAPDRAGON + help + The fastboot "flash" command requires additional information + regarding the non-volatile storage device. Define this to + the UFS device that fastboot should use to store the image. + config FASTBOOT_FLASH_NAND_TRIMFFS bool "Skip empty pages when flashing NAND" depends on FASTBOOT_FLASH_NAND @@ -196,7 +209,7 @@ config FASTBOOT_MMC_USER_NAME config FASTBOOT_GPT_NAME string "Target name for updating GPT" - depends on FASTBOOT_FLASH_MMC && EFI_PARTITION + depends on (FASTBOOT_FLASH_MMC || FASTBOOT_FLASH_UFS) && EFI_PARTITION default "gpt" help The fastboot "flash" command supports writing the downloaded @@ -209,7 +222,7 @@ config FASTBOOT_GPT_NAME config FASTBOOT_MBR_NAME string "Target name for updating MBR" - depends on FASTBOOT_FLASH_MMC && DOS_PARTITION + depends on (FASTBOOT_FLASH_MMC || FASTBOOT_FLASH_UFS) && DOS_PARTITION default "mbr" help The fastboot "flash" command allows to write the downloaded image diff --git a/drivers/fastboot/Makefile b/drivers/fastboot/Makefile index 048af5aa82..772276cb6c 100644 --- a/drivers/fastboot/Makefile +++ b/drivers/fastboot/Makefile @@ -4,4 +4,5 @@ obj-y += fb_common.o obj-y += fb_getvar.o obj-y += fb_command.o obj-$(CONFIG_FASTBOOT_FLASH_MMC) += fb_mmc.o +obj-$(CONFIG_FASTBOOT_FLASH_UFS) += fb_mmc.o obj-$(CONFIG_FASTBOOT_FLASH_NAND) += fb_nand.o diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c index e4484d65ac..a6fa8299b8 100644 --- a/drivers/fastboot/fb_command.c +++ b/drivers/fastboot/fb_command.c @@ -336,7 +336,8 @@ void fastboot_data_complete(char *response) */ static void __maybe_unused flash(char *cmd_parameter, char *response) { - if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC) || + IS_ENABLED(CONFIG_FASTBOOT_FLASH_UFS)) fastboot_mmc_flash_write(cmd_parameter, fastboot_buf_addr, image_size, response); @@ -356,7 +357,8 @@ static void __maybe_unused flash(char *cmd_parameter, char *response) */ static void __maybe_unused erase(char *cmd_parameter, char *response) { - if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC) || + IS_ENABLED(CONFIG_FASTBOOT_FLASH_UFS)) fastboot_mmc_erase(cmd_parameter, response); if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index f11eb66761..bf242e4b2a 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -20,6 +20,16 @@ #define BOOT_PARTITION_NAME "boot" +#if defined(CONFIG_FASTBOOT_FLASH_MMC) +#define fb_flash_str "mmc" +#define fb_flash_dev CONFIG_FASTBOOT_FLASH_MMC_DEV +#elif defined(CONFIG_FASTBOOT_FLASH_UFS) +#define fb_flash_str "scsi" +#define fb_flash_dev CONFIG_FASTBOOT_FLASH_UFS_DEV +#else +#error "Incorrect flash type" +#endif + struct fb_mmc_sparse { struct blk_desc *dev_desc; }; @@ -78,7 +88,7 @@ static int do_get_part_info(struct blk_desc **dev_desc, const char *name, int ret; /* First try partition names on the default device */ - *dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV); + *dev_desc = blk_get_dev(fb_flash_str, fb_flash_dev); if (*dev_desc) { ret = part_get_info_by_name(*dev_desc, name, info); if (ret >= 0) @@ -91,8 +101,8 @@ static int do_get_part_info(struct blk_desc **dev_desc, const char *name, } /* Then try dev.hwpart:part */ - ret = part_get_info_by_dev_and_name_or_num("mmc", name, dev_desc, - info, true); + ret = part_get_info_by_dev_and_name_or_num(fb_flash_str, name, + dev_desc, info, true); return ret; } @@ -202,17 +212,20 @@ static int fb_mmc_erase_mmc_hwpart(struct blk_desc *dev_desc) { lbaint_t blks; - debug("Start Erasing mmc hwpart[%u]...\n", dev_desc->hwpart); + debug("Start Erasing %s hwpart[%u]...\n", + fb_flash_str, dev_desc->hwpart); blks = fb_mmc_blk_write(dev_desc, 0, dev_desc->lba, NULL); if (blks != dev_desc->lba) { - pr_err("Failed to erase mmc hwpart[%u]\n", dev_desc->hwpart); + pr_err("Failed to erase %s hwpart[%u]\n", + fb_flash_str, dev_desc->hwpart); return 1; } - printf("........ erased %lu bytes from mmc hwpart[%u]\n", - dev_desc->lba * dev_desc->blksz, dev_desc->hwpart); + printf("........ erased %lu bytes from %s hwpart[%u]\n", + dev_desc->lba * dev_desc->blksz, fb_flash_str, + dev_desc->hwpart); return 0; } @@ -487,11 +500,10 @@ int fastboot_mmc_get_part_info(const char *part_name, static struct blk_desc *fastboot_mmc_get_dev(char *response) { - struct blk_desc *ret = blk_get_dev("mmc", - CONFIG_FASTBOOT_FLASH_MMC_DEV); + struct blk_desc *ret = blk_get_dev(fb_flash_str, fb_flash_dev); if (!ret || ret->type == DEV_TYPE_UNKNOWN) { - pr_err("invalid mmc device\n"); + pr_err("invalid %s device\n", fb_flash_str); fastboot_fail("invalid mmc device", response); return NULL; } @@ -644,10 +656,11 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer, */ void fastboot_mmc_erase(const char *cmd, char *response) { +#ifdef CONFIG_FASTBOOT_FLASH_MMC struct blk_desc *dev_desc; struct disk_partition info; lbaint_t blks, blks_start, blks_size, grp_size; - struct mmc *mmc = find_mmc_device(CONFIG_FASTBOOT_FLASH_MMC_DEV); + struct mmc *mmc = find_mmc_device(fb_flash_dev); #ifdef CONFIG_FASTBOOT_MMC_BOOT_SUPPORT if (strcmp(cmd, CONFIG_FASTBOOT_MMC_BOOT1_NAME) == 0) { @@ -706,5 +719,6 @@ void fastboot_mmc_erase(const char *cmd, char *response) printf("........ erased " LBAFU " bytes from '%s'\n", blks_size * info.blksz, cmd); +#endif fastboot_okay(NULL, response); } -- 2.34.1

3 3

[PATCH] bootstd: android: don't read whole partition sizes
by Julien Masson 26 Nov '24

26 Nov '24

The current implementation is reading the whole partition for boot and vendor_boot image which can be long following the size of the partition or the time to read blocks (driver/SoC specific). For example with mediatek mt8365 EVK board, we have a 64MiB boot partition and the boot image flashed in this partition is only 42MiB. It takes ~8-9 secs to read the boot partition. Instead we can retrieved the boot image and vendor boot image size with these new functions: - android_image_get_bootimg_size - android_image_get_vendor_bootimg_size Use these information and read only the necessary. By doing this with mt8365 EVK board, we read boot image in ~5 secs. Signed-off-by: Julien Masson <jmasson(a)baylibre.com> --- Changes have been tested with: $ ./test/py/test.py --bd sandbox --build -k ut_bootstd_bootflow_android_image_v4 $ ./test/py/test.py --bd sandbox --build -k ut_bootstd_bootflow_android_image_v2 --- boot/bootmeth_android.c | 28 +++++++++++++++++++++++----- boot/image-android.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/image.h | 24 ++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 5 deletions(-) diff --git a/boot/bootmeth_android.c b/boot/bootmeth_android.c index 2aac32331d3c28853bc87d05a8c76ae868ea97c7..3a5144aaa3b0125cf13ff1805b05e87385263308 100644 --- a/boot/bootmeth_android.c +++ b/boot/bootmeth_android.c @@ -45,6 +45,8 @@ struct android_priv { enum android_boot_mode boot_mode; char *slot; u32 header_version; + u32 boot_img_size; + u32 vendor_boot_img_size; }; static int android_check(struct udevice *dev, struct bootflow_iter *iter) @@ -98,7 +100,13 @@ static int scan_boot_part(struct udevice *blk, struct android_priv *priv) return log_msg_ret("header", -ENOENT); } + if (!android_image_get_bootimg_size(buf, &priv->boot_img_size)) { + free(buf); + return log_msg_ret("get bootimg size", -EINVAL); + } + priv->header_version = ((struct andr_boot_img_hdr_v0 *)buf)->header_version; + free(buf); return 0; @@ -138,6 +146,12 @@ static int scan_vendor_boot_part(struct udevice *blk, struct android_priv *priv) free(buf); return log_msg_ret("header", -ENOENT); } + + if (!android_image_get_vendor_bootimg_size(buf, &priv->vendor_boot_img_size)) { + free(buf); + return log_msg_ret("get vendor bootimg size", -EINVAL); + } + free(buf); return 0; @@ -330,15 +344,17 @@ static int android_read_file(struct udevice *dev, struct bootflow *bflow, * @blk: Block device to read * @name: Partition name to read * @slot: Nul-terminated slot suffixed to partition name ("a\0" or "b\0") + * @image_size: Image size in bytes used when reading the partition * @addr: Address where the partition content is loaded into * Return: 0 if OK, negative errno on failure. */ static int read_slotted_partition(struct blk_desc *desc, const char *const name, - const char slot[2], ulong addr) + const char slot[2], ulong image_size, ulong addr) { struct disk_partition partition; char partname[PART_NAME_LEN]; size_t partname_len; + ulong num_blks = DIV_ROUND_UP(image_size, desc->blksz); int ret; u32 n; @@ -364,8 +380,8 @@ static int read_slotted_partition(struct blk_desc *desc, const char *const name, if (ret < 0) return log_msg_ret("part", ret); - n = blk_dread(desc, partition.start, partition.size, map_sysmem(addr, 0)); - if (n < partition.size) + n = blk_dread(desc, partition.start, num_blks, map_sysmem(addr, 0)); + if (n < num_blks) return log_msg_ret("part read", -EIO); return 0; @@ -498,12 +514,14 @@ static int boot_android_normal(struct bootflow *bflow) if (ret < 0) return log_msg_ret("read slot", ret); - ret = read_slotted_partition(desc, "boot", priv->slot, loadaddr); + ret = read_slotted_partition(desc, "boot", priv->slot, priv->boot_img_size, + loadaddr); if (ret < 0) return log_msg_ret("read boot", ret); if (priv->header_version >= 3) { - ret = read_slotted_partition(desc, "vendor_boot", priv->slot, vloadaddr); + ret = read_slotted_partition(desc, "vendor_boot", priv->slot, + priv->vendor_boot_img_size, vloadaddr); if (ret < 0) return log_msg_ret("read vendor_boot", ret); set_avendor_bootimg_addr(vloadaddr); diff --git a/boot/image-android.c b/boot/image-android.c index cd01278f211d63262f2bdad7aa1176e2c1bbfedd..93b54bf8d7936862693d56d5b75343575f3e6293 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -178,6 +178,51 @@ static void android_boot_image_v0_v1_v2_parse_hdr(const struct andr_boot_img_hdr data->boot_img_total_size = end - (ulong)hdr; } +bool android_image_get_bootimg_size(const void *hdr, u32 *boot_img_size) +{ + struct andr_image_data data; + + if (!hdr || !boot_img_size) { + printf("hdr or boot_img_size can't be NULL\n"); + return false; + } + + if (!is_android_boot_image_header(hdr)) { + printf("Incorrect boot image header\n"); + return false; + } + + if (((struct andr_boot_img_hdr_v0 *)hdr)->header_version <= 2) + android_boot_image_v0_v1_v2_parse_hdr(hdr, &data); + else + android_boot_image_v3_v4_parse_hdr(hdr, &data); + + *boot_img_size = data.boot_img_total_size; + + return true; +} + +bool android_image_get_vendor_bootimg_size(const void *hdr, u32 *vendor_boot_img_size) +{ + struct andr_image_data data; + + if (!hdr || !vendor_boot_img_size) { + printf("hdr or vendor_boot_img_size can't be NULL\n"); + return false; + } + + if (!is_android_vendor_boot_image_header(hdr)) { + printf("Incorrect vendor boot image header\n"); + return false; + } + + android_vendor_boot_image_v3_v4_parse_hdr(hdr, &data); + + *vendor_boot_img_size = data.vendor_boot_img_total_size; + + return true; +} + bool android_image_get_data(const void *boot_hdr, const void *vendor_boot_hdr, struct andr_image_data *data) { diff --git a/include/image.h b/include/image.h index c52fced9b409b1f963daa4ab6c266909ca035aff..9be5acd8158f00930ab1f3988b8f577817acd1fe 100644 --- a/include/image.h +++ b/include/image.h @@ -1801,6 +1801,30 @@ int fit_image_cipher_get_algo(const void *fit, int noffset, char **algo); struct cipher_algo *image_get_cipher_algo(const char *full_name); struct andr_image_data; +/** + * android_image_get_bootimg_size() - Extract size of Android boot image + * + * This is used to extract the size of an Android boot image + * from boot image header. + * + * @hdr: Pointer to boot image header + * @boot_img_size: On exit returns the size in bytes of the boot image + * Return: true if succeeded, false otherwise + */ +bool android_image_get_bootimg_size(const void *hdr, u32 *boot_img_size); + +/** + * android_image_get_vendor_bootimg_size() - Extract size of Android vendor-boot image + * + * This is used to extract the size of an Android vendor-boot image + * from vendor-boot image header. + * + * @hdr: Pointer to vendor-boot image header + * @vendor_boot_img_size: On exit returns the size in bytes of the vendor-boot image + * Return: true if succeeded, false otherwise + */ +bool android_image_get_vendor_bootimg_size(const void *hdr, u32 *vendor_boot_img_size); + /** * android_image_get_data() - Parse Android boot images * --- base-commit: acaa7f35a33146f887948d34130229388280844a change-id: 20241121-bootmeth-android-part-sizes-ff2866e0d079 Best regards, -- Julien Masson <jmasson(a)baylibre.com>

2 2