November 2023 - U-Boot

[PATCH v2 0/2] rockchip: Use dwc3-generic driver on RK3328 and RK3399
by Jonas Karlman 18 Jan '24

18 Jan '24

This series change to use the dwc3-generic driver on all RK3328 and RK3399 boards. Also switch to use DM_USB_GADGET and remove then obsolete board_usb_init() and dm_usb_gadget_handle_interrupts() functions. First patch change all RK33xx boards to use dwc3-generic driver. Second patch remove obsolete rk3399 usb gadget functions. This has been tested and validated on rockpro64 and rock-pi-4 boards. Changes in v2: - Drop DM_USB_GADGET related changes from first patch - Add DM_USB_GADGET condition to arch Kconfig Jonas Karlman (2): configs: rockchip: Use dwc3-generic driver on RK3328 and RK3399 rockchip: board: Remove dwc3 usb init and gadget handler functions arch/arm/Kconfig | 1 + arch/arm/mach-rockchip/board.c | 30 +------------------ configs/chromebook_bob_defconfig | 2 +- configs/chromebook_kevin_defconfig | 2 +- configs/eaidk-610-rk3399_defconfig | 4 ++- configs/evb-rk3399_defconfig | 1 - configs/firefly-rk3399_defconfig | 1 - configs/khadas-edge-captain-rk3399_defconfig | 4 ++- configs/khadas-edge-rk3399_defconfig | 4 ++- configs/khadas-edge-v-rk3399_defconfig | 4 ++- configs/leez-rk3399_defconfig | 4 ++- configs/nanopc-t4-rk3399_defconfig | 3 +- configs/nanopc-t6-rk3588_defconfig | 1 - configs/nanopi-m4-2gb-rk3399_defconfig | 4 ++- configs/nanopi-m4-rk3399_defconfig | 4 ++- configs/nanopi-m4b-rk3399_defconfig | 4 ++- configs/nanopi-neo4-rk3399_defconfig | 4 ++- configs/nanopi-r4s-rk3399_defconfig | 3 +- configs/orangepi-5-plus-rk3588_defconfig | 1 - configs/orangepi-5-rk3588s_defconfig | 1 - configs/orangepi-r1-plus-lts-rk3328_defconfig | 3 +- configs/orangepi-r1-plus-rk3328_defconfig | 3 +- configs/orangepi-rk3399_defconfig | 4 ++- configs/pinebook-pro-rk3399_defconfig | 1 - configs/pinephone-pro-rk3399_defconfig | 1 - configs/puma-rk3399_defconfig | 1 - configs/roc-pc-mezzanine-rk3399_defconfig | 1 - configs/roc-pc-rk3399_defconfig | 1 - configs/rock-4c-plus-rk3399_defconfig | 1 - configs/rock-4se-rk3399_defconfig | 1 - configs/rock-pi-4-rk3399_defconfig | 1 - configs/rock-pi-4c-rk3399_defconfig | 1 - configs/rock-pi-n10-rk3399pro_defconfig | 1 - configs/rock5a-rk3588s_defconfig | 1 - configs/rock5b-rk3588_defconfig | 1 - configs/rock960-rk3399_defconfig | 3 +- configs/rockpro64-rk3399_defconfig | 1 - drivers/usb/host/Kconfig | 1 - 38 files changed, 44 insertions(+), 65 deletions(-) -- 2.42.0

3 5

[PATCH v2 0/4] rockchip: rk3588: Fix SPI flash bootsource id values
by Jonas Karlman 18 Jan '24

18 Jan '24

