September 2024 - U-Boot

[RESEND PATCH v4 0/3] provide names for emmc hardware partitions
by Tim Harvey 05 Sep '24

05 Sep '24

Modern eMMC v4+ devices have multiple hardware partitions per the JEDEC specification described as: Boot Area Partition 1 Boot Area Partition 2 RPMB Partition General Purpose Partition 1 General Purpose Partition 2 General Purpose Partition 3 General Purpose Partition 4 User Data Area These are referenced by fields in the PARTITION_CONFIG register (Extended CSD Register 179) which is defined as: bit 7: reserved bit 6: BOOT_ACK 0x0: No boot acknowledge sent (default 0x1: Boot acknowledge sent during boot operation Bit bit 5:3: BOOT_PARTITION_ENABLE 0x0: Device not boot enabled (default) 0x1: Boot Area partition 1 enabled for boot 0x2: Boot Area partition 2 enabled for boot 0x3-0x6: Reserved 0x7: User area enabled for boot bit 2:0 PARTITION_ACCESS 0x0: No access to boot partition (default) 0x1: Boot Area partition 1 0x2: Boot Area partition 2 0x3: Replay Protected Memory Block (RPMB) 0x4: Access to General Purpose partition 1 0x5: Access to General Purpose partition 2 0x6: Access to General Purpose partition 3 0x7: Access to General Purpose partition 4 Note that setting PARTITION_ACCESS to 0x0 results in selecting the User Data Area partition. You can see above that the two fields BOOT_PARTITION_ENABLE and PARTITION_ACCESS do not use the same enumerated values. U-Boot uses a set of macros to access fields of the PARTITION_CONFIG register: EXT_CSD_BOOT_ACK_ENABLE (1 << 6) EXT_CSD_BOOT_PARTITION_ENABLE (1 << 3) EXT_CSD_PARTITION_ACCESS_ENABLE (1 << 0) EXT_CSD_PARTITION_ACCESS_DISABLE (0 << 0) EXT_CSD_BOOT_ACK(x) (x << 6) EXT_CSD_BOOT_PART_NUM(x) (x << 3) EXT_CSD_PARTITION_ACCESS(x) (x << 0) EXT_CSD_EXTRACT_BOOT_ACK(x) (((x) >> 6) & 0x1) EXT_CSD_EXTRACT_BOOT_PART(x) (((x) >> 3) & 0x7) EXT_CSD_EXTRACT_PARTITION_ACCESS(x) ((x) & 0x7) There are various places in U-Boot where the BOOT_PARTITION_ENABLE field is accessed via EXT_CSD_EXTRACT_PARTITION_ACCESS and converted to a hardware partition consistent with the definition of the PARTITION_ACCESS field used by the various mmc_switch incarnations. To add some sanity to the distinction between BOOT_PARTITION_ENABLE (used to specify the active device on power-cycle) and PARTITION_ACCESS (used to switch between hardware partitions) create two enumerated types and use them wherever struct mmc * part_config is used or the above macros are used. Additionally provide arrays of the field names and allow those to be used in the 'mmc partconf' command and in board support files. The first patch adds enumerated types and makes use of them which represents no compiled code change. The 2nd patch adds the array of names and uses them in the 'mmc partconf' command. The 3rd patch uses the array of hardware partition names in a board support file to show what emmc hardware partition U-Boot is being loaded from. I'm sending this as a series this time around as previously it was repsented as two different patches. Tim Harvey (3): mmc: use an enumerated type to represent PARTITION_CONFIG fields mmc: allow use of hardware partition names for mmc partconf venice: show emmc boot hardware partition arch/arm/mach-imx/image-container.c | 10 ++++----- arch/arm/mach-sunxi/board.c | 2 +- board/gateworks/venice/spl.c | 20 ++++++++++++----- board/gateworks/venice/venice.c | 22 +++++++++--------- board/purism/librem5/librem5.c | 4 ++-- board/storopack/smegw01/smegw01.c | 4 ++-- cmd/mmc.c | 27 ++++++++++++++++++---- cmd/mvebu/bubt.c | 4 ++-- common/spl/spl_mmc.c | 4 ++-- drivers/mmc/mmc.c | 35 +++++++++++++++++++++++++++++ include/mmc.h | 26 +++++++++++++++++++++ 11 files changed, 123 insertions(+), 35 deletions(-) -- 2.25.1

3 11

[PATCH v4] mmc: Poll CD in case cyclic framework is enabled
by Marek Vasut 05 Sep '24

05 Sep '24

In case the cyclic framework is enabled, poll the card detect of already initialized cards and deinitialize them in case they are removed. Since the card initialization is a longer process and card initialization is done on first access to an uninitialized card anyway, avoid initializing newly detected uninitialized cards in the cyclic callback. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Jaehoon Chung <jh80.chung(a)samsung.com> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Simon Glass <sjg(a)chromium.org> --- V2: Move the cyclic registration/unregistration into mmc init/deinit V3: Replace if (CONFIG_IS_ENABLED(CYCLIC)...) with #if as the former does not work with structure members V4: Stuff the code with CONFIG_IS_ENABLED() variants to avoid #ifdefs --- drivers/mmc/mmc.c | 32 ++++++++++++++++++++++++++++++++ include/mmc.h | 3 +++ 2 files changed, 35 insertions(+) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index eb5010c1465..e90ffd5dcd1 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2985,6 +2985,20 @@ static int mmc_complete_init(struct mmc *mmc) return err; } +static void __maybe_unused mmc_cyclic_cd_poll(void *ctx) +{ + struct mmc *m = ctx; + + if (!m->has_init) + return; + + if (mmc_getcd(m)) + return; + + mmc_deinit(m); + m->has_init = 0; +} + int mmc_init(struct mmc *mmc) { int err = 0; @@ -3007,6 +3021,19 @@ int mmc_init(struct mmc *mmc) if (err) pr_info("%s: %d, time %lu\n", __func__, err, get_timer(start)); + if (CONFIG_IS_ENABLED(CYCLIC, (!mmc->cyclic), (NULL))) { + /* Register cyclic function for card detect polling */ + CONFIG_IS_ENABLED(CYCLIC, + (mmc->cyclic = cyclic_register(mmc_cyclic_cd_poll, + 100 * 1000, + mmc->cfg->name, mmc))); + if (CONFIG_IS_ENABLED(CYCLIC, (!mmc->cyclic), (NULL))) { + printf("Failed to register %s CD poll function\n", + mmc->cfg->name); + err = -EINVAL; + } + } + return err; } @@ -3014,6 +3041,11 @@ int mmc_deinit(struct mmc *mmc) { u32 caps_filtered; + if (CONFIG_IS_ENABLED(CYCLIC, (mmc->cyclic), (NULL))) { + cyclic_unregister(CONFIG_IS_ENABLED(CYCLIC, (mmc->cyclic), NULL)); + CONFIG_IS_ENABLED(CYCLIC, (mmc->cyclic = NULL)); + } + if (!CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) && !CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) && !CONFIG_IS_ENABLED(MMC_HS400_SUPPORT)) diff --git a/include/mmc.h b/include/mmc.h index 1022db3ffa7..706566fa1ad 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -14,6 +14,7 @@ #include <linux/sizes.h> #include <linux/compiler.h> #include <linux/dma-direction.h> +#include <cyclic.h> #include <part.h> struct bd_info; @@ -739,6 +740,8 @@ struct mmc { u8 hs400_tuning; enum bus_mode user_speed_mode; /* input speed mode from user */ + + CONFIG_IS_ENABLED(CYCLIC, (struct cyclic_info *cyclic)); }; #if CONFIG_IS_ENABLED(DM_MMC) -- 2.43.0

3 6

[PATCH] ARM: imx: Enable MMU and dcache very early on i.MX8M
by Marek Vasut 05 Sep '24

05 Sep '24

Enable MMU and caches very early on in the boot process on i.MX8M in U-Boot proper. This allows board_init_f to run with icache and dcache enabled, which saves some 700 milliseconds of boot time on i.MX8M Plus based device. The 'bootstage report' output is below: Before: ``` Timer summary in microseconds (8 records): Mark Elapsed Stage 0 0 reset 961,363 961,363 board_init_f 1,818,874 857,511 board_init_r 1,921,474 102,600 eth_common_init 2,013,702 92,228 eth_initialize 2,015,238 1,536 main_loop Accumulated time: 32,775 dm_r 289,165 dm_f ``` After: ``` Timer summary in microseconds (8 records): Mark Elapsed Stage 0 0 reset 989,466 989,466 board_init_f 1,179,100 189,634 board_init_r 1,281,456 102,356 eth_common_init 1,373,857 92,401 eth_initialize 1,375,396 1,539 main_loop Accumulated time: 12,630 dm_f 32,635 dm_r ``` Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: "NXP i.MX U-Boot Team" <uboot-imx(a)nxp.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)lists.denx.de --- arch/arm/mach-imx/imx8m/soc.c | 46 +++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index be38ca52885..7ac26d501ac 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -206,6 +206,14 @@ void enable_caches(void) int entry = imx8m_find_dram_entry_in_mem_map(); u64 attrs = imx8m_mem_map[entry].attrs; + /* Deactivate the data cache, possibly enabled in arch_cpu_init() */ + dcache_disable(); + /* + * Force the call of setup_all_pgtables() in mmu_setup() by clearing tlb_fillptr + * to update the TLB location udpated in board_f.c::reserve_mmu + */ + gd->arch.tlb_fillptr = 0; + while (i < CONFIG_NR_DRAM_BANKS && entry < ARRAY_SIZE(imx8m_mem_map)) { if (gd->bd->bi_dram[i].start == 0) @@ -587,12 +595,50 @@ static void imx8m_setup_csu_tzasc(void) } } +/* + * Place early TLB into the .data section so that it will not + * get cleared, use 16 kiB alignment. + */ +#define EARLY_TLB_SIZE SZ_64K +u8 early_tlb[EARLY_TLB_SIZE] __section(".data") __aligned(0x4000); + +/* + * Initialize the MMU and activate cache in U-Boot pre-reloc stage + * MMU/TLB is updated in enable_caches() for U-Boot after relocation + */ +static void early_enable_caches(void) +{ + phys_size_t sdram_size; + int entry, ret; + + if (IS_ENABLED(CONFIG_SPL_BUILD)) + return; + + if (CONFIG_IS_ENABLED(SYS_ICACHE_OFF) || CONFIG_IS_ENABLED(SYS_DCACHE_OFF)) + return; + + /* Use maximum available DRAM size in first bank. */ + ret = board_phys_sdram_size(&sdram_size); + if (ret) + return; + + entry = imx8m_find_dram_entry_in_mem_map(); + imx8m_mem_map[entry].size = max(sdram_size, (phys_size_t)0xc0000000); + + gd->arch.tlb_size = EARLY_TLB_SIZE; + gd->arch.tlb_addr = (unsigned long)&early_tlb; + + /* Enable MMU (default configuration) */ + dcache_enable(); +} + int arch_cpu_init(void) { struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR; #if !CONFIG_IS_ENABLED(SYS_ICACHE_OFF) icache_enable(); + early_enable_caches(); #endif /* -- 2.45.2

