[PATCH next 0/4] rockchip: imply ARMV8_CRYPTO on px30 + px30-ringneck/rk3399-puma defconfig changes

[PATCH next 0/4] rockchip: imply ARMV8_CRYPTO on px30 + px30-ringneck/rk3399-puma defconfig changes

[Quentin Schulz]

This implies ARMV8_CRYPTO + CONFIG_ARMV8_SET_SMPEN for cache
coherency on PX30.

Disable USB gadget support on PX30 as I've never been able to make it
work in either Linux upstream or Rockchip's downstream 5.10, and while
it exposes a device when executing the ums command in U-Boot, it never
works. So disable for now to not mislead users.

Additionally, add full fit support in SPL for PX30 Ringneck.

Finally, add button support for Puma since its Haikou devkit exposes 4
over GPIO.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
Quentin Schulz (4):
      rockchip: ringneck-px30: disable broken USB gadget
      rockchip: ringneck-px30: enable FIT verification in SPL
      rockchip: px30: imply ARMV8_CRYPTO
      rockchip: puma-rk3399: add button support

 arch/arm/mach-rockchip/Kconfig  |  2 ++
 configs/puma-rk3399_defconfig   |  2 ++
 configs/ringneck-px30_defconfig | 10 ++++------
 3 files changed, 8 insertions(+), 6 deletions(-)
---
base-commit: ae4aaa44977cbe522e9f38f2ac2ac07a784bf867
change-id: 20240613-ringneck-no-gadget-848400043608

Best regards,
-- 
Quentin Schulz <quentin.schulz@cherry.de>

[PATCH next 1/4] rockchip: ringneck-px30: disable broken USB gadget

[Quentin Schulz]

From: Quentin Schulz <quentin.schulz@cherry.de>

USB gadget simply doesn't work right now on PX30. Tested on PX30 EVB and
PX30 Ringneck with Linux mainline and Rockchip 5.10 Linux as well as
U-Boot.

We don't want to our users to assume that USB gadget is supported on Q7
USB P1 on Ringneck Haikou, so let's remove its support, which also
removes the ums CLI command, fastboot and Android image booting
support.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 configs/ringneck-px30_defconfig | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/configs/ringneck-px30_defconfig b/configs/ringneck-px30_defconfig
index 23204794205..2ec5f72e47a 100644
--- a/configs/ringneck-px30_defconfig
+++ b/configs/ringneck-px30_defconfig
@@ -15,7 +15,6 @@ CONFIG_DEBUG_UART_BASE=0xFF030000
 CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_SYS_LOAD_ADDR=0x800800
 CONFIG_DEBUG_UART=y
-# CONFIG_ANDROID_BOOT_IMAGE is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
@@ -42,6 +41,7 @@ CONFIG_SPL_ATF=y
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_LZMADEC is not set
 # CONFIG_CMD_UNZIP is not set
+CONFIG_CMD_BIND=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
@@ -49,7 +49,6 @@ CONFIG_CMD_I2C=y
 # CONFIG_CMD_LOADS is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
-CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
@@ -73,8 +72,6 @@ CONFIG_BUTTON=y
 CONFIG_BUTTON_GPIO=y
 CONFIG_CLK=y
 CONFIG_SPL_CLK=y
-CONFIG_FASTBOOT_BUF_ADDR=0x800800
-CONFIG_FASTBOOT_BUF_SIZE=0x04000000
 CONFIG_GPIO_HOG=y
 CONFIG_SPL_GPIO_HOG=y
 CONFIG_ROCKCHIP_GPIO=y
@@ -112,8 +109,6 @@ CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DWC2_OTG=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_TPL_TINY_MEMSET=y
 CONFIG_LZO=y

-- 
2.45.2

Re: [PATCH next 1/4] rockchip: ringneck-px30: disable broken USB gadget

[Kever Yang]

Hi Quentin,

On 2024/6/14 19:04, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz@cherry.de>
>
> USB gadget simply doesn't work right now on PX30. Tested on PX30 EVB and
> PX30 Ringneck with Linux mainline and Rockchip 5.10 Linux as well as
> U-Boot.
Do you mean for both U-Boot and kernel, including mainline version and 
rockchip version,
and on both PX30 EVB and Ringneck board, all SW&HW have no USB gadget 
working?
So when you test this, does the maskrom mode works? because it sounds 
like maybe
the HOST PC is the one have issue at the moment.


