[PATCH v2 0/4] rockchip: Fixes for RK3568 and RK3588

[PATCH v2 0/4] rockchip: Fixes for RK3568 and RK3588

[Jonas Karlman]

This series contains fixes for RK3568 and RK3588.

Patch 1 imply use of ROCKCHIP_TPL for RK3588 to generate bootable
firmware image.
Patch 2 fixes sdmmc boot on rk3588-rock-5b.
Patch 3 fixes boot of rk3568-rock-3a, an issue introduced in v1.
Patch 4 add fdtoverlay and compressed kernel addresses to env.

The last patch is not a fix but some parts of it was included in v1,
so I kept it in v2.

Please consider these patches for v2023.04.

Changes in v2:
- Drop applied patches
- Add the pre-req patch from [1]
- Add patch to fix an issue introduced in v1
- Collect r-b tags

This series can also be found at [2]

[1] https://patchwork.ozlabs.org/project/uboot/patch/20230228213822.3583989-1-jonas@kwiboo.se/
[2] https://github.com/Kwiboo/u-boot-rockchip/commits/rk35xx-fixes-v2

Jonas Karlman (4):
  rockchip: Use an external TPL binary on RK3588
  rockchip: rk3588-rock-5b: Fix sdmmc boot
  rockchip: rk35xx: Fix boot with a large fdt blob
  rockchip: rk35xx: Enable fdtoverlay and kernel compression

 arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 3 ++-
 arch/arm/mach-rockchip/Kconfig          | 6 +++++-
 configs/neu6a-io-rk3588_defconfig       | 1 -
 configs/rock-3a-rk3568_defconfig        | 1 -
 configs/rock5b-rk3588_defconfig         | 2 --
 doc/board/rockchip/rockchip.rst         | 9 +++++++++
 include/configs/rk3568_common.h         | 7 ++++++-
 include/configs/rk3588_common.h         | 7 ++++++-
 8 files changed, 28 insertions(+), 8 deletions(-)

-- 
2.40.0

[PATCH v2 1/4] rockchip: Use an external TPL binary on RK3588

[Jonas Karlman]

There is no support to initialize DRAM on RK3588 SoCs using U-Boot TPL
and instead an external TPL binary must be used to generate a bootable
u-boot-rockchip.bin image.

Enable ROCKCHIP_EXTERNAL_TPL by default for RK3588, add build steps for
RK3588 to documentation and clean up CONFIG_BINMAN_FDT options.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Jagan Teki <jagan@edgeble.ai>
---
v2:
- Pre-req patch picked from [1]
- Collect r-b tag

[1] https://patchwork.ozlabs.org/project/uboot/patch/20230228213822.3583989-1-jonas@kwiboo.se/

 arch/arm/mach-rockchip/Kconfig    | 2 +-
 configs/neu6a-io-rk3588_defconfig | 1 -
 configs/rock-3a-rk3568_defconfig  | 1 -
 configs/rock5b-rk3588_defconfig   | 1 -
 doc/board/rockchip/rockchip.rst   | 9 +++++++++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 0390431601f9..e5ac58ae60b5 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -428,7 +428,7 @@ config TPL_ROCKCHIP_COMMON_BOARD
 
 config ROCKCHIP_EXTERNAL_TPL
 	bool "Use external TPL binary"
-	default y if ROCKCHIP_RK3568
+	default y if ROCKCHIP_RK3568 || ROCKCHIP_RK3588
 	help
 	  Some Rockchip SoCs require an external TPL to initialize DRAM.
 	  Enable this option and build with ROCKCHIP_TPL=/path/to/ddr.bin to
diff --git a/configs/neu6a-io-rk3588_defconfig b/configs/neu6a-io-rk3588_defconfig
index fb5a2b7dbceb..33c03b58a16c 100644
--- a/configs/neu6a-io-rk3588_defconfig
+++ b/configs/neu6a-io-rk3588_defconfig
@@ -63,5 +63,4 @@ CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYSRESET=y
-# CONFIG_BINMAN_FDT is not set
 CONFIG_ERRNO_STR=y
diff --git a/configs/rock-3a-rk3568_defconfig b/configs/rock-3a-rk3568_defconfig
index 1686c8c1aa5a..e16d98b07af9 100644
--- a/configs/rock-3a-rk3568_defconfig
+++ b/configs/rock-3a-rk3568_defconfig
@@ -70,5 +70,4 @@ CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550_MEM32=y
 CONFIG_SYSRESET=y
