April 2024 - U-Boot

[PATCH 0/2] introduce basic support for TI's am625-lp-sk
by Bryan Brattlof 03 May '24

03 May '24

Hello Everyone! The am625-lp-sk is a variant of the am625-sk showcasing the low-power features of the am625 SoC Family. Because it's essentially a board and package spin of the am625-sk I've inherited the am625 configuration and overridden what was needed. This is a new spin of Nitin's original work which has been updated significantly since October 2023 https://lore.kernel.org/u-boot/20231030110138.1347603-1-n-yadav@ti.com/ Unfortunately a few patches have broken the am62x boot currently and need to be added and reverted for this series to work: One to increase the size of MALLOC space to make room for the DM stubs https://lore.kernel.org/u-boot/20240429214936.15187-1-jm@ti.com And this patch (in active debug) will need to be reverted for MMC boot. https://lore.kernel.org/u-boot/20240422190035.25852-1-greg.malysa@timesys.c… For those of us interested here is proof of life using buildroot: https://paste.sr.ht/~bryanb/40f7787f7760bee383aa8fbc342a29e8544dbdab Thank you for reviewing ~Bryan Signed-off-by: Bryan Brattlof <bb(a)ti.com> --- Bryan Brattlof (1): configs: add defconfigs for the am625-lp-sk Nitin Yadav (1): arm: dts: add U-Boot dtbs for the am625-lp-sk arch/arm/dts/k3-am62-lp-sk-binman.dtsi | 21 + arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi | 17 + arch/arm/dts/k3-am62-lp4-50-800-800.dtsi | 2190 ++++++++++++++++++++++++++++++ arch/arm/dts/k3-am62-r5-lp-sk.dts | 82 ++ configs/am62x_lp_sk_a53_defconfig | 3 + configs/am62x_lp_sk_r5_defconfig | 2 + 6 files changed, 2315 insertions(+) --- base-commit: b43a0c7ed600fc608262b9a274a1cad4c7465b6a change-id: 20240429-am62q-wip-f3453de038fb Best regards, -- Bryan Brattlof <bb(a)ti.com>

2 5

[PATCH] rockchip: Correct UUID for root partitions
by Chris Morgan 03 May '24

03 May '24

From: Chris Morgan <macromorgan(a)hotmail.com> For root partitions, the UUID should still be random but the partition type uuid should either be b921b045-1df0-41c3-af44-4c6f280d3fae for aarch64 or 69dad710-2ce4-4e3c-b16c-21a1d49abed3 for aarch32. Correct the attribute so it is the partition type that is hard coded and not the partition unique identifier. Note that in order for "type" to be used the config option CONFIG_PARTITION_TYPE_GUID must be enabled. If this option is not enabled then the type is ignored and instead the partition type remains the generic ebd0a0a2-b9e5-4433-87c0-68b6b72699c7 for a Linux data partition. Fixes: 42ec247e6988 ("rockchip: use UUID for root partitions") Signed-off-by: Chris Morgan <macromorgan(a)hotmail.com> --- include/configs/rockchip-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 9121bba373..f620579248 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -26,7 +26,7 @@ "name=loader2,start=8MB,size=4MB,uuid=${uuid_gpt_loader2};" \ "name=trust,size=4M,uuid=${uuid_gpt_atf};" \ "name=boot,size=112M,bootable,uuid=${uuid_gpt_boot};" \ - "name=rootfs,size=-,uuid="ROOT_UUID + "name=rootfs,size=-,uuid=${uuid_gpt_rootfs},type="ROOT_UUID #endif -- 2.34.1

2 1

[GIT PULL] Please pull u-boot-mmc master
by Jaehoon Chung 02 May '24

02 May '24