2 3

[PATCH] fs: Fix SPL build if SPL_FS_LOADER is enabled and FS_LOADER is disabled
by Hiago De Franco 05 Sep '24

05 Sep '24

From: Hiago De Franco <hiago.franco(a)toradex.com> When SPL_FS_LOADER is set to y and FS_LOADER is not enabled, the SPL build fails with the following errors: AR spl/boot/built-in.o LD spl/u-boot-spl arm-none-linux-gnueabihf-ld.bfd: drivers/misc/fs_loader.o: in function `fw_get_filesystem_firmware': /u-boot/drivers/misc/fs_loader.c:162: undefined reference to `fs_set_blk_dev' arm-none-linux-gnueabihf-ld.bfd: /home/frh/tdx/src/u-boot/drivers/misc/ fs_loader.c:185: undefined reference to `fs_read' arm-none-linux-gnueabihf-ld.bfd: drivers/misc/fs_loader.o: in function `select_fs_dev': /u-boot/drivers/misc/fs_loader.c:89: undefined reference to `fs_set_blk_dev_with_part' make[1]: *** [scripts/Makefile.spl:527: spl/u-boot-spl] Error 1 make: *** [Makefile:2055: spl/u-boot-spl] Error 2 Fix it by replacing the FS_LOADER with SPL_FS_LOADER in the Makefile, so the fs.c with the necessary function definitions are compiled. Fixes: b071a07743d4 ("drivers: misc: Makefile: Enable fs_loader compilation at SPL Level") Suggested-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> Signed-off-by: Hiago De Franco <hiago.franco(a)toradex.com> --- fs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/Makefile b/fs/Makefile index 7b05c79e0ccf..a3ee0a361d3d 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -5,7 +5,7 @@ # Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. ifdef CONFIG_SPL_BUILD -obj-$(CONFIG_FS_LOADER) += fs.o +obj-$(CONFIG_SPL_FS_LOADER) += fs.o obj-$(CONFIG_SPL_FS_FAT) += fat/ obj-$(CONFIG_SPL_FS_EXT4) += ext4/ obj-$(CONFIG_SPL_FS_CBFS) += cbfs/ -- 2.39.2