-# CONFIG_BINMAN_FDT is not set
 CONFIG_ERRNO_STR=y
diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig
index f3026c7ea166..66199387195a 100644
--- a/configs/rock5b-rk3588_defconfig
+++ b/configs/rock5b-rk3588_defconfig
@@ -68,5 +68,4 @@ CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_SYSRESET=y
-# CONFIG_BINMAN_FDT is not set
 CONFIG_ERRNO_STR=y
diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst
index b5563b8f7f9e..1f88d15aad2a 100644
--- a/doc/board/rockchip/rockchip.rst
+++ b/doc/board/rockchip/rockchip.rst
@@ -185,6 +185,15 @@ To build rk3568 boards:
         make evb-rk3568_defconfig
         make CROSS_COMPILE=aarch64-linux-gnu-
 
+To build rk3588 boards:
+
+.. code-block:: bash
+
+        export BL31=../rkbin/bin/rk35/rk3588_bl31_v1.27.elf
+        export ROCKCHIP_TPL=../rkbin/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.08.bin
+        make rock5b-rk3588_defconfig
+        make CROSS_COMPILE=aarch64-linux-gnu-
+
 Flashing
 --------
 
-- 
2.40.0

[PATCH v2 2/4] rockchip: rk3588-rock-5b: Fix sdmmc boot

[Jonas Karlman]

Running U-Boot from a SD-card on ROCK 5 Model B fails to load atf using
DMA and prints debug_uart messages.

  <debug_uart>

  <debug_uart>

  U-Boot SPL 2023.04-rc3 (Mar 12 2023 - 00:30:16 +0000)
  Trying to boot from MMC1
  ## Checking hash(es) for config config-1 ... OK
  ## Checking hash(es) for Image atf-1 ... sha256 error!
  Bad hash value for 'hash' hash node in 'atf-1' image node
  mmc_load_image_raw_sector: mmc block read error
  SPL: failed to boot from all boot devices
  ### ERROR ### Please RESET the board ###

Use fifo-mode to disable DMA in SPL, add same-as-spl to boot-order and
remove DEBUG_UART_ANNOUNCE option to fix this.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
---
v2:
- Collect r-b tag

 arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 3 ++-
 configs/rock5b-rk3588_defconfig         | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
index 2386edf90deb..36d557b4934d 100644
--- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
@@ -11,12 +11,13 @@
 	};
 
 	chosen {
-		u-boot,spl-boot-order = &sdmmc;
+		u-boot,spl-boot-order = "same-as-spl", &sdmmc;
 	};
 };
 
 &sdmmc {
 	bus-width = <4>;
 	u-boot,dm-spl;
+	u-boot,spl-fifo-mode;
 	status = "okay";
 };
diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig
index 66199387195a..3fcc6a26bb51 100644
--- a/configs/rock5b-rk3588_defconfig
+++ b/configs/rock5b-rk3588_defconfig
@@ -66,6 +66,5 @@ CONFIG_PWM_ROCKCHIP=y
 CONFIG_SPL_RAM=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
-CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_SYSRESET=y
 CONFIG_ERRNO_STR=y
-- 
2.40.0

[PATCH v2 3/4] rockchip: rk35xx: Fix boot with a large fdt blob

[Jonas Karlman]

The TF-A blobs used to boot RK3568 and RK3588 boards is based on atf
v2.3. Mainline atf v2.3 contains an issue that could lead to a crash
when it fails to parse the fdt blob being passed as the platform param.
An issue that was fixed in atf v2.4.

The vendor TF-A seem to suffer from a similar issue, and this prevents
booting when fdt blob is large enough to trigger this condition.

Fix this by implying SPL_ATF_NO_PLATFORM_PARAM to let u-boot pass a
NULL pointer instead of the fdt blob as the platform param.

This fixes booting Radxa ROCK 3A after recent sync of device tree.

Fixes: 073d911ae64a ("rockchip: rk3568-rock-3a: Sync device tree from linux")
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
v2:
- New patch

 arch/arm/mach-rockchip/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index e5ac58ae60b5..d7e3784ba113 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -288,6 +288,7 @@ config ROCKCHIP_RK3568
 	select BOARD_LATE_INIT
 	select DM_REGULATOR_FIXED
 	select DM_RESET