The commit fd6e425be243 ("rockchip: rk3588-rock-5b: Enable boot from SPI NOR flash") added a new BROM_BOOTSOURCE_SPINOR_RK3588 with value 6. At the time the reason for this new bootsource id value 6 was unknown. Since then the following bootsource id values have been observed on different RK3588 devices: - Radxa ROCK 5 Model A - fspim0_pins - rk3588s - Xunlong Orange Pi 5 - fspim0_pins - rk3588s brom_bootdevice_id: 3 - FriendlyElec NanoPC-T6 - fspim1_pins - rk3588 - Xunlong Orange Pi 5 Plus - fspim1_pins - rk3588 brom_bootdevice_id: 4 - Radxa ROCK 5 Model B - fspim2_pins - rk3588 brom_bootdevice_id: 6 It has now been confirmed that the BootRom on RK3588 use different bootsource id values depending on the iomux used by the flash spi controller, and not by the type of spi nor or spi nand flash used. This series adjusts the bootsource enum values, updates the boot_devices array to fix booting from SPI flash on RK3588 devices using fspim1_pins. It also enable building of a bootable SPI image for affected devices. Changes in v2: - Move FSPI M0/M1/M2 enum values from bootrom.h to rk3588.c - Add t-b tag John Clark (1): rockchip: rk3588-nanopc-t6: Build SPI image Jonas Karlman (2): rockchip: rk3588: Fix boot from SPI flash rockchip: rk3588s-orangepi-5: Build SPI image Slawomir Stepien (1): rockchip: rk3588-orangepi-5-plus: Build SPI image arch/arm/include/asm/arch-rockchip/bootrom.h | 1 - arch/arm/mach-rockchip/rk3588/rk3588.c | 16 ++++++++++++++-- configs/nanopc-t6-rk3588_defconfig | 1 + configs/orangepi-5-plus-rk3588_defconfig | 1 + configs/orangepi-5-rk3588s_defconfig | 1 + 5 files changed, 17 insertions(+), 3 deletions(-) -- 2.42.0

2 8

[PATCH v2 RESEND] mmc: dw_mmc: reset controller after data error
by Eugen Hristev 18 Jan '24

18 Jan '24

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> --- 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

4 6

[PATCH next v2 0/6] rockchip: rk3588: add support for detecting U-Boot proper boot medium
by Quentin Schulz 17 Jan '24

17 Jan '24

It is possible to boot U-Boot proper from a different storage medium than the one used by the BOOTROM to load the SPL. This information is stored in the u-boot,spl-boot-device Device Tree property and is accessible from U-Boot proper so that it has knowledge at runtime where it was loaded from. This is already supported on rk3399 and px30 but with duplicated code, so this patch series also factor out all of this into spl-boot-order of Rockchip platforms, which makes it drastically easier to add support to other SoCs, just a simple array needing to be added to the appropriate SoC file. Let's add support for this feature for rk3588 the same way it was done for px30 and rk3399. While at it, let's do some cleanups for Rockchip platforms. Signed-off-by: Quentin Schulz <quentin.schulz(a)theobroma-systems.com> --- Changes in v2: - add factoring into spl-boot-order - rework rk3588 support to use the factored out function - add global data ptr cleanup - remove rk3128 main SoC file (useless content) - Link to v1: https://lore.kernel.org/r/20230502-rk3588-spl-boot-dev-v1-1-071722a85d2d@th… --- Quentin Schulz (6): rockchip: rk3399: simplify logic for getting SPL boot medium DT node rockchip: px30: simplify logic for getting SPL boot medium DT node rockchip: factor out spl_perform_fixups into common spl-boot-order rockchip: rk3588: insert u-boot,spl-boot-device into U-Boot device tree rockchip: remove unused global data ptr rockchip: rk3128: remove noop file arch/arm/mach-rockchip/board.c | 3 -- arch/arm/mach-rockchip/px30/px30.c | 50 +++--------------------------- arch/arm/mach-rockchip/rk3128/Makefile | 1 - arch/arm/mach-rockchip/rk3128/rk3128.c | 16 ---------- arch/arm/mach-rockchip/rk3308/rk3308.c | 3 -- arch/arm/mach-rockchip/rk3328/rk3328.c | 3 -- arch/arm/mach-rockchip/rk3368/rk3368.c | 3 -- arch/arm/mach-rockchip/rk3399/rk3399.c | 55 +++------------------------------ arch/arm/mach-rockchip/rk3588/rk3588.c | 10 ++++-- arch/arm/mach-rockchip/spl-boot-order.c | 49 +++++++++++++++++++++++++++++ 10 files changed, 66 insertions(+), 127 deletions(-) --- base-commit: e17d174773e9ba9447596708e702b7382e47a6cf change-id: 20230502-rk3588-spl-boot-dev-efa2777cc21b Best regards, -- Quentin Schulz <quentin.schulz(a)theobroma-systems.com>

