April 2023 - U-Boot

[PATCH 0/2] sunxi: binman: Fix U-Boot offset when SPL is not 32 KiB
by Samuel Holland 14 Apr '23

14 Apr '23

This was originally part of my series adding SPL FIT support for 32-bit sunxi boards[0]. I hit this issue building a minimal SPI-only SPL for H5 that ended up fitting in 24 KiB. So it turns out this is a bug and not just a dependency for a new feature. I followed Simon's second suggestion from his response to my original series[1]. [0]: https://lore.kernel.org/u-boot/20211013023022.58829-1-samuel@sholland.org/ [1]: https://lore.kernel.org/u-boot/CAPnjgZ1_ee7uoDLT36LS5gQa12A2zsWRqXWtEm5g-oP… Samuel Holland (2): binman: Add 'min-size' entry property sunxi: binman: Fix U-Boot offset when SPL is not 32 KiB arch/arm/dts/sunxi-u-boot.dtsi | 6 +++++- tools/binman/binman.rst | 8 ++++++++ tools/binman/entry.py | 4 ++++ tools/binman/ftest.py | 21 +++++++++++++++++---- tools/binman/test/009_pack_extra.dts | 7 +++++++ 5 files changed, 41 insertions(+), 5 deletions(-) -- 2.37.4

3 6

[PATCH v2 0/6] mtd: nand: sunxi: Convert to devicetree and the driver model
by Samuel Holland 14 Apr '23

14 Apr '23

This series converts the sunxi NAND driver to get its resources (clocks, resets, pins) from the devicetree, and probe using the driver model. In addition to the immediate cleanup, this allows backporting more patches (bugfixes, newer SoC support) from the Linux driver. Changes in v2: - Fix A80 bus clock/reset bit positions Samuel Holland (6): clk: sunxi: Add NAND clocks and resets pinctrl: sunxi: Add NAND pinmuxes mtd: nand: sunxi: Remove an unnecessary check mtd: nand: sunxi: Convert from fdtdec to ofnode mtd: nand: sunxi: Convert to the driver model mtd: nand: sunxi: Pass the device to the init function board/sunxi/board.c | 5 +- drivers/clk/sunxi/clk_a10.c | 2 + drivers/clk/sunxi/clk_a10s.c | 2 + drivers/clk/sunxi/clk_a23.c | 3 + drivers/clk/sunxi/clk_a31.c | 6 + drivers/clk/sunxi/clk_a64.c | 3 + drivers/clk/sunxi/clk_a80.c | 8 ++ drivers/clk/sunxi/clk_a83t.c | 3 + drivers/clk/sunxi/clk_h3.c | 3 + drivers/clk/sunxi/clk_h6.c | 6 + drivers/clk/sunxi/clk_h616.c | 6 + drivers/clk/sunxi/clk_r40.c | 3 + drivers/mtd/nand/raw/sunxi_nand.c | 173 ++++++++++++-------------- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 13 ++ include/fdtdec.h | 1 - lib/fdtdec.c | 1 - 16 files changed, 138 insertions(+), 100 deletions(-) -- 2.37.4

4 12

[PATCH] ram: rk3399: add missing high row detection
by Jonathan Liu 14 Apr '23

14 Apr '23