+	imply SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF
 	imply ROCKCHIP_COMMON_BOARD
 	imply ROCKCHIP_OTP
 	imply MISC_INIT_R
@@ -309,6 +310,7 @@ config ROCKCHIP_RK3588
 	select REGMAP
 	select SYSCON
 	select BOARD_LATE_INIT
+	imply SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF
 	imply ROCKCHIP_COMMON_BOARD
 	imply ROCKCHIP_OTP
 	imply MISC_INIT_R
-- 
2.40.0

[PATCH v2 4/4] rockchip: rk35xx: Enable fdtoverlay and kernel compression

[Jonas Karlman]

Add fdtoverlay_addr_r, kernel_comp_addr_r and imply use of
OF_LIBFDT_OVERLAY on RK3568 and RK3588 to support fdtoverlay
and kernel compression.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
v2:
- Drop parts that convert to use bootstd
- Collect r-b tag

 arch/arm/mach-rockchip/Kconfig  | 2 ++
 include/configs/rk3568_common.h | 7 ++++++-
 include/configs/rk3588_common.h | 7 ++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index d7e3784ba113..517326c8c5be 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -290,6 +290,7 @@ config ROCKCHIP_RK3568
 	select DM_RESET
 	imply SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF
 	imply ROCKCHIP_COMMON_BOARD
+	imply OF_LIBFDT_OVERLAY
 	imply ROCKCHIP_OTP
 	imply MISC_INIT_R
 	help
@@ -312,6 +313,7 @@ config ROCKCHIP_RK3588
 	select BOARD_LATE_INIT
 	imply SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF
 	imply ROCKCHIP_COMMON_BOARD
+	imply OF_LIBFDT_OVERLAY
 	imply ROCKCHIP_OTP
 	imply MISC_INIT_R
 	help
diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
index a5e1dde50888..d6b5e7d89022 100644
--- a/include/configs/rk3568_common.h
+++ b/include/configs/rk3568_common.h
@@ -17,10 +17,15 @@
 
 #define ENV_MEM_LAYOUT_SETTINGS		\
 	"scriptaddr=0x00c00000\0"	\
+	"script_offset_f=0xffe000\0"	\
+	"script_size_f=0x2000\0"	\
 	"pxefile_addr_r=0x00e00000\0"	\
 	"fdt_addr_r=0x0a100000\0"	\
+	"fdtoverlay_addr_r=0x02000000\0"	\
 	"kernel_addr_r=0x02080000\0"	\
-	"ramdisk_addr_r=0x0a200000\0"
+	"ramdisk_addr_r=0x0a200000\0"	\
+	"kernel_comp_addr_r=0x08000000\0"	\
+	"kernel_comp_size=0x2000000\0"
 
 #include <config_distro_bootcmd.h>
 #define CFG_EXTRA_ENV_SETTINGS		\
diff --git a/include/configs/rk3588_common.h b/include/configs/rk3588_common.h
index abd20139aaf3..b9f42717b751 100644
--- a/include/configs/rk3588_common.h
+++ b/include/configs/rk3588_common.h
@@ -16,10 +16,15 @@
 
 #define ENV_MEM_LAYOUT_SETTINGS		\
 	"scriptaddr=0x00c00000\0"	\
+	"script_offset_f=0xffe000\0"	\
+	"script_size_f=0x2000\0"	\
 	"pxefile_addr_r=0x00e00000\0"	\
 	"fdt_addr_r=0x0a100000\0"	\
+	"fdtoverlay_addr_r=0x02000000\0"	\
 	"kernel_addr_r=0x02080000\0"	\
-	"ramdisk_addr_r=0x0a200000\0"
+	"ramdisk_addr_r=0x0a200000\0"	\
+	"kernel_comp_addr_r=0x08000000\0"	\
+	"kernel_comp_size=0x2000000\0"
 
 #include <config_distro_bootcmd.h>
 #define CFG_EXTRA_ENV_SETTINGS \
-- 
2.40.0

Re: [PATCH v2 3/4] rockchip: rk35xx: Fix boot with a large fdt blob

[Jagan Teki]