3 6

[PATCH 1/2] net: phy: add PSGMII (Penta SGMII) mode
by Robert Marko 05 Sep '24

05 Sep '24

The PSGMII interface is similar to QSGMII. The main difference is that the PSGMII interface combines five SGMII lines into a single link while in QSGMII only four lines are combined. Similarly to the QSGMII, this interface mode might also needs special handling within the MAC driver. It is commonly used by Qualcomm with their QCA807x PHY series and modern WiSoC-s. Add definitions for the PHY layer to allow to express this type of connection between the MAC and PHY. This is basically a direct port from Linux which already supports this mode. Signed-off-by: Robert Marko <robert.marko(a)sartura.hr> --- include/phy_interface.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/phy_interface.h b/include/phy_interface.h index 31be3228c7..04826bc65d 100644 --- a/include/phy_interface.h +++ b/include/phy_interface.h @@ -31,6 +31,7 @@ typedef enum { PHY_INTERFACE_MODE_XGMII, PHY_INTERFACE_MODE_XLGMII, PHY_INTERFACE_MODE_MOCA, + PHY_INTERFACE_MODE_PSGMII, PHY_INTERFACE_MODE_QSGMII, PHY_INTERFACE_MODE_TRGMII, PHY_INTERFACE_MODE_100BASEX, @@ -79,6 +80,7 @@ static const char * const phy_interface_strings[] = { [PHY_INTERFACE_MODE_XGMII] = "xgmii", [PHY_INTERFACE_MODE_XLGMII] = "xlgmii", [PHY_INTERFACE_MODE_MOCA] = "moca", + [PHY_INTERFACE_MODE_PSGMII] = "psgmii", [PHY_INTERFACE_MODE_QSGMII] = "qsgmii", [PHY_INTERFACE_MODE_TRGMII] = "trgmii", [PHY_INTERFACE_MODE_1000BASEX] = "1000base-x", -- 2.45.1

2 2

[PATCH 0/2] regulators: qcom-rpmh: support SM8550 and SM8650 platforms
by Neil Armstrong 05 Sep '24

05 Sep '24

Fix the RSC and add the tables for the PM8550 and related regulators. Signed-off-by: Neil Armstrong <neil.armstrong(a)linaro.org> --- Neil Armstrong (2): soc: qcom: rpmh-rsc: add back __tcs_set_trigger() for SM8550/SM8650 regulator: qcom-rpmh-regulator: add support for PM8550 & related regulators drivers/power/regulator/qcom-rpmh-regulator.c | 136 ++++++++++++++++++++++++++ drivers/soc/qcom/rpmh-rsc.c | 43 ++++++++ 2 files changed, 179 insertions(+) --- base-commit: bb403c895887eb5b29652f916646f886b34c6309 change-id: 20240903-topic-sm8x50-regulators-support-b149f2417299 Best regards, -- Neil Armstrong <neil.armstrong(a)linaro.org>

2 4

[U-Boot] [PATCH 10/37] Blackfin: bf548-ezkit: video: convert from old style MMR macros
by Ben Hernandez 05 Sep '24

05 Sep '24

Sent from my T-Mobile 5G Device Get Outlook for Android<https://aka.ms/AAb9ysg>

1 0

[PATCH] android_ab: Fix backup offset calculation
by Joshua Watt 05 Sep '24

05 Sep '24

The backup offset is in bytes, but was incorrectly be interpreted as blocks, leading to it being written to the wrong location. Fix the calculation and clarify that ANDROID_AB_BACKUP_OFFSET is in bytes and must be a multiple of the block size. Signed-off-by: Joshua Watt <JPEWhacker(a)gmail.com> --- boot/android_ab.c | 4 ++-- common/Kconfig | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/boot/android_ab.c b/boot/android_ab.c index 143f373aae..b253200161 100644 --- a/boot/android_ab.c +++ b/boot/android_ab.c @@ -139,8 +139,8 @@ static int ab_control_store(struct blk_desc *dev_desc, { ulong abc_offset, abc_blocks, ret; - abc_offset = offset + - offsetof(struct bootloader_message_ab, slot_suffix) / + abc_offset = (offset + + offsetof(struct bootloader_message_ab, slot_suffix)) / part_info->blksz; abc_blocks = DIV_ROUND_UP(sizeof(struct bootloader_control), part_info->blksz); diff --git a/common/Kconfig b/common/Kconfig index 83c81edac2..e1b8557e0c 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -986,7 +986,8 @@ config ANDROID_AB_BACKUP_OFFSET help If non-zero, a backup bootloader message starting at this offset in the partition will tried in the event that the primary one (starting - at offset 0) fails its checksum. + at offset 0) fails its checksum. The offset is in bytes and must be + multiple of the block size. endmenu -- 2.45.2

3 5

[PATCH 0/9] Add Anbernic RG35XX-2024
by Chris Morgan 05 Sep '24

05 Sep '24

From: Chris Morgan <macromorgan(a)hotmail.com> Add support for the Anbernic RG35XX-2024. This device is a handheld gaming console (series) based around the Anbernic H700 SoC. It comes with 1GB of RAM and multiple face buttons for input. Add support for the simplest model for now, and then iterate later to add board detection logic, support the entire device lineup, and move to using the mainline device tree. Chris Morgan (2): sunxi: dts: arm/arm64: update sun50i-h616.dtsi from Linux-v6.11-rc1 sunxi: Add support for Anbernic RG35XX-2024 Jernej Skrabec (7): sunxi: H616: dram: DDR3: adjust settings sunxi: H616: dram: LPDDR3: adjust settings sunxi: H616: dram: LPDDR4: adjust settings sunxi: H616: DRAM: Add alternative pin mapping sunxi: H616: DRAM: Adjust configuration procedure sunxi: H616: DRAM: Adjust size scan procedure sunxi: H616: dram: Update mbus priorities arch/arm/dts/Makefile | 3 +- arch/arm/dts/sun50i-h616.dtsi | 98 +++++- .../dts/sun50i-h700-anbernic-rg35xx-2024.dts | 320 ++++++++++++++++++ arch/arm/mach-sunxi/dram_sun50i_h616.c | 178 ++++++---- .../mach-sunxi/dram_timings/h616_ddr3_1333.c | 5 +- .../arm/mach-sunxi/dram_timings/h616_lpddr3.c | 2 +- .../dram_timings/h616_lpddr4_2133.c | 2 +- board/sunxi/MAINTAINERS | 5 + configs/anbernic_rg35xx_h700_defconfig | 50 +++ include/dt-bindings/clock/sun50i-h616-ccu.h | 1 + include/dt-bindings/reset/sun50i-h616-ccu.h | 1 + 11 files changed, 600 insertions(+), 65 deletions(-) create mode 100644 arch/arm/dts/sun50i-h700-anbernic-rg35xx-2024.dts create mode 100644 configs/anbernic_rg35xx_h700_defconfig -- 2.34.1

5 21

[u-boot-test-hooks][PATCH 1/2] bin/writer.rpi_mount: Use kernel= and simplify logic
by Tom Rini 05 Sep '24

05 Sep '24

Rather than guess what we need to name our u-boot.bin file as for it to boot make use of the kernel= option to always call it u-boot.bin and then on 64bit platforms (and since future platforms use rpi_arm64 this list should not grow) also pass in arm_64bit=1. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- bin/writer.rpi_mount | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/bin/writer.rpi_mount b/bin/writer.rpi_mount index 73fb8bf6af04..ab7c3b5a2430 100755 --- a/bin/writer.rpi_mount +++ b/bin/writer.rpi_mount @@ -25,30 +25,17 @@ build=${U_BOOT_BUILD_DIR} echo "Writing to ${mount_dir} from build at ${build}" +sudo cp -v ${build}/u-boot.bin ${mount_dir}/u-boot.bin + +echo "enable_uart=1" | sudo tee ${mount_dir}/config.txt +echo "kernel=u-boot.bin" | sudo tee -a ${mount_dir}/config.txt + case "${board_type}" in -rpi) - kernel_dst=kernel.img - ;; -rpi_2) - kernel_dst=kernel7.img - ;; rpi_3|rpi_3b|rpi_3_b_plus|rpi_4|rpi_arm64) - kernel_dst=kernel8.img - ;; -rpi_3_32b|rpi_4_32b) - kernel_dst=kernel8-32.img - ;; -*) - echo Unknown Pi \""${board_type}"\" - exit 1 + echo "arm_64bit=1" | sudo tee -a ${mount_dir}/config.txt ;; esac -sudo rm -f ${mount_dir}/kernel*img -sudo cp -v ${build}/u-boot.bin ${mount_dir}/${kernel_dst} - -echo "enable_uart=1" | sudo tee ${mount_dir}/config.txt - case "${board_ident}" in 3-32-pl011) echo "dtoverlay=pi3-miniuart-bt" | sudo tee -a ${mount_dir}/config.txt -- 2.34.1

2 7