Thanks,

  - Kever

>
> We don't want to our users to assume that USB gadget is supported on Q7
> USB P1 on Ringneck Haikou, so let's remove its support, which also
> removes the ums CLI command, fastboot and Android image booting
> support.
>
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
> ---
>   configs/ringneck-px30_defconfig | 7 +------
>   1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/configs/ringneck-px30_defconfig b/configs/ringneck-px30_defconfig
> index 23204794205..2ec5f72e47a 100644
> --- a/configs/ringneck-px30_defconfig
> +++ b/configs/ringneck-px30_defconfig
> @@ -15,7 +15,6 @@ CONFIG_DEBUG_UART_BASE=0xFF030000
>   CONFIG_DEBUG_UART_CLOCK=24000000
>   CONFIG_SYS_LOAD_ADDR=0x800800
>   CONFIG_DEBUG_UART=y
> -# CONFIG_ANDROID_BOOT_IMAGE is not set
>   CONFIG_FIT=y
>   CONFIG_FIT_VERBOSE=y
>   CONFIG_SPL_LOAD_FIT=y
> @@ -42,6 +41,7 @@ CONFIG_SPL_ATF=y
>   # CONFIG_CMD_ELF is not set
>   # CONFIG_CMD_LZMADEC is not set
>   # CONFIG_CMD_UNZIP is not set
> +CONFIG_CMD_BIND=y
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_GPT=y
>   CONFIG_CMD_I2C=y
> @@ -49,7 +49,6 @@ CONFIG_CMD_I2C=y
>   # CONFIG_CMD_LOADS is not set
>   CONFIG_CMD_MMC=y
>   CONFIG_CMD_USB=y
> -CONFIG_CMD_USB_MASS_STORAGE=y
>   # CONFIG_CMD_SETEXPR is not set
>   CONFIG_CMD_PMIC=y
>   CONFIG_CMD_REGULATOR=y
> @@ -73,8 +72,6 @@ CONFIG_BUTTON=y
>   CONFIG_BUTTON_GPIO=y
>   CONFIG_CLK=y
>   CONFIG_SPL_CLK=y
> -CONFIG_FASTBOOT_BUF_ADDR=0x800800
> -CONFIG_FASTBOOT_BUF_SIZE=0x04000000
>   CONFIG_GPIO_HOG=y
>   CONFIG_SPL_GPIO_HOG=y
>   CONFIG_ROCKCHIP_GPIO=y
> @@ -112,8 +109,6 @@ CONFIG_DM_THERMAL=y
>   CONFIG_USB=y
>   CONFIG_USB_EHCI_HCD=y
>   CONFIG_USB_EHCI_GENERIC=y
> -CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_DWC2_OTG=y
>   CONFIG_SPL_TINY_MEMSET=y
>   CONFIG_TPL_TINY_MEMSET=y
>   CONFIG_LZO=y
>

Re: [PATCH next 1/4] rockchip: ringneck-px30: disable broken USB gadget

[Quentin Schulz]

Hi Kever,

On 7/16/24 4:04 AM, Kever Yang wrote:
> Hi Quentin,
> 
> On 2024/6/14 19:04, Quentin Schulz wrote:
>> From: Quentin Schulz <quentin.schulz@cherry.de>
>>
>> USB gadget simply doesn't work right now on PX30. Tested on PX30 EVB and
>> PX30 Ringneck with Linux mainline and Rockchip 5.10 Linux as well as
>> U-Boot.
> Do you mean for both U-Boot and kernel, including mainline version and 
> rockchip version,
> and on both PX30 EVB and Ringneck board, all SW&HW have no USB gadget 
> working?

