March 2023 - U-Boot

[PATCH 0/3] vpl: Correct some tests
by Simon Glass 21 Mar '23

21 Mar '23

It was reported that one of the VPL tests does not work. The problem turned out to be a leftover symlink that I had which made things work locally. This was not noticed in CI since the tests did not run there either. This little series fixes these problems. Simon Glass (3): vbe: Use the correct image filename in the test CI: Ensure that vpl test is run test: Run the VPL tests with 'make check' .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- test/py/tests/test_vbe_vpl.py | 6 ++++-- test/run | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) -- 2.39.2.722.g9855ee24e9-goog

2 4

[PATCH] efi_loader: define allow_unaligned as 'asm volatile'
by Ilias Apalodimas 21 Mar '23

21 Mar '23

Tom reports that compiling with LTO & EFI breaks armv7 and arm11* builds. The reason is that LTO (maybe a binutils bug?) replaces the asm version of allow_unaligned() with the __weak definition of the function. As a result EFI code ends up running with unaligned accesses disabled and eventually crashes. allow_unaligned() hardware specific variants are usually defined in .S files. Switching those to inline assembly fixes the problem and the linker keeps the correct version in the final binary Reported-by: Tom Rini <trini(a)konsulko.com> Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- This is an alternative approach to https://lore.kernel.org/u-boot/ZBRy1oSZ5iVFqrdV@hera/ since enabling unaligned accesses by default has been rejected in the past arch/arm/cpu/arm11/Makefile | 4 ---- arch/arm/cpu/arm11/cpu.c | 13 +++++++++++++ arch/arm/cpu/arm11/sctlr.S | 25 ------------------------- arch/arm/cpu/armv7/Makefile | 1 - arch/arm/cpu/armv7/cpu.c | 11 +++++++++++ arch/arm/cpu/armv7/sctlr.S | 22 ---------------------- 6 files changed, 24 insertions(+), 52 deletions(-) delete mode 100644 arch/arm/cpu/arm11/sctlr.S delete mode 100644 arch/arm/cpu/armv7/sctlr.S diff --git a/arch/arm/cpu/arm11/Makefile b/arch/arm/cpu/arm11/Makefile index 5dfa01ae8d05..5d721fce12b5 100644 --- a/arch/arm/cpu/arm11/Makefile +++ b/arch/arm/cpu/arm11/Makefile @@ -4,7 +4,3 @@ # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. obj-y = cpu.o - -ifneq ($(CONFIG_SPL_BUILD),y) -obj-$(CONFIG_EFI_LOADER) += sctlr.o -endif diff --git a/arch/arm/cpu/arm11/cpu.c b/arch/arm/cpu/arm11/cpu.c index ffe35111d589..b19c4fc4a6c2 100644 --- a/arch/arm/cpu/arm11/cpu.c +++ b/arch/arm/cpu/arm11/cpu.c @@ -111,3 +111,16 @@ void enable_caches(void) #endif } #endif + +#if !IS_ENABLED(CONFIG_SPL_BUILD) +void allow_unaligned(void) +{ + asm volatile( + "mrc p15, 0, r0, c1, c0, 0\n" //load system control register + "orr r0, r0, #1 << 22\n" //set unaligned data support flag + "bic r0, r0, #2\n" //clear aligned flag + "mcr p15, 0, r0, c1, c0, 0\n" // write system control register + "bx lr\n" //return + ); +} +#endif diff --git a/arch/arm/cpu/arm11/sctlr.S b/arch/arm/cpu/arm11/sctlr.S deleted file mode 100644 index 74a7fc4a25b6..000000000000 --- a/arch/arm/cpu/arm11/sctlr.S +++ /dev/null @@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Routines to access the system control register - * - * Copyright (c) 2019 Heinrich Schuchardt - */ - -#include <linux/linkage.h> - -/* - * void allow_unaligned(void) - allow unaligned access - * - * This routine sets the enable unaligned data support flag and clears the - * aligned flag in the system control register. - * After calling this routine unaligned access does no longer leads to a - * data abort or undefined behavior but is handled by the CPU. - * For details see the "ARM Architecture Reference Manual" for ARMv6. - */ -ENTRY(allow_unaligned) - mrc p15, 0, r0, c1, c0, 0 @ load system control register - orr r0, r0, #1 << 22 @ set unaligned data support flag - bic r0, r0, #2 @ clear aligned flag - mcr p15, 0, r0, c1, c0, 0 @ write system control register - bx lr @ return -ENDPROC(allow_unaligned) diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 653eef8ad79e..ca50f6e93e10 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -13,7 +13,6 @@ obj-y += syslib.o obj-$(CONFIG_SYS_ARM_MPU) += mpu_v7r.o ifneq ($(CONFIG_SPL_BUILD),y) -obj-$(CONFIG_EFI_LOADER) += sctlr.o obj-$(CONFIG_ARMV7_NONSEC) += exception_level.o endif diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c index 68807d209978..9742fa65e3cf 100644 --- a/arch/arm/cpu/armv7/cpu.c +++ b/arch/arm/cpu/armv7/cpu.c @@ -83,3 +83,14 @@ int cleanup_before_linux(void) { return cleanup_before_linux_select(CBL_ALL); } + +#if !IS_ENABLED(CONFIG_SPL_BUILD) +void allow_unaligned(void) +{ + asm volatile( + "mrc p15, 0, r0, c1, c0, 0\n" //load system control register + "bic r0, r0, #2\n" //clear aligned flag + "mcr p15, 0, r0, c1, c0, 0\n" //write system control register + ); +} +#endif diff --git a/arch/arm/cpu/armv7/sctlr.S b/arch/arm/cpu/armv7/sctlr.S deleted file mode 100644 index bd56e41afe18..000000000000 --- a/arch/arm/cpu/armv7/sctlr.S +++ /dev/null @@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Routines to access the system control register - * - * Copyright (c) 2018 Heinrich Schuchardt - */ - -#include <linux/linkage.h> - -/* - * void allow_unaligned(void) - allow unaligned access - * - * This routine clears the aligned flag in the system control register. - * After calling this routine unaligned access does no longer lead to a - * data abort but is handled by the CPU. - */ -ENTRY(allow_unaligned) - mrc p15, 0, r0, c1, c0, 0 @ load system control register - bic r0, r0, #2 @ clear aligned flag - mcr p15, 0, r0, c1, c0, 0 @ write system control register - bx lr @ return -ENDPROC(allow_unaligned) -- 2.39.2