2 9

[PATCH V2 0/4] Add Additional Boards and Features to RGxx3
by Chris Morgan 17 Jan '24

17 Jan '24

From: Chris Morgan <macromorgan(a)hotmail.com> The RGxx3 is a pseudo-device for U-Boot that works for every Anbernic RGxx3 series device on the market. Add support for another series of very similar devices from Powkiddy. Changes since V1: - Update verbiage around function button to say "recovery" mode instead of calling it "maskrom" mode, which has a specific meaning. Also note that recovery function was done in a board specific manner to ensure it can run early. - Update board level documentation for the RGxx3. Chris Morgan (4): board: rockchip: Refactor panel auto-detect code board: rockchip: Add Recovery Button for Anbernic RGxx3 board: rockchip: Add support for RGB30 and RK2023 to RGxx3 doc: board: anbernic: Update rgxx3 to add new boards board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c | 195 ++++++++++++++++----- doc/board/anbernic/rgxx3.rst | 18 +- 2 files changed, 166 insertions(+), 47 deletions(-) -- 2.34.1

3 7

[PATCH v7 1/2] schemas: memory: Add ECC properties
by Simon Glass 16 Jan '24

16 Jan '24

Some memories provide ECC detection and/or correction. For software which wants to check memory, it is helpful to see which regions provide this feature. Add this as a property of the /memory nodes, since it presumably follows the hardware-level memory system. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v7: - Drop unnecessary | - Add a blank line between properties Changes in v6: - Use a number of bits instead of a string property - Fix inidcates typo Changes in v5: - Redo to make this property specific to ECC - Provide properties both for detection and correction Changes in v3: - Add new patch to update the /memory nodes dtschema/schemas/memory.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dtschema/schemas/memory.yaml b/dtschema/schemas/memory.yaml index 1d74410..b3bf3c9 100644 --- a/dtschema/schemas/memory.yaml +++ b/dtschema/schemas/memory.yaml @@ -35,6 +35,19 @@ patternProperties: For the purpose of identification, each NUMA node is associated with a unique token known as a node id. + ecc-detection-bits: + default: 0 + description: | + If present, this indicates the number of bits of memory error which + can be detected and reported by the Error-Correction Code (ECC) memory + subsystem (typically 0, 1 or 2). + + ecc-correction-bits: + default: 0 + description: | + If present, this indicates the number of bits of memory error which + can be corrected by the Error-Correction Code (ECC) memory subsystem + (typically 0, 1 or 2). required: - device_type -- 2.42.0.515.g380fc7ccd1-goog

5 45

[PATCH V6 00/10] Update SPL splashscreen framework for AM62x
by Nikhil M Jain 12 Jan '24

12 Jan '24