On Wed, 22 Mar 2023 at 03:14, Jonas Karlman <jonas@kwiboo.se> wrote:
>
> The TF-A blobs used to boot RK3568 and RK3588 boards is based on atf
> v2.3. Mainline atf v2.3 contains an issue that could lead to a crash
> when it fails to parse the fdt blob being passed as the platform param.
> An issue that was fixed in atf v2.4.
>
> The vendor TF-A seem to suffer from a similar issue, and this prevents
> booting when fdt blob is large enough to trigger this condition.
>
> Fix this by implying SPL_ATF_NO_PLATFORM_PARAM to let u-boot pass a
> NULL pointer instead of the fdt blob as the platform param.
>
> This fixes booting Radxa ROCK 3A after recent sync of device tree.
>
> Fixes: 073d911ae64a ("rockchip: rk3568-rock-3a: Sync device tree from linux")
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
> ---
> v2:
> - New patch
>
>  arch/arm/mach-rockchip/Kconfig | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index e5ac58ae60b5..d7e3784ba113 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -288,6 +288,7 @@ config ROCKCHIP_RK3568
>         select BOARD_LATE_INIT
>         select DM_REGULATOR_FIXED
>         select DM_RESET
> +       imply SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF
>         imply ROCKCHIP_COMMON_BOARD
>         imply ROCKCHIP_OTP
>         imply MISC_INIT_R
> @@ -309,6 +310,7 @@ config ROCKCHIP_RK3588

How it related to 3588, couldn't reproduce it from my end at least.
I'm using rk3588_bl31_v1.27.elf from rkbin.

Jagan.

Re: [PATCH v2 3/4] rockchip: rk35xx: Fix boot with a large fdt blob

[Jonas Karlman]

Hi Jagan,

On 2023-04-06 21:51, Jagan Teki wrote:
> On Wed, 22 Mar 2023 at 03:14, Jonas Karlman <jonas@kwiboo.se> wrote:
>>
>> The TF-A blobs used to boot RK3568 and RK3588 boards is based on atf
>> v2.3. Mainline atf v2.3 contains an issue that could lead to a crash
>> when it fails to parse the fdt blob being passed as the platform param.
>> An issue that was fixed in atf v2.4.
>>
>> The vendor TF-A seem to suffer from a similar issue, and this prevents
>> booting when fdt blob is large enough to trigger this condition.
>>
>> Fix this by implying SPL_ATF_NO_PLATFORM_PARAM to let u-boot pass a
>> NULL pointer instead of the fdt blob as the platform param.
>>
>> This fixes booting Radxa ROCK 3A after recent sync of device tree.
>>
>> Fixes: 073d911ae64a ("rockchip: rk3568-rock-3a: Sync device tree from linux")
>> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
>> ---
>> v2:
>> - New patch
>>
>>  arch/arm/mach-rockchip/Kconfig | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
>> index e5ac58ae60b5..d7e3784ba113 100644
>> --- a/arch/arm/mach-rockchip/Kconfig
>> +++ b/arch/arm/mach-rockchip/Kconfig
>> @@ -288,6 +288,7 @@ config ROCKCHIP_RK3568
>>         select BOARD_LATE_INIT
>>         select DM_REGULATOR_FIXED
>>         select DM_RESET
>> +       imply SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF
>>         imply ROCKCHIP_COMMON_BOARD
>>         imply ROCKCHIP_OTP
>>         imply MISC_INIT_R
>> @@ -309,6 +310,7 @@ config ROCKCHIP_RK3588
> 
> How it related to 3588, couldn't reproduce it from my end at least.
> I'm using rk3588_bl31_v1.27.elf from rkbin.

I have not been able to reproduce this issue on rk3588, only on rk3568.
I added the same imply to rk3588 because we have no insights into what
fixes the TF-A blob provided by rockchip have included. Passing 0 works
and seem like the more safer default option for a closed-source blob.

See commits [1] and [2] for the commits included in TF-A v2.4 related
to the platform param passed from u-boot. The fdt blob loaded into
memory may need to exceed 64KiB to trigger the issue observed on a
ROCK 3 Model A.

[1] https://github.com/ARM-software/arm-trusted-firmware/commit/8109f738ffa79a63735cba29da26e7c2859977b5
[2] https://github.com/ARM-software/arm-trusted-firmware/commit/e7b586987c0a46660aa8402f19d626a5489fe449

Regards,
Jonas

> 
> Jagan.