For 2 GB LPDDR4 single-rank RAM with 16 rows, the Rockchip ddr init bin prints: "Bus Width=32 Col=10 Bank=8 Row=16 CS=1 Die Bus-Width=16 Size=2048MB" U-Boot TPL prints: "BW=32 Col=10 Bk=8 CS0 Row=16/15 CS=1 Die BW=16 Size=2048MB" Add missing high row detection so that U-Boot TPL prints Row=16, same as the Rockchip ddr init bin: "BW=32 Col=10 Bk=8 CS0 Row=16 CS=1 Die BW=16 Size=2048MB" Signed-off-by: Jonathan Liu <net147(a)gmail.com> --- drivers/ram/rockchip/sdram_rk3399.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index b1fea04e84..b597448203 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -2749,6 +2749,8 @@ static u64 dram_detect_cap(struct dram_info *dram, /* detect cs1 row */ sdram_detect_cs1_row(cap_info, params->base.dramtype); + sdram_detect_high_row(cap_info); + /* detect die bw */ sdram_detect_dbw(cap_info, params->base.dramtype); -- 2.40.0

2 1

[PATCH 0/2] rockchip: theobroma: enforce ENV_IS_NOWHERE with Kconfig select
by Quentin Schulz 14 Apr '23

14 Apr '23

As suggested multiple times by Tom, and to facilitate the deprecation of IS_ENABLED as started in https://lore.kernel.org/u-boot/20230224181047.2775829-1-troykiskyboundary@g… let's migrate Theobroma boards to Kconfig symbol dependency for our boards instead of dependending on the compiler to error out if it's not defined. This both guarantees it is selected and improves user-friendliness. To: Klaus Goger <klaus.goger(a)theobroma-systems.com> Cc: Troy Kisky <troykiskyboundary(a)gmail.com> Cc: u-boot(a)lists.denx.de Suggested-by: Tom Rini <trini(a)konsulko.com> Signed-off-by: Quentin Schulz <quentin.schulz(a)theobroma-systems.com> --- Quentin Schulz (2): rockchip: puma-rk3399: enforce ENV_IS_NOWHERE with Kconfig select rockchip: ringneck-px30: enforce ENV_IS_NOWHERE with Kconfig select board/theobroma-systems/puma_rk3399/Kconfig | 1 + board/theobroma-systems/puma_rk3399/puma-rk3399.c | 4 ---- board/theobroma-systems/ringneck_px30/Kconfig | 1 + board/theobroma-systems/ringneck_px30/ringneck-px30.c | 4 ---- configs/puma-rk3399_defconfig | 1 - configs/ringneck-px30_defconfig | 1 - 6 files changed, 2 insertions(+), 10 deletions(-) --- base-commit: b0eda49bc9b00503366f2ec431be0178caf9e9b5 change-id: 20230301-tsd-env-nowhere-kconfig-a339fd663f15 Best regards, -- Quentin Schulz <quentin.schulz(a)theobroma-systems.com>

4 6

[PATCH 0/2] rockchip: Add DSI support for RK3568
by Chris Morgan 14 Apr '23

14 Apr '23

From: Chris Morgan <macromorgan(a)hotmail.com> This patch series is to add DSI support for the RK3568 SoC. DSI and DSI-DPHY support is needed in my use case so that I may read the panel ID via DSI commands prior to loading Linux in order to differentiate between different panels and correct the device tree. The drivers are heavily based on upstream Linux drivers, and should allow support for display to a DSI panel if an appropriate video output device and panel driver is also written. Tested drivers on Anbernic RG353 series devices to read panel ID in U-Boot. Chris Morgan (2): drivers: phy: add Innosilicon DSI-DPHY driver rockchip: video: Add support for RK3568 DSI Host drivers/phy/rockchip/Kconfig | 8 + drivers/phy/rockchip/Makefile | 1 + .../phy/rockchip/phy-rockchip-inno-dsidphy.c | 680 +++++++++++++ drivers/video/dw_mipi_dsi.c | 9 + drivers/video/rockchip/Kconfig | 8 + drivers/video/rockchip/Makefile | 1 + drivers/video/rockchip/dw_mipi_dsi_rockchip.c | 898 ++++++++++++++++++ 7 files changed, 1605 insertions(+) create mode 100644 drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c create mode 100644 drivers/video/rockchip/dw_mipi_dsi_rockchip.c -- 2.34.1

2 4

[PATCH v3 0/3] rockchip: fix efuse/otp misc_read return values
by John Keeping 14 Apr '23

14 Apr '23

Fix the return value for misc_read() in the two Rockchip nvmem drivers so that they return the number of bytes read. In v3 there is a new initial patch to fix the one place that uses this return value to correctly check for negative error returns. The other two patches are unchanged from v2. John Keeping (3): rockchip: misc: fix misc_read() return check rockchip: efuse: fix misc_read() return values rockchip: otp: fix misc_read() return values arch/arm/mach-rockchip/misc.c | 2 +- drivers/misc/rockchip-efuse.c | 12 ++++++++---- drivers/misc/rockchip-otp.c | 12 ++++++++---- 3 files changed, 17 insertions(+), 9 deletions(-) -- 2.40.0

3 7

[PATCH] clk: rockchip: rk3568: Add dummy I2S1_MCLKOUT_TX clock support
by Jonas Karlman 14 Apr '23

14 Apr '23

A RK3568 device tree pmic node can reference the I2S1_MCLKOUT_TX clock in assigned-clocks, add dummy support to set parent of this clock to the rk3568 cru driver. Fixes probe of pmic driver and missing regulators on affected boards, rk3568-evb and rk3568-rock-3a. Signed-off-by: Jonas Karlman <jonas(a)kwiboo.se> --- drivers/clk/rockchip/clk_rk3568.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/clk/rockchip/clk_rk3568.c b/drivers/clk/rockchip/clk_rk3568.c index 1c6adc56f913..cefc263971a6 100644 --- a/drivers/clk/rockchip/clk_rk3568.c +++ b/drivers/clk/rockchip/clk_rk3568.c @@ -2838,6 +2838,8 @@ static int rk3568_clk_set_parent(struct clk *clk, struct clk *parent) case ACLK_RKVDEC_PRE: case CLK_RKVDEC_CORE: return rk3568_rkvdec_set_parent(clk, parent); + case I2S1_MCLKOUT_TX: + break; default: return -ENOENT; } -- 2.40.0