Dear Tom, Please pull u-boot-mmc master into u-boot master branch. If there is any problem, let me know, plz Best Regards, Jaehoon Chung CI: https://source.denx.de/u-boot/custodians/u-boot-mmc/-/pipelines/20547 The following changes since commit d097f9e1299a3bdb7de468f0d9bbc63932f461cd: Merge tag 'fsl-qoriq-2024-4-24' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq (2024-04-23 17:53:06 -0600) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-mmc.git master for you to fetch changes up to 1776213dadef4b578f98bcf18beb152f8975a8bf: mmc: arm_pl180: Limit data transfer to U16_MAX (2024-04-26 15:32:06 +0900) ---------------------------------------------------------------- Greg Malysa (1): mmc: Support 32-bit only ADMA on 64-bit platforms Ian Roberts (2): mmc: sdhci: introduce adma_write_desc() hook to struct sdhci_ops mmc: sdhci: Fix potential ADMA descriptor table overflow Jonas Karlman (2): mmc: Imply HS200 cap with mmc-hs400 prop to match linux mmc: Add support for the no-mmc-hs400 prop Maximilian Brune (1): mmc: arm_pl180: Limit data transfer to U16_MAX cmachida (1): mmc: sdhci: programmable clock calculation needs multiplier +1 drivers/mmc/Kconfig | 18 ++++++++++++++++++ drivers/mmc/arm_pl180_mmci.c | 10 ++++++++++ drivers/mmc/fsl_esdhc.c | 2 +- drivers/mmc/mmc-uclass.c | 7 +++++-- drivers/mmc/sdhci-adma.c | 43 +++++++++++++++++++++++++++++-------------- drivers/mmc/sdhci.c | 26 ++++++++++++++++++-------- include/sdhci.h | 21 +++++++++++++++------ 7 files changed, 96 insertions(+), 31 deletions(-)

5 7

imx8mn: bootcount does not increment
by Fabio Estevam 02 May '24

02 May '24

Hi, When enabling bootcount on the imx8mm-evk like this: --- a/configs/imx8mm_evk_defconfig +++ b/configs/imx8mm_evk_defconfig @@ -120,3 +120,5 @@ CONFIG_SDP_LOADADDR=0x40400000 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_IMX_WATCHDOG=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y It works as expected, and the "bootcount" environment variable gets incremented after a reset. However, if I try the same on an imx8mn_evk, the "bootcount" variable always stays at 1 and never increments. Do you happen to have any idea as to why imx8mn behaves differently in this aspect? Thanks, Fabio Estevam

3 3

[PATCH v4 0/7] Add DFU and usb boot for TI am62x SK and beagleplay
by Sjoerd Simons 02 May '24

02 May '24

This series adds DFU support for TI AM62 SK board and new since this version also for beagleplay. Since the last revision, apart from beagleplay support the main changes are: * Documentation was added on how to use this functionality on both boards * the R5 configuration is now done via a config fragment rather then a full configuraiton * A new patch was added for dwc3 to work in device mode even if dr_mode is configured as otg. Avoiding the need for an explicit switch to periphal in the u-boot dts I will also submit the dts changes to linux so that those can be dropped again in the near future (hopefully) Changes in v4: - Add config dependency on SYSCON - Move defines and constants outside out of function scope - Don't force usb0 into peripheral mode - Move R5 dfu config to a config fragment rather then a full defconfig - Don't enable XHCI for the R5 SPL, unneeded Change in v3: - Add dfu via environment rather then config headers - Enable usb nodes in all boot phases - Run savedefconfig to adjust to more recent u-boot Changes in v2: - Switch dwc3 glue to a seperate driver rather then in dwc-generic - Minimize config changes to just DFU configuration - Only enable usb port 0 DFU in SPL - Create a seperate defconfig for R5 Sjoerd Simons (7): usb: dwc3: Add dwc3 glue driver for am62 usb: dwc3: Switch to device mode on gadget start board: ti: am62x: am62x: include env for DFU arm: dts: k3-am625-sk: Enable usb port in u-boot configs: am62x_evm_*: Enable USB and DFU support beagleplay: Add DFU support doc: board: Add document for DFU boot on am62x SoCs arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 8 ++ arch/arm/dts/k3-am625-sk-u-boot.dtsi | 8 ++ board/beagle/beagleplay/beagleplay.env | 1 + board/ti/am62x/am62x.env | 1 + configs/am62x_beagleplay_a53_defconfig | 30 +++++ configs/am62x_evm_a53_defconfig | 30 +++++ configs/am62x_r5_usbdfu.config | 28 +++++ doc/board/beagle/am62x_beagleplay.rst | 12 ++ doc/board/ti/am62x_sk.rst | 37 ++++++ drivers/usb/dwc3/Kconfig | 14 +++ drivers/usb/dwc3/Makefile | 1 + drivers/usb/dwc3/core.c | 10 +- drivers/usb/dwc3/core.h | 1 + drivers/usb/dwc3/dwc3-am62.c | 125 +++++++++++++++++++ drivers/usb/dwc3/gadget.c | 6 + 15 files changed, 307 insertions(+), 5 deletions(-) create mode 100644 configs/am62x_r5_usbdfu.config create mode 100644 drivers/usb/dwc3/dwc3-am62.c -- 2.43.0