2 1

[PATCH] serial: zynqmp: Fetch baudrate from dtb and update
by Venkatesh Yadav Abbarapu 21 Mar '23

21 Mar '23

From: Algapally Santosh Sagar <santoshsagar.algapally(a)amd.com> The baudrate configured in .config is taken by default by serial. If change of baudrate is required then the .config needs to changed and u-boot recompilation is required or the u-boot environment needs to be updated. To avoid this, support is added to fetch the baudrate directly from the device tree file and update. The serial, prints the log with the configured baudrate in the dtb. The commit c4df0f6f315c ("arm: mvebu: Espressobin: Set default value for $fdtfile env variable") is taken as reference for changing the default environment variable. The default environment stores the default baudrate value, When default baudrate and dtb baudrate are not same glitches are seen on the serial. So, the environment also needs to be updated with the dtb baudrate to avoid the glitches on the serial. Signed-off-by: Algapally Santosh Sagar <santoshsagar.algapally(a)amd.com> Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> --- drivers/serial/Kconfig | 8 +++++++ drivers/serial/serial-uclass.c | 32 ++++++++++++++++++++++++++ include/configs/xilinx_zynqmp.h | 10 ++++++++- include/fdtdec.h | 8 +++++++ include/serial.h | 1 + lib/fdtdec.c | 40 +++++++++++++++++++++++++++++++++ 6 files changed, 98 insertions(+), 1 deletion(-) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index bb5083201b..0a1bcd63d5 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -24,6 +24,14 @@ config BAUDRATE in the SPL stage (most drivers) or for choosing a default baudrate in the absence of an environment setting (serial_mxc.c). +config SERIAL_DT_BAUD + bool "Fetch serial baudrate from device tree" + depends on DM_SERIAL + help + Select this to enable fetching and setting of the baudrate + configured in the DT. Replace the default baudrate with the DT + baudrate and also set it to the environment. + config REQUIRE_SERIAL_CONSOLE bool "Require a serial port for console" # Running without a serial console is not supported by the diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index 77d3f37372..e41cccfdc2 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -158,12 +158,44 @@ static void serial_find_console_or_panic(void) } #endif /* CONFIG_SERIAL_PRESENT */ +#if CONFIG_IS_ENABLED(SERIAL_DT_BAUD) +int serial_get_valid_baudrate(int baud) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(baudrate_table); ++i) { + if (baud == baudrate_table[i]) + return 0; + } + + return -EINVAL; +} +#endif + /* Called prior to relocation */ int serial_init(void) { #if CONFIG_IS_ENABLED(SERIAL_PRESENT) serial_find_console_or_panic(); gd->flags |= GD_FLG_SERIAL_READY; +#if CONFIG_IS_ENABLED(SERIAL_DT_BAUD) + int ret = 0; + char *ptr = &default_environment[0]; + + /* + * Fetch the baudrate from the dtb and update the value in the + * default environment. + */ + ret = fdtdec_get_baud_from_dtb(gd->fdt_blob); + if (ret != -EINVAL && ret != -EFAULT) { + gd->baudrate = ret; + + while (*ptr != '\0' && *(ptr + 1) != '\0') + ptr++; + ptr += 2; + sprintf(ptr, "baudrate=%d", gd->baudrate); + } +#endif serial_setbrg(); #endif diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 011f0034c5..79d0a2a214 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -15,6 +15,13 @@ #define GICC_BASE 0xF9020000 /* Serial setup */ +#if CONFIG_IS_ENABLED(SERIAL_DT_BAUD) +#define DEFAULT_ENV_IS_RW +#define ENV_RW_FILLER "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" +#else +#define ENV_RW_FILLER +#endif + #define CFG_SYS_BAUDRATE_TABLE \ { 4800, 9600, 19200, 38400, 57600, 115200 } @@ -176,7 +183,8 @@ #ifndef CFG_EXTRA_ENV_SETTINGS #define CFG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ - BOOTENV + BOOTENV \ + ENV_RW_FILLER #endif /* SPL can't handle all huge variables - define just DFU */ diff --git a/include/fdtdec.h b/include/fdtdec.h index aa61a0fca1..48937a7a46 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -657,6 +657,14 @@ int fdtdec_get_alias_seq(const void *blob, const char *base, int node, */ int fdtdec_get_alias_highest_id(const void *blob, const char *base); +/** + * Get baudrate from the dtb + * + * @param blob Device tree blob (if NULL, then error is returned) + * @return Baud rate value, or -ve error . + */ +int fdtdec_get_baud_from_dtb(const void *blob); + /** * Get a property from the /chosen node * diff --git a/include/serial.h b/include/serial.h index 42bdf3759c..48834b517c 100644 --- a/include/serial.h +++ b/include/serial.h @@ -337,6 +337,7 @@ int serial_setconfig(struct udevice *dev, uint config); */ int serial_getinfo(struct udevice *dev, struct serial_device_info *info); +int serial_get_valid_baudrate(int baud); void atmel_serial_initialize(void); void mcf_serial_initialize(void); void mpc85xx_serial_initialize(void); diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 0827e16859..fa24659b32 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -570,6 +570,46 @@ int fdtdec_get_alias_highest_id(const void *blob, const char *base) return max; } +#if CONFIG_IS_ENABLED(SERIAL_DT_BAUD) +int fdtdec_get_baud_from_dtb(const void *blob) +{ + const char *str, *p, *baud_start; + u32 baud; + + if (!blob) + return -EFAULT; + + str = fdtdec_get_chosen_prop(blob, "stdout-path"); + if (!str) + return -EINVAL; + + p = strchr(str, ':'); + if (!p) + return -EINVAL; + + baud = 0; + baud_start = p + 1; + while (*baud_start != '\0') { + /* + * Uart binding is <baud>{<parity>{<bits>{...}}} + * So the baudrate either is the whole string, or + * ends in the parity characters. + */ + if (*baud_start == 'n' || *baud_start == 'o' || + *baud_start == 'e') + break; + + baud = baud * 10 + (*baud_start - '0'); + baud_start++; + } + + if (serial_get_valid_baudrate(baud) == -EINVAL) + return -EINVAL; + + return baud; +} +#endif + const char *fdtdec_get_chosen_prop(const void *blob, const char *name) { int chosen_node; -- 2.17.1