2 1

[PATCH v2] mmc: dw_mmc: reset controller after data error
by Eugen Hristev 14 Apr '23

14 Apr '23

From: Ziyuan Xu <xzy.xu(a)rock-chips.com> Per dw_mmc databook, it's recommended to reset the host controller if some data-related error occurred. Implement a reset mechanism. Signed-off-by: Ziyuan Xu <xzy.xu(a)rock-chips.com> Co-developed-by: Jason Zhu <jason.zhu(a)rock-chips.com> Signed-off-by: Jason Zhu <jason.zhu(a)rock-chips.com> [eugen.hristev(a)collabora.com: modified a bit the variables initialization] Signed-off-by: Eugen Hristev <eugen.hristev(a)collabora.com> --- Changes in v2: - actually decrement the reset timeout timer drivers/mmc/dw_mmc.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index 5085a3b491da..d6cad998b0cd 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -138,7 +138,7 @@ static int dwmci_data_transfer(struct dwmci_host *host, struct mmc_data *data) { struct mmc *mmc = host->mmc; int ret = 0; - u32 timeout, mask, size, i, len = 0; + u32 timeout, reset_timeout = 100, status, ctrl, mask, size, i, len = 0; u32 *buf = NULL; ulong start = get_timer(0); u32 fifo_depth = (((host->fifoth_val & RX_WMARK_MASK) >> @@ -159,6 +159,24 @@ static int dwmci_data_transfer(struct dwmci_host *host, struct mmc_data *data) /* Error during data transfer. */ if (mask & (DWMCI_DATA_ERR | DWMCI_DATA_TOUT)) { debug("%s: DATA ERROR!\n", __func__); + + dwmci_wait_reset(host, DWMCI_RESET_ALL); + dwmci_writel(host, DWMCI_CMD, DWMCI_CMD_PRV_DAT_WAIT | + DWMCI_CMD_UPD_CLK | DWMCI_CMD_START); + + do { + status = dwmci_readl(host, DWMCI_CMD); + if (!reset_timeout--) + break; + udelay(100); + } while (status & DWMCI_CMD_START); + + if (!host->fifo_mode) { + ctrl = dwmci_readl(host, DWMCI_BMOD); + ctrl |= DWMCI_BMOD_IDMAC_RESET; + dwmci_writel(host, DWMCI_BMOD, ctrl); + } + ret = -EINVAL; break; } -- 2.34.1

2 1

[PATCH] mtd: cfi: respect reg address length
by Nuno Sá 14 Apr '23

14 Apr '23

