El Fri, Jul 15, 2022 at 05:09:49PM +0200, Quentin Schulz deia:

From: Quentin Schulz quentin.schulz@theobroma-systems.com

The check to perform is on CONFIG_SPL_GPIO and not SPL_GPIO. Because this was never compiled in, it missed an include of cru.h that was not detected before. Let's include it too.

Also switch to IS_ENABLED ifdef and in-code check.

Fixes: 07586ee4322a ("rockchip: rk3399: Support common spl_board_init") Cc: Quentin Schulz foss+uboot@0leil.net Signed-off-by: Quentin Schulz quentin.schulz@theobroma-systems.com

---

I've tested this on a Rock-Pi-4B, but with the patch below on top and I haven't seen any regression. So, with this small correction:

Tested-by: Xavier Drudis Ferran xdrudis@tinet.cat

v2:

• use IS_ENABLED checks,

arch/arm/mach-rockchip/rk3399/rk3399.c | 45 ++++++++++++++------------ 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 920da22307..db8a6cb83a 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -221,7 +221,9 @@ void spl_perform_fixups(struct spl_image_info *spl_image) "u-boot,spl-boot-device", boot_ofpath); }

-#if defined(SPL_GPIO) +#if IS_ENABLED(CONFIG_SPL_GPIO)

+#include <asm/arch-rockchip/cru.h> static void rk3399_force_power_on_reset(void) { ofnode node; @@ -253,27 +255,28 @@ void spl_board_init(void) { led_setup();

-#if defined(SPL_GPIO)

• struct rockchip_cru *cru = rockchip_get_cru();

• if (IS_ENABLED(CONFIG_SPL_GPIO)) {

• struct rockchip_cru *cru = rockchip_get_cru();
  
  

• /*

• * The RK3399 resets only 'almost all logic' (see also in the TRM
  

• * "3.9.4 Global software reset"), when issuing a software reset.
  

• * This may cause issues during boot-up for some configurations of
  

• * the application software stack.
  

• *
  

• * To work around this, we test whether the last reset reason was
  

• * a power-on reset and (if not) issue an overtemp-reset to reset
  

• * the entire module.
  

• *
  

• * While this was previously fixed by modifying the various places
  

• * that could generate a software reset (e.g. U-Boot's sysreset
  

• * driver, the ATF or Linux), we now have it here to ensure that
  

• * we no longer have to track this through the various components.
  

• */
  

• if (cru->glb_rst_st != 0)

• rk3399_force_power_on_reset();
  

-#endif

• /*
  

•  * The RK3399 resets only 'almost all logic' (see also in the
  

•  * TRM "3.9.4 Global software reset"), when issuing a software
  

•  * reset. This may cause issues during boot-up for some
  

•  * configurations of the application software stack.
  

•  *
  

•  * To work around this, we test whether the last reset reason
  

•  * was a power-on reset and (if not) issue an overtemp-reset to
  

•  * reset the entire module.
  

•  *
  

•  * While this was previously fixed by modifying the various
  

•  * places that could generate a software reset (e.g. U-Boot's
  

•  * sysreset driver, the ATF or Linux), we now have it here to
  

•  * ensure that we no longer have to track this through the
  

•  * various components.
  

•  */
  

• if (cru->glb_rst_st != 0)
  

• 	rk3399_force_power_on_reset();
  

• }

  if (IS_ENABLED(CONFIG_SPL_DM_REGULATOR)) { /*

-- 2.36.1

The small correction (now that I think of it, the include might as well go at the top of file):

--- arch/arm/mach-rockchip/rk3399/rk3399.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index fced5c7e21..10b911f998 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -221,9 +221,9 @@ void spl_perform_fixups(struct spl_image_info *spl_image) "u-boot,spl-boot-device", boot_ofpath); }

+#include <asm/arch-rockchip/cru.h> #if IS_ENABLED(CONFIG_SPL_GPIO)

-#include <asm/arch-rockchip/cru.h> static void rk3399_force_power_on_reset(void) { ofnode node; @@ -245,6 +245,10 @@ static void rk3399_force_power_on_reset(void)

dm_gpio_set_value(&sysreset_gpio, 1); } +#else +static inline void rk3399_force_power_on_reset(void) +{ +} #endif

void __weak led_setup(void)