Mainline U-Boot on PX30 Ringneck -> not working
PX30 EVB and PX30 Ringneck in Rockchip 5.10 kernel when I tested about 
two years or so ago -> working-ish, but very unstable on Ringneck and I 
think not working at all on PX30 EVB
PX30 Ringneck (possibly PX30 EVB, I don't remember) in upstream 6.0.2 
(and also next-20221216) -> not working

I don't know what you mean by SW&HW, how am I supposed to differentiate 
the two?

FYI, I tried to add **some** support in upstream, it got merged and then 
reverted because it broke STM platforms, c.f. 
https://lore.kernel.org/linux-usb/20221206-dwc2-gadget-dual-role-v2-0-0de821615dd3@theobroma-systems.com/ 
and 
https://lore.kernel.org/linux-usb/20230315144433.3095859-1-fabrice.gasnier@foss.st.com/

I can test stuff again and provide a bit more info if requested.

> So when you test this, does the maskrom mode works? because it sounds 
> like maybe
> the HOST PC is the one have issue at the moment.
> 

I can use rkdeveloptool just fine when using Rockchip blobs from rkbin, 
no issue with the HW asf ar as I know.

Cheers,
Quentin

[PATCH next 2/4] rockchip: ringneck-px30: enable FIT verification in SPL

[Quentin Schulz]

From: Quentin Schulz <quentin.schulz@cherry.de>

This enables FIT verification in SPL for its payload (bl31, u-boot.itb,
...). This makes PX30 Ringneck match what happens on other Theobroma
boards.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 configs/ringneck-px30_defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configs/ringneck-px30_defconfig b/configs/ringneck-px30_defconfig
index 2ec5f72e47a..e7594b7a67b 100644
--- a/configs/ringneck-px30_defconfig
+++ b/configs/ringneck-px30_defconfig
@@ -17,8 +17,10 @@ CONFIG_SYS_LOAD_ADDR=0x800800
 CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
+CONFIG_SPL_FIT_SIGNATURE=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_BOOTSTD_FULL=y
+CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_DEFAULT_FDT_FILE="rockchip/px30-ringneck-haikou.dtb"
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
@@ -111,6 +113,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_TPL_TINY_MEMSET=y
+# CONFIG_RSA is not set
 CONFIG_LZO=y
 CONFIG_ERRNO_STR=y
 # CONFIG_EFI_LOADER is not set

-- 
2.45.2

Re: [PATCH next 2/4] rockchip: ringneck-px30: enable FIT verification in SPL

[Kever Yang]

On 2024/6/14 19:04, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz@cherry.de>
>
> This enables FIT verification in SPL for its payload (bl31, u-boot.itb,
> ...). This makes PX30 Ringneck match what happens on other Theobroma
> boards.
>
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>

Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   configs/ringneck-px30_defconfig | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/configs/ringneck-px30_defconfig b/configs/ringneck-px30_defconfig
> index 2ec5f72e47a..e7594b7a67b 100644
> --- a/configs/ringneck-px30_defconfig
> +++ b/configs/ringneck-px30_defconfig
> @@ -17,8 +17,10 @@ CONFIG_SYS_LOAD_ADDR=0x800800
>   CONFIG_DEBUG_UART=y
>   CONFIG_FIT=y
>   CONFIG_FIT_VERBOSE=y
> +CONFIG_SPL_FIT_SIGNATURE=y
>   CONFIG_SPL_LOAD_FIT=y
>   CONFIG_BOOTSTD_FULL=y
> +CONFIG_LEGACY_IMAGE_FORMAT=y
>   CONFIG_DEFAULT_FDT_FILE="rockchip/px30-ringneck-haikou.dtb"
>   # CONFIG_DISPLAY_CPUINFO is not set
>   CONFIG_DISPLAY_BOARDINFO_LATE=y
> @@ -111,6 +113,7 @@ CONFIG_USB_EHCI_HCD=y
>   CONFIG_USB_EHCI_GENERIC=y
>   CONFIG_SPL_TINY_MEMSET=y
>   CONFIG_TPL_TINY_MEMSET=y
> +# CONFIG_RSA is not set
>   CONFIG_LZO=y
>   CONFIG_ERRNO_STR=y
>   # CONFIG_EFI_LOADER is not set
>

[PATCH next 3/4] rockchip: px30: imply ARMV8_CRYPTO

[Quentin Schulz]

From: Quentin Schulz <quentin.schulz@cherry.de>

PX30 supports ARMv8 Cryptography Extensions so let's enable it by
default for all PX30 to make FIT verification when enabled much faster.

While A35 shouldn't be impacted by ARMV8_SET_SMPEN cache coherency
according to the Kconfig help text, let's enable it just in case since
it exists in the documentation[1].

For u-boot part of the FIT image, it is now taking 5ms against currently
35ms. fdt-1 check lowered from 3ms to <1ms. atf-1 from 6ms to <1ms.

[1] https://developer.arm.com/documentation/100236/0100/register-descriptions/aarch64-system-registers/cpu-extended-control-register--el1?lang=en

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 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 14b3ab1a572..2242ed9184b 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -16,6 +16,8 @@ config ROCKCHIP_PX30
 	select DEBUG_UART_BOARD_INIT
 	imply ROCKCHIP_COMMON_BOARD
 	imply SPL_ROCKCHIP_COMMON_BOARD
+	imply ARMV8_CRYPTO
+	imply ARMV8_SET_SMPEN
 	help
 	  The Rockchip PX30 is a ARM-based SoC with a quad-core Cortex-A35
 	  including NEON and GPU, Mali-400 graphics, several DDR3 options

-- 
2.45.2

Re: [PATCH next 3/4] rockchip: px30: imply ARMV8_CRYPTO

[Kever Yang]

On 2024/6/14 19:04, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz@cherry.de>
>
> PX30 supports ARMv8 Cryptography Extensions so let's enable it by
> default for all PX30 to make FIT verification when enabled much faster.
>
> While A35 shouldn't be impacted by ARMV8_SET_SMPEN cache coherency
> according to the Kconfig help text, let's enable it just in case since
> it exists in the documentation[1].
>
> For u-boot part of the FIT image, it is now taking 5ms against currently
> 35ms. fdt-1 check lowered from 3ms to <1ms. atf-1 from 6ms to <1ms.
>
> [1] https://developer.arm.com/documentation/100236/0100/register-descriptions/aarch64-system-registers/cpu-extended-control-register--el1?lang=en
>
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>

Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   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 14b3ab1a572..2242ed9184b 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -16,6 +16,8 @@ config ROCKCHIP_PX30
>   	select DEBUG_UART_BOARD_INIT
>   	imply ROCKCHIP_COMMON_BOARD
>   	imply SPL_ROCKCHIP_COMMON_BOARD
> +	imply ARMV8_CRYPTO
> +	imply ARMV8_SET_SMPEN
>   	help
>   	  The Rockchip PX30 is a ARM-based SoC with a quad-core Cortex-A35
>   	  including NEON and GPU, Mali-400 graphics, several DDR3 options
>

[PATCH next 4/4] rockchip: puma-rk3399: add button support

[Quentin Schulz]

From: Quentin Schulz <quentin.schulz@cherry.de>

The Haikou Devkit exposes 4 buttons over GPIO so let's enable their
support so their status can be queried from the `button` command from
the CLI.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 configs/puma-rk3399_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig
index 5319239f989..bc9a79107e0 100644
--- a/configs/puma-rk3399_defconfig
+++ b/configs/puma-rk3399_defconfig
@@ -56,6 +56,8 @@ CONFIG_ENV_SPI_MAX_HZ=50000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SYS_MMC_ENV_DEV=1
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_BUTTON=y
+CONFIG_BUTTON_GPIO=y
 CONFIG_GPIO_HOG=y
 CONFIG_SPL_GPIO_HOG=y
 CONFIG_ROCKCHIP_GPIO=y

-- 
2.45.2

Re: [PATCH next 4/4] rockchip: puma-rk3399: add button support

[Kever Yang]

On 2024/6/14 19:04, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz@cherry.de>
>
> The Haikou Devkit exposes 4 buttons over GPIO so let's enable their
> support so their status can be queried from the `button` command from
> the CLI.
>
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>

Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
>   configs/puma-rk3399_defconfig | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig
> index 5319239f989..bc9a79107e0 100644
> --- a/configs/puma-rk3399_defconfig
> +++ b/configs/puma-rk3399_defconfig
> @@ -56,6 +56,8 @@ CONFIG_ENV_SPI_MAX_HZ=50000000
>   CONFIG_SYS_RELOC_GD_ENV_ADDR=y
>   CONFIG_SYS_MMC_ENV_DEV=1
>   CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> +CONFIG_BUTTON=y
> +CONFIG_BUTTON_GPIO=y
>   CONFIG_GPIO_HOG=y
>   CONFIG_SPL_GPIO_HOG=y
>   CONFIG_ROCKCHIP_GPIO=y
>