3 2

[PULL] u-boot-sh/master
by Marek Vasut 21 Mar '23

21 Mar '23

A single reset controller driver (part of the clock driver) fix for v2023.04 release. The following changes since commit 318af47668aa2347ca9bbf2114cb9af1d8739aca: Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-coldfire (2023-03-15 12:03:17 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-sh.git master for you to fetch changes up to afafaa2a8f3f0ef38fc55c5d830890adb508549f: clk: renesas: Pack reset identifier before look up (2023-03-20 02:46:44 +0100) ---------------------------------------------------------------- Marek Vasut (1): clk: renesas: Pack reset identifier before look up drivers/clk/renesas/clk-rcar-gen3.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)

2 1

Pull request: u-boot-rockchip-20230319
by Kever Yang 21 Mar '23

21 Mar '23

Hi Tom, Please pull the fixes for rockchip platform: - Fix for rockchip timer driver; - Fix for rk3568 and rk3588 boot device and clock driver; - Fix for rk3568 reset handler; - Fix for rk3568 sdhci DLL at 52MHz; CI: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/15648 Thanks, - Kever The following changes since commit 318af47668aa2347ca9bbf2114cb9af1d8739aca: Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-coldfire (2023-03-15 12:03:17 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20230319 for you to fetch changes up to d35a1392c5d17e067d16b7b096565b16af495f34: arm: dts: rockchip: rk3188-radxarock-u-boot: remove timer compatible replacement (2023-03-19 14:12:01 +0800) ---------------------------------------------------------------- Johan Jonker (2): rockchip: timer: rockchip_timer: fix compatible and driver name arm: dts: rockchip: rk3188-radxarock-u-boot: remove timer compatible replacement Jonas Karlman (9): rockchip: Fix early use of bootph props rockchip: rk3568: Fix boot device detection rockchip: rk3568-rock-3a: Sync device tree from linux clk: rockchip: rk3588: Fix clk_aux16m in clock driver rockchip: rk3588: Add boot device detection rockchip: tinker-rk3288: Use common BOOT_TARGET_DEVICES mmc: rockchip_dw_mmc: Fix get_mmc_clk return value rockchip: include: configs: Remove dangling comments rockchip: include: configs: Remove unused SDRAM_BANK_SIZE Peter Geis (1): clk: rockchip: rk3568: Fix reset handler Vasily Khoruzhick (3): clk: rockchip: rk3568: add stubs for CLK_PCIEPHY_REF clocks Revert "arm64: dts: rk356x-u-boot: Drop combphy1 assigned-clocks/rates" rockchip: sdhci: rk3568: bypass DLL when clk <= 52 MHz arch/arm/dts/rk3188-radxarock-u-boot.dtsi | 1 - arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi | 2 +- arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi | 2 +- arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 12 +- arch/arm/dts/rk3568-rock-3a.dts | 261 ++++++++++++++++++++++- arch/arm/dts/rk356x-u-boot.dtsi | 7 +- arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi | 2 +- arch/arm/dts/rk3588s-u-boot.dtsi | 14 +- arch/arm/mach-rockchip/rk3568/rk3568.c | 2 +- arch/arm/mach-rockchip/rk3588/rk3588.c | 7 + drivers/clk/rockchip/clk_rk3568.c | 5 + drivers/clk/rockchip/clk_rk3588.c | 4 +- drivers/mmc/rockchip_dw_mmc.c | 2 +- drivers/mmc/rockchip_sdhci.c | 15 +- drivers/timer/rockchip_timer.c | 8 +- include/configs/evb_rk3328.h | 2 - include/configs/evb_rk3399.h | 2 - include/configs/pinebook-pro-rk3399.h | 2 - include/configs/pinephone-pro-rk3399.h | 2 - include/configs/puma_rk3399.h | 2 - include/configs/px30_common.h | 1 - include/configs/rk3128_common.h | 4 - include/configs/rk3188_common.h | 6 - include/configs/rk322x_common.h | 1 - include/configs/rk3288_common.h | 3 - include/configs/rk3308_common.h | 1 - include/configs/rk3328_common.h | 1 - include/configs/rk3399_common.h | 1 - include/configs/roc-pc-rk3399.h | 2 - include/configs/rock960_rk3399.h | 1 - include/configs/rockchip-common.h | 2 - include/configs/rockpro64_rk3399.h | 1 - include/configs/rv1108_common.h | 2 - include/configs/tinker_rk3288.h | 9 - include/configs/vyasa-rk3288.h | 6 - 35 files changed, 304 insertions(+), 91 deletions(-)

2 1

[PULL] u-boot-sh/next
by Marek Vasut 21 Mar '23

21 Mar '23

The following changes since commit cefd0449d6df77eb0edb8a6800a441f9cd4e3653: Merge tag 'xilinx-for-v2023.07-rc1' of https://source.denx.de/u-boot/custodians/u-boot-microblaze into next (2023-03-16 12:18:30 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-sh.git next for you to fetch changes up to 6254c5f7e176311eb8bd57817f85d1eed1c362cb: serial: sh: Make indent consistent (2023-03-18 12:04:02 +0100) ---------------------------------------------------------------- Hai Pham (4): ARM: renesas: Remove defines for USB on Eagle/Condor ARM: renesas: Demote overlap memory nodes message to debug on Gen3 ARM: renesas: falcon: Initialize ARM generic timer and GICv3 if EL3 ARM: renesas: falcon: Enable RWDT reset for V3U Falcon Marek Vasut (13): ARM: renesas: Enable DTO support by default on R-Car Gen3 ARM: rmobile: Convert ifdef in rmobile_get_prr() to IS_ENABLED() ARM: rmobile: Sort R-Car Gen3 Kconfig lists ARM: rmobile: Factor out SYS_SOC Kconfig option ARM: rmobile: Introduce CONFIG_RCAR_64 symbol ARM: rmobile: Split R-Car Gen3 into separate Kconfig from common 64bit options clk: renesas: rcar-gen3: Replace SSCG caching with MDSEL/PE caching i2c: rcar_iic: Sort Kconfig depends list ascending i2c: rcar_i2c: Sort Kconfig depends list ascending pinctrl: renesas: Replace ifdeffery with IS_ENABLED() serial: sh: Rename CONFIG_SCI and CONFIG_SCIF_USE_EXT_CLK to CFG_ variants serial: sh: Add DEBUG_UART support serial: sh: Make indent consistent Mikhail Lappo (1): net: ravb: Support fixed PHY in R-Car arch/arm/mach-rmobile/Kconfig | 36 +++--- arch/arm/mach-rmobile/Kconfig.32 | 3 - arch/arm/mach-rmobile/Kconfig.64 | 208 +--------------------------------- arch/arm/mach-rmobile/Kconfig.rcar3 | 201 ++++++++++++++++++++++++++++++++ arch/arm/mach-rmobile/Kconfig.rza1 | 3 - arch/arm/mach-rmobile/cpu_info-rcar.c | 7 +- board/renesas/falcon/falcon.c | 21 +++- board/renesas/rcar-common/common.c | 6 +- configs/r8a77970_eagle_defconfig | 6 - configs/r8a77980_condor_defconfig | 6 - drivers/clk/renesas/clk-rcar-gen3.c | 18 +-- drivers/clk/renesas/rcar-gen3-cpg.h | 2 +- drivers/gpio/sh_pfc.c | 6 +- drivers/i2c/Kconfig | 4 +- drivers/net/ravb.c | 6 +- drivers/serial/Kconfig | 8 ++ drivers/serial/serial_sh.c | 87 +++++++++----- drivers/serial/serial_sh.h | 8 +- 18 files changed, 340 insertions(+), 296 deletions(-) create mode 100644 arch/arm/mach-rmobile/Kconfig.rcar3

2 1

[PATCH 1/2] lmb: Fix LMB_MEMORY_REGIONS flag usage
by Patrick Delaunay 21 Mar '23

21 Mar '23

Remove test on CONFIG_LMB_MEMORY_REGIONS introduced by commit 7c1860fce4e3 ("lmb: Fix lmb property's defination under struct lmb"). This code in lmb_init() is strange, because if CONFIG_LMB_USE_MAX_REGIONS and CONFIG_LMB_MEMORY_REGIONS are not defined, the implicit #else is empty and the required initialization are not done: lmb->memory.max = ? lmb->reserved.max = ? But this setting is not possible: - CONFIG_LMB_USE_MAX_REGIONS not defined - CONFIG_LMB_MEMORY_REGIONS not defined because CONFIG_LMB_MEMORY_REGIONS and CONFIG_LMB_RESERVED_REGIONS are defined as soon as the CONFIG_LMB_USE_MAX_REGIONS is not defined. This patch removes this impossible case #elif and I add some explanation in lmb.h to explain why in the struct lmb {} the lmb property's should is defined if CONFIG_LMB_MEMORY_REGIONS is NOT defined. Fixes: 5e2548c1d6e03 ("lmb: Fix LMB_MEMORY_REGIONS flag usage") Reported-by: Mark Millard <marklmi(a)yahoo.com> Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- include/lmb.h | 20 +++++++++++++++++++- lib/lmb.c | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/include/lmb.h b/include/lmb.h index 7298c2ccc403..f70463ac5440 100644 --- a/include/lmb.h +++ b/include/lmb.h @@ -35,6 +35,24 @@ struct lmb_property { enum lmb_flags flags; }; +/* + * For regions size management, see LMB configuration in KConfig + * all the #if test are done with CONFIG_LMB_USE_MAX_REGIONS (boolean) + * + * case 1. CONFIG_LMB_USE_MAX_REGIONS is defined (legacy mode) + * => CONFIG_LMB_MAX_REGIONS is used to configure the region size, + * direclty in the array lmb_region.region[], with the same + * configuration for memory reion and reseserved region. + * + * case 2. CONFIG_LMB_USE_MAX_REGIONS is not defined, the size of each + * region is configurated *independently* with + * => CONFIG_LMB_MEMORY_REGIONS: struct lmb.memory_regions + * => CONFIG_LMB_RESERVED_REGIONS: struct lmb.reserved_regions + * lmb_region.region is only a pointer to the correct buffer, + * initialized in lmb_init(). This configuration is useful to manage + * more reserved memory regions with CONFIG_LMB_RESERVED_REGIONS. + */ + /** * struct lmb_region - Description of a set of region. * @@ -68,7 +86,7 @@ struct lmb_region { struct lmb { struct lmb_region memory; struct lmb_region reserved; -#ifdef CONFIG_LMB_MEMORY_REGIONS +#if !IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS) struct lmb_property memory_regions[CONFIG_LMB_MEMORY_REGIONS]; struct lmb_property reserved_regions[CONFIG_LMB_RESERVED_REGIONS]; #endif diff --git a/lib/lmb.c b/lib/lmb.c index 2444b2a62121..8fbe453dfa9d 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -110,7 +110,7 @@ void lmb_init(struct lmb *lmb) #if IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS) lmb->memory.max = CONFIG_LMB_MAX_REGIONS; lmb->reserved.max = CONFIG_LMB_MAX_REGIONS; -#elif defined(CONFIG_LMB_MEMORY_REGIONS) +#else lmb->memory.max = CONFIG_LMB_MEMORY_REGIONS; lmb->reserved.max = CONFIG_LMB_RESERVED_REGIONS; lmb->memory.region = lmb->memory_regions; -- 2.25.1

2 2

[PATCH 1/2] ARM: dts: rk3588-rock-5b-u-boot: add u-boot, dm-spl to pinctrl for sdmmc
by Eugen Hristev 21 Mar '23

21 Mar '23

To be able to initialize the pinctrl correctly at SPL level and read u-boot proper from SD-Card, the pinctrl must be initialized. Signed-off-by: Eugen Hristev <eugen.hristev(a)collabora.com> --- arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi index e1d240baf35d..65aa2095cbf6 100644 --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi @@ -124,6 +124,8 @@ }; &pinctrl { + u-boot,dm-spl; + usb { vcc5v0_host_en: vcc5v0-host-en { rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; @@ -131,6 +133,22 @@ }; }; +&sdmmc_bus4 { + u-boot,dm-spl; +}; + +&sdmmc_clk { + u-boot,dm-spl; +}; + +&sdmmc_cmd { + u-boot,dm-spl; +}; + +&sdmmc_det { + u-boot,dm-spl; +}; + &usb_host0_ehci { companion = <&usb_host0_ohci>; phys = <&u2phy2_host>; -- 2.34.1

2 3

[PATCH v2 1/7] arm: dts: rockchip: rk3288: move io-domains nodes
by Johan Jonker 21 Mar '23

21 Mar '23

In order to better compare the Linux rk3288.dtsi version with the U-Boot version move the io-domains nodes. Signed-off-by: Johan Jonker <jbx6244(a)gmail.com> Reviewed-by: John Keeping <john(a)metanate.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> Tested-by: Simon Glass <sjg(a)chromium.org> # chromebook-jerry --- arch/arm/dts/rk3288-miqi.dtsi | 27 +++++++++++-------------- arch/arm/dts/rk3288-phycore-som.dtsi | 30 +++++++++++++--------------- arch/arm/dts/rk3288-popmetal.dtsi | 30 +++++++++++++--------------- arch/arm/dts/rk3288-veyron.dtsi | 28 ++++++++++++-------------- arch/arm/dts/rk3288.dtsi | 5 +++++ 5 files changed, 58 insertions(+), 62 deletions(-) diff --git a/arch/arm/dts/rk3288-miqi.dtsi b/arch/arm/dts/rk3288-miqi.dtsi index cb80cbf2..00c8613d 100644 --- a/arch/arm/dts/rk3288-miqi.dtsi +++ b/arch/arm/dts/rk3288-miqi.dtsi @@ -18,21 +18,6 @@ clock-output-names = "ext_gmac"; }; - io_domains: io-domains { - compatible = "rockchip,rk3288-io-voltage-domain"; - rockchip,grf = <&grf>; - - audio-supply = <&vcca_33>; - flash0-supply = <&vcc_flash>; - flash1-supply = <&vcc_lan>; - gpio30-supply = <&vcc_io>; - gpio1830-supply = <&vcc_io>; - lcdc-supply = <&vcc_io>; - sdcard-supply = <&vccio_sd>; - wifi-supply = <&vcc_18>; - }; - - leds { compatible = "gpio-leds"; @@ -277,6 +262,18 @@ status = "okay"; }; +&io_domains { + audio-supply = <&vcca_33>; + flash0-supply = <&vcc_flash>; + flash1-supply = <&vcc_lan>; + gpio30-supply = <&vcc_io>; + gpio1830-supply = <&vcc_io>; + lcdc-supply = <&vcc_io>; + sdcard-supply = <&vccio_sd>; + wifi-supply = <&vcc_18>; + status = "okay"; +}; + &pinctrl { pcfg_output_high: pcfg-output-high { output-high; diff --git a/arch/arm/dts/rk3288-phycore-som.dtsi b/arch/arm/dts/rk3288-phycore-som.dtsi index 821525f7..70c00308 100644 --- a/arch/arm/dts/rk3288-phycore-som.dtsi +++ b/arch/arm/dts/rk3288-phycore-som.dtsi @@ -71,22 +71,6 @@ clock-output-names = "ext_gmac"; }; - io_domains: io_domains { - compatible = "rockchip,rk3288-io-voltage-domain"; - - status = "okay"; - sdcard-supply = <&vdd_io_sd>; - flash0-supply = <&vdd_emmc_io>; - flash1-supply = <&vdd_misc_1v8>; - gpio1830-supply = <&vdd_3v3_io>; - gpio30-supply = <&vdd_3v3_io>; - bb-supply = <&vdd_3v3_io>; - dvp-supply = <&vdd_3v3_io>; - lcdc-supply = <&vdd_3v3_io>; - wifi-supply = <&vdd_3v3_io>; - audio-supply = <&vdd_3v3_io>; - }; - leds: user-leds { compatible = "gpio-leds"; pinctrl-names = "default"; @@ -197,6 +181,20 @@ ddc-i2c-bus = <&i2c5>; }; +&io_domains { + audio-supply = <&vdd_3v3_io>; + bb-supply = <&vdd_3v3_io>; + dvp-supply = <&vdd_3v3_io>; + flash0-supply = <&vdd_emmc_io>; + flash1-supply = <&vdd_misc_1v8>; + gpio1830-supply = <&vdd_3v3_io>; + gpio30-supply = <&vdd_3v3_io>; + lcdc-supply = <&vdd_3v3_io>; + sdcard-supply = <&vdd_io_sd>; + wifi-supply = <&vdd_3v3_io>; + status = "okay"; +}; + &i2c0 { status = "okay"; clock-frequency = <400000>; diff --git a/arch/arm/dts/rk3288-popmetal.dtsi b/arch/arm/dts/rk3288-popmetal.dtsi index 0253933a..d732a706 100644 --- a/arch/arm/dts/rk3288-popmetal.dtsi +++ b/arch/arm/dts/rk3288-popmetal.dtsi @@ -71,22 +71,6 @@ }; }; - io_domains: io-domains { - compatible = "rockchip,rk3288-io-voltage-domain"; - rockchip,grf = <&grf>; - - audio-supply = <&vcca_33>; - bb-supply = <&vcc_io>; - dvp-supply = <&vcc18_dvp>; - flash0-supply = <&vcc_flash>; - flash1-supply = <&vcc_lan>; - gpio30-supply = <&vcc_io>; - gpio1830-supply = <&vcc_io>; - lcdc-supply = <&vcc_io>; - sdcard-supply = <&vccio_sd>; - wifi-supply = <&vccio_wl>; - }; - ir: ir-receiver { compatible = "gpio-ir-receiver"; gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; @@ -443,6 +427,20 @@ status = "okay"; }; +&io_domains { + audio-supply = <&vcca_33>; + bb-supply = <&vcc_io>; + dvp-supply = <&vcc18_dvp>; + flash0-supply = <&vcc_flash>; + flash1-supply = <&vcc_lan>; + gpio30-supply = <&vcc_io>; + gpio1830-supply = <&vcc_io>; + lcdc-supply = <&vcc_io>; + sdcard-supply = <&vccio_sd>; + wifi-supply = <&vccio_wl>; + status = "okay"; +}; + &pinctrl { ak8963 { comp_int: comp-int { diff --git a/arch/arm/dts/rk3288-veyron.dtsi b/arch/arm/dts/rk3288-veyron.dtsi index 35db8827..434b0d49 100644 --- a/arch/arm/dts/rk3288-veyron.dtsi +++ b/arch/arm/dts/rk3288-veyron.dtsi @@ -198,21 +198,6 @@ /* Faux input supply. See bt_regulator description. */ vin-supply = <&bt_regulator>; }; - - io-domains { - compatible = "rockchip,rk3288-io-voltage-domain"; - rockchip,grf = <&grf>; - - audio-supply = <&vcc18_codec>; - bb-supply = <&vcc33_io>; - dvp-supply = <&vcc_18>; - flash0-supply = <&vcc18_flashio>; - gpio1830-supply = <&vcc33_io>; - gpio30-supply = <&vcc33_io>; - lcdc-supply = <&vcc33_lcd>; - sdcard-supply = <&vccio_sd>; - wifi-supply = <&vcc18_wl>; - }; }; &cpu0 { @@ -503,6 +488,19 @@ clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>, <&cru SCLK_I2S0_OUT>; }; +&io_domains { + audio-supply = <&vcc18_codec>; + bb-supply = <&vcc33_io>; + dvp-supply = <&vcc_18>; + flash0-supply = <&vcc18_flashio>; + gpio1830-supply = <&vcc33_io>; + gpio30-supply = <&vcc33_io>; + lcdc-supply = <&vcc33_lcd>; + sdcard-supply = <&vccio_sd>; + wifi-supply = <&vcc18_wl>; + status = "okay"; +}; + &wdt { status = "okay"; }; diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi index 8c394c1e..9cfb86f9 100644 --- a/arch/arm/dts/rk3288.dtsi +++ b/arch/arm/dts/rk3288.dtsi @@ -762,6 +762,11 @@ grf: syscon@ff770000 { compatible = "rockchip,rk3288-grf", "syscon"; reg = <0xff770000 0x1000>; + + io_domains: io-domains { + compatible = "rockchip,rk3288-io-voltage-domain"; + status = "disabled"; + }; }; wdt: watchdog@ff800000 { -- 2.20.1

2 13

[PATCH 0/3] rockchip: rk3588: Fix sdmmc clocks
by Jonas Karlman 21 Mar '23

21 Mar '23

Booting from sdmmc on RK3588 currently works because of a workaround in the device tree, clocks are reordered so that the driver use ciu-sample instead of ciu, and the BootRom initializes sdmmc clocks before SPL is loaded into DRAM. The sdmmc clocks are normally controlled by TF-A using SCMI. However, there is a need to control these clocks in SPL, before TF-A has started. This series adds a rk3588_scru driver to control the sdmmc clocks in SPL before TF-A has started, using scru regs. It also adds a small glue driver to bind the scmi clock node to the rk3588_scru driver in SPL. The SCMI agent and clk_scmi driver is used to control the clocks in U-Boot proper, after TF-A has started. Patch 1 fixes an issue building SPL with clk_scmi driver enabled. Patch 2 adds drivers the scru and glue drivers. Patch 3 updates device tree and Kconfig options to use the new drivers. I have tried to address some of the early feedback from [1]. This series is based on top of [2] and [3] and can also be found at [4]. [1] https://patchwork.ozlabs.org/project/uboot/cover/20230125222741.303259-1-ja… [2] https://patchwork.ozlabs.org/project/uboot/cover/20230314003755.512696-1-jo… [3] https://patchwork.ozlabs.org/project/uboot/patch/20230228213822.3583989-1-j… [4] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3588-sdmmc-v1 Jonas Karlman (3): clk: scmi: Add Kconfig option for SPL rockchip: rk3588: Add support for sdmmc clocks in SPL rockchip: rk3588: Sync sdmmc node from linux-next .../dts/rk3588-edgeble-neu6a-io-u-boot.dtsi | 2 - arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 2 - arch/arm/dts/rk3588s-u-boot.dtsi | 27 ++-- arch/arm/dts/rk3588s.dtsi | 15 +++ arch/arm/include/asm/arch-rockchip/clock.h | 1 - .../include/asm/arch-rockchip/cru_rk3588.h | 19 ++- arch/arm/mach-rockchip/Kconfig | 2 + drivers/clk/Kconfig | 8 ++ drivers/clk/Makefile | 2 +- drivers/clk/rockchip/clk_rk3588.c | 125 ++++++++++++++++++ drivers/firmware/scmi/scmi_agent-uclass.c | 2 +- 11 files changed, 183 insertions(+), 22 deletions(-) -- 2.40.0

2 6