This patch series aims at updating SPL splashscreen framework for AM62x. This patch series depends on https://lore.kernel.org/u-boot/20230504225829.2537050-1-sjg@chromium.org/ This series: - Fixes compilation issues in case splash related configs are not defined in SPL. - Does page table setup, dram initialisation and dcache enabling in one function call spl_enable_dcache. - Allows passing of framebuffer from spl to u-boot, eliminating flicker. V6: - Add patch [1] from Samuel Dionne-Riel fixing CMD_BMP/BMP dependecy. V5: - Change A53 SPL DDR layout from ASCII table to tabular format. V4: - Fix commit message. - Introduce patch defining DDR layout in A53 SPL. - Add Reviewed-by tags. V3: - Fix spacing issues. - Add Reviewed-by tag. - Replace #if with if in patch common: spl: spl: Remove video driver - Add link to updated memory map. V2: - Update cover letter. - Fix commit message. [1]: https://patchwork.ozlabs.org/project/uboot/patch/20230709231810.633044-1-sa… Nikhil M Jain (9): common: spl: spl: Update stack pointer address arch: arm: mach-k3: common: Return a pointer after setting page table board: ti: am62x: evm: Update function calls for splash screen include: video: Reserve video using blob common: board_f: Pass frame buffer info from SPL to u-boot drivers: video: Kconfig: Add config remove video common: spl: spl: Remove video driver configs: am62x_evm_a53: Add bloblist address doc: board: ti: am62x_sk: Add A53 SPL DDR layout Samuel Dionne-Riel (1): common: Kconfig: Fix CMD_BMP/BMP dependency arch/arm/mach-k3/am625_init.c | 1 + arch/arm/mach-k3/common.c | 2 ++ board/ti/am62x/evm.c | 41 +++++++++--------------- cmd/Kconfig | 1 + common/Kconfig | 1 - common/board_f.c | 11 ++++++- common/spl/spl.c | 23 ++++++------- configs/am62x_evm_a53_defconfig | 1 + doc/board/ti/am62x_sk.rst | 57 +++++++++++++++++++++++++++++++++ drivers/video/Kconfig | 12 +++++++ drivers/video/video-uclass.c | 23 +++++++++++++ include/video.h | 9 ++++++ 12 files changed, 143 insertions(+), 39 deletions(-) -- 2.34.1

5 14

[RFC PATCH 0/2] board: ti: Use Extension framework
by Roger Quadros 11 Jan '24

11 Jan '24

Hi, RFC as only build tested. Need to get early feedback before I spend more time on this. Newer TI boards (AM6/J7) are using a custom logic to detect expansion cards and set a 'name_overlays' environment variable. Then DT overlays are applied by again custom environment scripts during boot. Instead of that migrate to using the Extension framework. This allows the user to call 'extension scan' and 'extension apply' commands to detect extension cards and apply the DT overlays respectively. For Booting, I expect distro boot scripts to already support the extension framework via following environment 'extension_overlay_cmd' and 'extension_overlay_addr'. i.e. include/config_distro_bootcmd.h cheers, -roger Roger Quadros (2): board: ti: common: Add CONFIG_TI_CAPE_DETECT for cape detection board: ti: am65x: Move to using Extension framework board/ti/am335x/board.c | 8 + board/ti/am65x/evm.c | 264 ++++++++--------------------- board/ti/common/Kconfig | 16 ++ board/ti/common/Makefile | 3 +- board/ti/common/cape_detect.c | 2 +- board/ti/common/cape_detect.h | 2 +- board/ti/common/ti_card_detect.c | 155 +++++++++++++++++ board/ti/common/ti_card_detect.h | 43 +++++ configs/am65x_evm_a53_defconfig | 2 + configs/am65x_hs_evm_a53_defconfig | 2 + 10 files changed, 299 insertions(+), 198 deletions(-) create mode 100644 board/ti/common/ti_card_detect.c create mode 100644 board/ti/common/ti_card_detect.h -- 2.34.1

5 10

[PATCH v3 1/3] arm: mvebu: Espressobin: move FDT fixup into a separate function
by Robert Marko 10 Jan '24

10 Jan '24

Currently, Esspresobin FDT is being fixed up directly in ft_board_setup() which makes it hard to add support for any other board to be fixed up. So, lets just move the FDT fixup code to a separate function and call it if compatible matches, there should be no functional change. Signed-off-by: Robert Marko <robert.marko(a)sartura.hr> Reviewed-by: Stefan Roese <sr(a)denx.de> --- board/Marvell/mvebu_armada-37xx/board.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c index 04124d8014..1471caa9a6 100644 --- a/board/Marvell/mvebu_armada-37xx/board.c +++ b/board/Marvell/mvebu_armada-37xx/board.c @@ -363,18 +363,14 @@ EVENT_SPY_SIMPLE(EVT_LAST_STAGE_INIT, last_stage_init); #endif #ifdef CONFIG_OF_BOARD_SETUP -int ft_board_setup(void *blob, struct bd_info *bd) +static int espressobin_fdt_setup(void *blob) { -#ifdef CONFIG_ENV_IS_IN_SPI_FLASH int ret; int spi_off; int parts_off; int part_off; /* Fill SPI MTD partitions for Linux kernel on Espressobin */ - if (!of_machine_is_compatible("globalscale,espressobin")) - return 0; - spi_off = fdt_node_offset_by_compatible(blob, -1, "jedec,spi-nor"); if (spi_off < 0) return 0; @@ -459,6 +455,14 @@ int ft_board_setup(void *blob, struct bd_info *bd) return 0; } + return 0; +} + +int ft_board_setup(void *blob, struct bd_info *bd) +{ +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH + if (of_machine_is_compatible("globalscale,espressobin")) + return espressobin_fdt_setup(blob); #endif return 0; } -- 2.43.0