8 44

[PATCH v3 0/2] riscv: Rename spl_soc_init() to spl_dram_init()
by lukas.funke-oss＠weidmueller.com 02 May '24

02 May '24

From: Lukas Funke <lukas.funke(a)weidmueller.com> This patch series renames spl_soc_init() to spl_dram_init() since the purpose of the function is to initialization the DRAM on sifive/starfive boards. spl_dram_init() is a commonly used function for this purpose. Changes in v3: - Reorganize patches such that each patch can be built individually Changes in v2: - capitalized acronym DRAM Lukas Funke (2): board: sifive: Rename spl_soc_init() to spl_dram_init() board: starfive: Rename spl_soc_init() to spl_dram_init() arch/riscv/cpu/fu540/spl.c | 2 +- arch/riscv/cpu/fu740/spl.c | 2 +- arch/riscv/cpu/jh7110/spl.c | 2 +- arch/riscv/include/asm/arch-fu540/spl.h | 2 +- arch/riscv/include/asm/arch-fu740/spl.h | 2 +- arch/riscv/include/asm/arch-jh7110/spl.h | 2 +- board/sifive/unleashed/spl.c | 4 ++-- board/sifive/unmatched/spl.c | 4 ++-- board/starfive/visionfive2/spl.c | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) -- 2.30.2

4 6

[PATCH v2] mmc: sdhci: introduce adma_write_desc() hook to struct sdhci_ops
by Greg Malysa 01 May '24

01 May '24