flash_get_size() will get the flash size from the device itself and go through all erase regions to read protection status. However, the device mappable region (eg: devicetree reg property) might be lower than the device full size which means that the above cycle will result in a data bus exception. This change fixes it by reading the 'addr_size' during probe() and also use that as one possible upper limit. Signed-off-by: Nuno Sá <nuno.sa(a)analog.com> --- To give a bit more of background for this patch, I caught this issue when running u-boot on microblaze which uses xilinx axi_linear_flash IP. On ADI designs using that IP, the flash size was set to 32MiB resulting in the mentioned data bus exception as we obviously access past the IP size. That said, there was not real reason for the flash truncation so we'll be fixing our designs so the IP will contemplate the complete flash size. For the above reason, I was not really sure to mark the patch as RFC or not... Anyways, it still feels like a valid "protection" to have rather then just aborting (even if it does not really make sense to ever truncate the flash in devicetree). drivers/mtd/cfi_flash.c | 10 ++++++++-- include/flash.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index f378f6fb6139..432d0d5c9ecb 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -2196,7 +2196,11 @@ ulong flash_get_size(phys_addr_t base, int banknum) /* multiply the size by the number of chips */ info->size *= size_ratio; max_size = cfi_flash_bank_size(banknum); - if (max_size && info->size > max_size) { + if (max_size) + max_size = min(info->addr_size, max_size); + else + max_size = info->addr_size; + if (info->size > max_size) { debug("[truncated from %ldMiB]", info->size >> 20); info->size = max_size; } @@ -2492,15 +2496,17 @@ unsigned long flash_init(void) static int cfi_flash_probe(struct udevice *dev) { fdt_addr_t addr; + fdt_size_t size; int idx; for (idx = 0; idx < CFI_MAX_FLASH_BANKS; idx++) { - addr = dev_read_addr_index(dev, idx); + addr = dev_read_addr_size_index(dev, idx, &size); if (addr == FDT_ADDR_T_NONE) break; flash_info[cfi_flash_num_flash_banks].dev = dev; flash_info[cfi_flash_num_flash_banks].base = addr; + flash_info[cfi_flash_num_flash_banks].addr_size = size; cfi_flash_num_flash_banks++; } gd->bd->bi_flashstart = flash_info[0].base; diff --git a/include/flash.h b/include/flash.h index 95992fa689bb..3710a2731b76 100644 --- a/include/flash.h +++ b/include/flash.h @@ -46,6 +46,7 @@ typedef struct { #ifdef CONFIG_CFI_FLASH /* DM-specific parts */ struct udevice *dev; phys_addr_t base; + phys_size_t addr_size; #endif } flash_info_t; -- 2.40.0

3 4

[PATCH u-boot-mvebu 0/7] arm: mvebu: Boot support for 4K Native disks
by Pali Rohár 14 Apr '23

14 Apr '23

This patch series allows to build SATA kwbimage for disks which do not have sector size 512 bytes long. For example 4K Native disks. SATA kwbimage differs from other kwbimage types in that way, that offset in its header is stored in SATA sectors units instead of byte units. Therefore image generator needs to know sector size of the target SATA disk. Currently both kwbimage and mkimage has hardcoded SATA sector size to 512 bytes. This patch series allows to specify custom SATA sector size via a new config option CONFIG_MVEBU_SPL_SATA_BLKSZ. And add autodetection of the sector size into kwboot to allow parsing such images. Maximal theoretical sector size is 32 kB because ATA IDENTIFY command returns sector size as 16-bit number and sector size should be power of two. Pali Rohár (7): arm: mvebu: spl: Do not hardcode SATA block size to 512 cmd: mvebu/bubt: a38x: Do not hardcode SATA block size to 512 tools: imagetool: Extend print_header() by params argument tools: kwbimage: Simplify align code tools: kwbimage: Add support for SATA images with non-512 byte block size tools: kwboot: Add support for parsing SATA images with non-512 block size arm: mvebu: spl: Allow to build SATA kwbimage for 4K Native disks arch/arm/mach-mvebu/Kconfig | 10 ++ arch/arm/mach-mvebu/Makefile | 5 + arch/arm/mach-mvebu/kwbimage.cfg.in | 3 + arch/arm/mach-mvebu/spl.c | 11 ++- cmd/mvebu/bubt.c | 7 +- tools/aisimage.c | 2 +- tools/atmelimage.c | 2 +- tools/default_image.c | 7 +- tools/fit_common.c | 5 + tools/fit_common.h | 2 + tools/fit_image.c | 2 +- tools/gpimage.c | 2 +- tools/imagetool.c | 4 +- tools/imagetool.h | 2 +- tools/imx8image.c | 2 +- tools/imx8mimage.c | 2 +- tools/imximage.c | 2 +- tools/kwbimage.c | 144 ++++++++++++++++++---------- tools/kwboot.c | 35 ++++++- tools/lpc32xximage.c | 2 +- tools/mkimage.c | 2 +- tools/mtk_image.c | 2 +- tools/mxsimage.c | 2 +- tools/omapimage.c | 2 +- tools/pblimage.c | 2 +- tools/rkcommon.c | 2 +- tools/rkcommon.h | 2 +- tools/socfpgaimage.c | 2 +- tools/stm32image.c | 2 +- tools/sunxi_egon.c | 2 +- tools/sunxi_toc0.c | 2 +- tools/ublimage.c | 2 +- tools/vybridimage.c | 2 +- tools/zynqimage.c | 2 +- tools/zynqmpimage.c | 2 +- tools/zynqmpimage.h | 2 +- 36 files changed, 199 insertions(+), 84 deletions(-) -- 2.20.1

5 14