2 8

[PATCH] arm: mvebu: AC5: Use finer grained memory map
by Chris Packham 10 Jan '24

10 Jan '24

The ATF implementation for AC5/AC5X ends up with bl31 living in some internal SRAM. This is in the middle of the large MMIO region that we were using. Adjust this to be finer grained blocks based on the address map from the AC5X Family Control and Management Subsystem Functional Datasheet. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- arch/arm/mach-mvebu/alleycat5/cpu.c | 66 ++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-mvebu/alleycat5/cpu.c b/arch/arm/mach-mvebu/alleycat5/cpu.c index 8204d9627515..0f72ae1709be 100644 --- a/arch/arm/mach-mvebu/alleycat5/cpu.c +++ b/arch/arm/mach-mvebu/alleycat5/cpu.c @@ -16,7 +16,10 @@ DECLARE_GLOBAL_DATA_PTR; -#define RAM_SIZE SZ_1G +#define AC5_PTE_BLOCK_DEVICE \ + (PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | \ + PTE_BLOCK_NON_SHARE | \ + PTE_BLOCK_PXN | PTE_BLOCK_UXN) static struct mm_region ac5_mem_map[] = { { @@ -31,30 +34,63 @@ static struct mm_region ac5_mem_map[] = { .phys = 0x00000000, .virt = 0xa0000000, .size = 0x100000, - - .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | - PTE_BLOCK_PXN | PTE_BLOCK_UXN + .attrs = AC5_PTE_BLOCK_DEVICE, }, { /* MMIO regions */ .phys = 0x100000, .virt = 0x100000, .size = 0x3ff00000, - - .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | - PTE_BLOCK_PXN | PTE_BLOCK_UXN + .attrs = AC5_PTE_BLOCK_DEVICE, }, { - /* MMIO regions */ .phys = 0x7F000000, .virt = 0x7F000000, - .size = 0x21000000, - - .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | - PTE_BLOCK_PXN | PTE_BLOCK_UXN + .size = SZ_8M, + .attrs = AC5_PTE_BLOCK_DEVICE, + }, + { + .phys = 0x7F800000, + .virt = 0x7F800000, + .size = SZ_4M, + .attrs = AC5_PTE_BLOCK_DEVICE, + }, + { + .phys = 0x7FC00000, + .virt = 0x7FC00000, + .size = SZ_512K, + .attrs = AC5_PTE_BLOCK_DEVICE, + }, + { + .phys = 0x7FC80000, + .virt = 0x7FC80000, + .size = SZ_512K, + .attrs = AC5_PTE_BLOCK_DEVICE, + }, + { + .phys = 0x7FD00000, + .virt = 0x7FD00000, + .size = SZ_512K, + .attrs = AC5_PTE_BLOCK_DEVICE, + }, + /* ATF region 0x7FE00000-0x7FE20000 not mapped */ + { + .phys = 0x7FE80000, + .virt = 0x7FE80000, + .size = SZ_512K, + .attrs = AC5_PTE_BLOCK_DEVICE, + }, + { + .phys = 0x7FFF0000, + .virt = 0x7FFF0000, + .size = SZ_1M, + .attrs = AC5_PTE_BLOCK_DEVICE, + }, + { + .phys = 0x80000000, + .virt = 0x80000000, + .size = SZ_2G, + .attrs = AC5_PTE_BLOCK_DEVICE, }, { 0, -- 2.42.0

3 3