From: Ian Roberts <ian.roberts(a)timesys.com> Add this hook so that it can be overridden with driver specific implementations. We also let the original sdhci_adma_write_desc() accept &desc so that the function can set its new value. Then export the function so that it could be reused by driver's specific implementations. The above is a port of Linux kernel commit 54552e4948cbf In addition, allow drivers to allocate their own ADMA descriptor tables if additional space is required. Finally, fix the assignment of adma_addr to fix compiler warning on 64-bit platforms that still use 32-bit DMA addressing. Co-developed-by: Nathan Barrett-Morrison <nathan.morrison(a)timesys.com> Signed-off-by: Nathan Barrett-Morrison <nathan.morrison(a)timesys.com> Co-developed-by: Greg Malysa <greg.malysa(a)timesys.com> Signed-off-by: Greg Malysa <greg.malysa(a)timesys.com> Signed-off-by: Ian Roberts <ian.roberts(a)timesys.com> --- Changes in v2: - Switch from #if CONFIG_IS_ENABLED(MMC_SDHCI_ADMA) to #ifdef CONFIG_MMC_SDHCI_ADMA_HELPERS, as CONFIG_IS_ENABLED() causes a build failure during SPL builds when CONFIG_SPL_MMC is set. - Passed CI before submitting this time --- drivers/mmc/fsl_esdhc.c | 2 +- drivers/mmc/sdhci-adma.c | 41 +++++++++++++++++++++++++++------------- drivers/mmc/sdhci.c | 8 +++++--- include/sdhci.h | 12 ++++++++++-- 4 files changed, 44 insertions(+), 19 deletions(-) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index d506666669..bd0671cc52 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -252,7 +252,7 @@ static void esdhc_setup_dma(struct fsl_esdhc_priv *priv, struct mmc_data *data) priv->adma_desc_table) { debug("Using ADMA2\n"); /* prefer ADMA2 if it is available */ - sdhci_prepare_adma_table(priv->adma_desc_table, data, + sdhci_prepare_adma_table(NULL, priv->adma_desc_table, data, priv->dma_addr); adma_addr = virt_to_phys(priv->adma_desc_table); diff --git a/drivers/mmc/sdhci-adma.c b/drivers/mmc/sdhci-adma.c index 8213223d3f..8c38448b6a 100644 --- a/drivers/mmc/sdhci-adma.c +++ b/drivers/mmc/sdhci-adma.c @@ -9,9 +9,10 @@ #include <malloc.h> #include <asm/cache.h> -static void sdhci_adma_desc(struct sdhci_adma_desc *desc, - dma_addr_t addr, u16 len, bool end) +void sdhci_adma_write_desc(struct sdhci_host *host, void **next_desc, + dma_addr_t addr, int len, bool end) { + struct sdhci_adma_desc *desc = *next_desc; u8 attr; attr = ADMA_DESC_ATTR_VALID | ADMA_DESC_TRANSFER_DATA; @@ -19,17 +20,30 @@ static void sdhci_adma_desc(struct sdhci_adma_desc *desc, attr |= ADMA_DESC_ATTR_END; desc->attr = attr; - desc->len = len; + desc->len = len & 0xffff; desc->reserved = 0; desc->addr_lo = lower_32_bits(addr); #ifdef CONFIG_DMA_ADDR_T_64BIT desc->addr_hi = upper_32_bits(addr); #endif + + *next_desc += ADMA_DESC_LEN; +} + +static inline void __sdhci_adma_write_desc(struct sdhci_host *host, + void **desc, dma_addr_t addr, + int len, bool end) +{ + if (host && host->ops && host->ops->adma_write_desc) + host->ops->adma_write_desc(host, desc, addr, len, end); + else + sdhci_adma_write_desc(host, desc, addr, len, end); } /** * sdhci_prepare_adma_table() - Populate the ADMA table * + * @host: Pointer to the sdhci_host * @table: Pointer to the ADMA table * @data: Pointer to MMC data * @addr: DMA address to write to or read from @@ -39,25 +53,26 @@ static void sdhci_adma_desc(struct sdhci_adma_desc *desc, * Please note, that the table size depends on CONFIG_SYS_MMC_MAX_BLK_COUNT and * we don't have to check for overflow. */ -void sdhci_prepare_adma_table(struct sdhci_adma_desc *table, - struct mmc_data *data, dma_addr_t addr) +void sdhci_prepare_adma_table(struct sdhci_host *host, + struct sdhci_adma_desc *table, + struct mmc_data *data, dma_addr_t start_addr) { + dma_addr_t addr = start_addr; uint trans_bytes = data->blocksize * data->blocks; - uint desc_count = DIV_ROUND_UP(trans_bytes, ADMA_MAX_LEN); - struct sdhci_adma_desc *desc = table; - int i = desc_count; + void *next_desc = table; + int i = DIV_ROUND_UP(trans_bytes, ADMA_MAX_LEN); while (--i) { - sdhci_adma_desc(desc, addr, ADMA_MAX_LEN, false); + __sdhci_adma_write_desc(host, &next_desc, addr, + ADMA_MAX_LEN, false); addr += ADMA_MAX_LEN; trans_bytes -= ADMA_MAX_LEN; - desc++; } - sdhci_adma_desc(desc, addr, trans_bytes, true); + __sdhci_adma_write_desc(host, &next_desc, addr, trans_bytes, true); - flush_cache((dma_addr_t)table, - ROUND(desc_count * sizeof(struct sdhci_adma_desc), + flush_cache((phys_addr_t)table, + ROUND(next_desc - (void *)table, ARCH_DMA_MINALIGN)); } diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 0178ed8a11..65090348ae 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -111,7 +111,7 @@ static void sdhci_prepare_dma(struct sdhci_host *host, struct mmc_data *data, } #if CONFIG_IS_ENABLED(MMC_SDHCI_ADMA) else if (host->flags & (USE_ADMA | USE_ADMA64)) { - sdhci_prepare_adma_table(host->adma_desc_table, data, + sdhci_prepare_adma_table(host, host->adma_desc_table, data, host->start_addr); sdhci_writel(host, lower_32_bits(host->adma_addr), @@ -897,8 +897,10 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, __func__); return -EINVAL; } - host->adma_desc_table = sdhci_adma_init(); - host->adma_addr = (dma_addr_t)host->adma_desc_table; + if (!host->adma_desc_table) { + host->adma_desc_table = sdhci_adma_init(); + host->adma_addr = virt_to_phys(host->adma_desc_table); + } #ifdef CONFIG_DMA_ADDR_T_64BIT host->flags |= USE_ADMA64; diff --git a/include/sdhci.h b/include/sdhci.h index a1b74e3bd7..d73a725609 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -291,6 +291,11 @@ struct sdhci_ops { * Return: 0 if successful, -ve on error */ int (*set_enhanced_strobe)(struct sdhci_host *host); + +#ifdef CONFIG_MMC_SDHCI_ADMA_HELPERS + void (*adma_write_desc)(struct sdhci_host *host, void **desc, + dma_addr_t addr, int len, bool end); +#endif }; #define ADMA_MAX_LEN 65532 @@ -526,8 +531,11 @@ extern const struct dm_mmc_ops sdhci_ops; #else #endif +void sdhci_adma_write_desc(struct sdhci_host *host, void **next_desc, + dma_addr_t addr, int len, bool end); struct sdhci_adma_desc *sdhci_adma_init(void); -void sdhci_prepare_adma_table(struct sdhci_adma_desc *table, - struct mmc_data *data, dma_addr_t addr); +void sdhci_prepare_adma_table(struct sdhci_host *host, + struct sdhci_adma_desc *table, + struct mmc_data *data, dma_addr_t start_addr); #endif /* __SDHCI_HW_H */ -- 2.43.2

2 1

[PATCH 0/3] sysreset: sophgo: milkv_duo: Add sysreset support for Milk-V Duo board
by Kongyang Liu 01 May '24

01 May '24

This series add sysreset driver for cv1800b SoC and enable poweroff and reset commands for Sophgo Milk-V Duo board. Kongyang Liu (3): sysreset: cv1800b: Add sysreset driver for cv1800b SoC board: sophgo: milkv_duo: Bind sysreset driver configs: milkv_duo: Add sysreset configs board/sophgo/milkv_duo/board.c | 4 ++ configs/milkv_duo_defconfig | 3 ++ drivers/sysreset/Kconfig | 5 +++ drivers/sysreset/Makefile | 1 + drivers/sysreset/sysreset_cv1800b.c | 64 +++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+) create mode 100644 drivers/sysreset/sysreset_cv1800b.c -- 2.41.0

2 6

[PATCH] riscv: andesv5: Set default cache line size to 64-bytes
by Yu Chien Peter Lin 01 May '24

01 May '24

The instruction and data cache line sizes of Andes core are 64-byte. Select SYS_CACHE_SHIFT_6 for RISCV_NDS so the SYS_CACHELINE_SIZE is enabled with a default value. Signed-off-by: Yu Chien Peter Lin <peterlin(a)andestech.com> --- arch/riscv/cpu/andesv5/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/riscv/cpu/andesv5/Kconfig b/arch/riscv/cpu/andesv5/Kconfig index f311291aed..e3efb0de8f 100644 --- a/arch/riscv/cpu/andesv5/Kconfig +++ b/arch/riscv/cpu/andesv5/Kconfig @@ -1,6 +1,7 @@ config RISCV_NDS bool select ARCH_EARLY_INIT_R + select SYS_CACHE_SHIFT_6 imply CPU imply CPU_RISCV imply RISCV_TIMER if (RISCV_SMODE || SPL_RISCV_SMODE) -- 2.34.1

2 1

[PATCH v2 0/3] board: sophgo: milkv_duo: Add ethernet support for Milk-V Duo board
by Kongyang Liu 01 May '24

01 May '24

This series add init code for cv1800b ethernet phy and enable ethernet support for Sophgo Milk-V Duo board. In cv1800b, as the PHY register phy_id being initialized to 0, it is necessary to initialize the PHY before the ethernet driver initialization. Therefore, the initialization code is placed in the board_init function. For the Linux kernel, due to the presence of a hibernation mechanism, whether the phy id will be reset to 0 after hibernation and how to reassign it thereafter remains an issue to consider. Once this issue is resolved, the Ethernet driver for the Milk-V Duo will be sent to the kernel. Changes in v2: - Change compatible - Add clocks and interrupt properties. Kongyang Liu (3): board: milkv_duo: Add init code for Milk-V Duo ethernet riscv: dts: sophgo: Add ethernet node configs: milkv_duo: Add ethernet configs arch/riscv/dts/cv1800b-milkv-duo.dts | 7 ++- arch/riscv/dts/cv18xx.dtsi | 23 ++++++++ board/sophgo/milkv_duo/Makefile | 3 +- board/sophgo/milkv_duo/board.c | 4 ++ board/sophgo/milkv_duo/ethernet.c | 79 ++++++++++++++++++++++++++++ board/sophgo/milkv_duo/ethernet.h | 11 ++++ configs/milkv_duo_defconfig | 4 ++ drivers/net/designware.c | 1 + 8 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 board/sophgo/milkv_duo/ethernet.c create mode 100644 board/sophgo/milkv_duo/ethernet.h -- 2.41.0

2 4