Skip to contentSkip to conversation

rockchip: roc-rk3399-pc: Custom SPL

PATCH In review Jagan Teki 2 participants 10 messages Jul 21, 2020 – Jul 22, 2020

Subsystems (3)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

v6 cover rockchip: roc-rk3399-pc: Custom SPL

This series supports custom initialization code required for roc-rk3399-pc board on SPL stage.

Now this series is well mature code handling to add custom spl_board_init code parts.

roc-rk3399-pc would require custom leds initialization based on user intervention of the power key. This code handles the user intervention via SPI environment variable. If someone or production systems wants this feature then 'pwr_key' has to be set otherwise it is normal like other rk3399 boards in Mainline.

Changes for v6:
- use spl board init code for led_setup
Changes for v5:
- drop banner changes
- add code changes in roc-pc-rk3399.c
Changes for v4:
- enable SPL_BOARD_INIT in all platforms
Changes for v3:
- support leds on SPL
- support env 'pwr_key'

Jagan Teki (5):
rockchip: rk3399: Add weak led_setup()
rockchip: roc-rk3399-pc: Add custom led_setup()
rockchip: Don't clear the reset status reg
rockchip: Separate the reset cause from display cpuinfo
rockchip: roc-rk3399-pc: Set LED only during POR and pwr_key=y

 arch/arm/include/asm/arch-rockchip/cru.h    |  3 +-
 arch/arm/mach-rockchip/Makefile             |  5 ++-
 arch/arm/mach-rockchip/cpu-info.c           | 26 ++++++-----
 arch/arm/mach-rockchip/rk3399/rk3399.c      |  6 +++
 arch/arm/mach-rockchip/tpl.c                |  7 ---
 board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 48 +++++++++++++++++----
 configs/roc-pc-mezzanine-rk3399_defconfig   |  6 ++-
 configs/roc-pc-rk3399_defconfig             |  6 ++-
 8 files changed, 71 insertions(+), 36 deletions(-)
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH v6 1/5 rockchip: rk3399: Add weak led_setup()

Add weak led_setup() so that board which has an uncommon led setup code that can make use of custom implementation.

---
Changes for v6:
- new patch

 arch/arm/mach-rockchip/rk3399/rk3399.c | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/mach-rockchip/rk3399/rk3399.c +6 -0
index 4fda93b152..c643483971 100644
@@ -241,8 +241,14 @@ static void rk3399_force_power_on_reset(void)
 }
 #endif
 
+void __weak led_setup(void)
+{
+}
+
 void spl_board_init(void)
 {
+	led_setup();
+
 #if defined(SPL_GPIO_SUPPORT)
 	struct rockchip_cru *cru = rockchip_get_cru();
 
Signature · 1 line
2.25.1
Reviewed-by on v6 1/5
#2 lore raw

Re: [PATCH v6 1/5] rockchip: rk3399: Add weak led_setup()

Quoted 4 lines · Jagan Teki

Add weak led_setup() so that board which has an uncommon led setup code that can make use of custom implementation.

Thanks,
- Kever

Quoted 26 lines

---
Changes for v6:
- new patch

  arch/arm/mach-rockchip/rk3399/rk3399.c | 6 ++++++
  1 file changed, 6 insertions(+)
arch/arm/mach-rockchip/rk3399/rk3399.c +6 -0
index 4fda93b152..c643483971 100644
@@ -241,8 +241,14 @@ static void rk3399_force_power_on_reset(void)
  }
  #endif
 
+void __weak led_setup(void)
+{
+}
+
  void spl_board_init(void)
  {
+	led_setup();
+
  #if defined(SPL_GPIO_SUPPORT)
  	struct rockchip_cru *cru = rockchip_get_cru();
 
author
#3 lore raw

PATCH v6 2/5 rockchip: roc-rk3399-pc: Add custom led_setup()

In reply to Jagan Teki

roc-rk3399-pc has some specific requirements to support LEDS, environment. board detection and etc prior to U-Boot proper.

So as of now SPL would be a better stage for these custom board requirements to support unlike TPL. Adding few of these custom requirements like LEDS in TPL would require extra code pulling and also the size of TPL can grow.

So, this patch moves the leds code from TPL into SPL Board init led_setup code.

---
Changes for v6:
- use spl_board_init custom led function

 arch/arm/mach-rockchip/tpl.c                |  7 -------
 board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 10 +++-------
 configs/roc-pc-mezzanine-rk3399_defconfig   |  2 +-
 configs/roc-pc-rk3399_defconfig             |  2 +-
 4 files changed, 5 insertions(+), 16 deletions(-)
arch/arm/mach-rockchip/tpl.c +0 -7
index 88f80b05a9..cc908e1b0e 100644
@@ -43,18 +43,11 @@ __weak void rockchip_stimer_init(void)
 	       TIMER_CONTROL_REG);
 }
 
-__weak int board_early_init_f(void)
-{
-	return 0;
-}
-
 void board_init_f(ulong dummy)
 {
 	struct udevice *dev;
 	int ret;
 
-	board_early_init_f();
-
 #if defined(CONFIG_DEBUG_UART) && defined(CONFIG_TPL_SERIAL_SUPPORT)
 	/*
 	 * Debug UART can be used from here if required:
board/firefly/roc-pc-rk3399/roc-pc-rk3399.c +3 -7
index 7c3a803654..2b447df8aa 100644
@@ -6,7 +6,6 @@
 #include <common.h>
 #include <dm.h>
 #include <log.h>
-#include <asm/arch-rockchip/periph.h>
 #include <power/regulator.h>
 #include <spl_gpio.h>
 #include <asm/io.h>
@@ -30,19 +29,16 @@ int board_early_init_f(void)
 out:
 	return 0;
 }
-#endif
 
-#if defined(CONFIG_TPL_BUILD)
+#else
 
-#define GPIO0_BASE      0xff720000
+#define GPIO0_BASE	0xff720000
 
-int board_early_init_f(void)
+void led_setup(void)
 {
 	struct rockchip_gpio_regs * const gpio0 = (void *)GPIO0_BASE;
 
 	/* Turn on red LED, indicating full power mode */
 	spl_gpio_output(gpio0, GPIO(BANK_B, 5), 1);
-
-	return 0;
 }
 #endif
configs/roc-pc-mezzanine-rk3399_defconfig +1 -1
index c87a8568fc..15d511741f 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_ENV_SIZE=0x8000
 CONFIG_ENV_OFFSET=0x3F8000
 CONFIG_ENV_SECT_SIZE=0x1000
@@ -21,7 +22,6 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_TPL=y
-CONFIG_TPL_GPIO_SUPPORT=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
configs/roc-pc-rk3399_defconfig +1 -1
index 601f5c6ae1..2a6d0d22c8 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_ENV_SIZE=0x8000
 CONFIG_ENV_OFFSET=0x3F8000
 CONFIG_ENV_SECT_SIZE=0x1000
@@ -21,7 +22,6 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_TPL=y
-CONFIG_TPL_GPIO_SUPPORT=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
Signature · 1 line
2.25.1
Reviewed-by on v6 2/5
#4 lore raw

Re: [PATCH v6 2/5] rockchip: roc-rk3399-pc: Add custom led_setup()

Quoted 8 lines · Jagan Teki

roc-rk3399-pc has some specific requirements to support LEDS, environment. board detection and etc prior to U-Boot proper.

So as of now SPL would be a better stage for these custom board requirements to support unlike TPL. Adding few of these custom requirements like LEDS in TPL would require extra code pulling and also the size of TPL can grow.

Quoted 4 lines

So, this patch moves the leds code from TPL into SPL Board init led_setup code.

I will split the tpl change as a separate patch, otherwise for the code:

Thanks,
- Kever

Quoted 108 lines

---
Changes for v6:
- use spl_board_init custom led function

  arch/arm/mach-rockchip/tpl.c                |  7 -------
  board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 10 +++-------
  configs/roc-pc-mezzanine-rk3399_defconfig   |  2 +-
  configs/roc-pc-rk3399_defconfig             |  2 +-
  4 files changed, 5 insertions(+), 16 deletions(-)
arch/arm/mach-rockchip/tpl.c +0 -7
index 88f80b05a9..cc908e1b0e 100644
@@ -43,18 +43,11 @@ __weak void rockchip_stimer_init(void)
  	       TIMER_CONTROL_REG);
  }
 
-__weak int board_early_init_f(void)
-{
-	return 0;
-}
-
  void board_init_f(ulong dummy)
  {
  	struct udevice *dev;
  	int ret;
 
-	board_early_init_f();
-
  #if defined(CONFIG_DEBUG_UART) && defined(CONFIG_TPL_SERIAL_SUPPORT)
  	/*
  	 * Debug UART can be used from here if required:
board/firefly/roc-pc-rk3399/roc-pc-rk3399.c +3 -7
index 7c3a803654..2b447df8aa 100644
@@ -6,7 +6,6 @@
  #include <common.h>
  #include <dm.h>
  #include <log.h>
-#include <asm/arch-rockchip/periph.h>
  #include <power/regulator.h>
  #include <spl_gpio.h>
  #include <asm/io.h>
@@ -30,19 +29,16 @@ int board_early_init_f(void)
  out:
  	return 0;
  }
-#endif
 
-#if defined(CONFIG_TPL_BUILD)
+#else
 
-#define GPIO0_BASE      0xff720000
+#define GPIO0_BASE	0xff720000
 
-int board_early_init_f(void)
+void led_setup(void)
  {
  	struct rockchip_gpio_regs * const gpio0 = (void *)GPIO0_BASE;
 
  	/* Turn on red LED, indicating full power mode */
  	spl_gpio_output(gpio0, GPIO(BANK_B, 5), 1);
-
-	return 0;
  }
  #endif
configs/roc-pc-mezzanine-rk3399_defconfig +1 -1
index c87a8568fc..15d511741f 100644
@@ -1,6 +1,7 @@
  CONFIG_ARM=y
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_SPL_GPIO_SUPPORT=y
  CONFIG_ENV_SIZE=0x8000
  CONFIG_ENV_OFFSET=0x3F8000
  CONFIG_ENV_SECT_SIZE=0x1000
@@ -21,7 +22,6 @@ CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
  CONFIG_SPL_SPI_LOAD=y
  CONFIG_TPL=y
-CONFIG_TPL_GPIO_SUPPORT=y
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
configs/roc-pc-rk3399_defconfig +1 -1
index 601f5c6ae1..2a6d0d22c8 100644
@@ -1,6 +1,7 @@
  CONFIG_ARM=y
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_SPL_GPIO_SUPPORT=y
  CONFIG_ENV_SIZE=0x8000
  CONFIG_ENV_OFFSET=0x3F8000
  CONFIG_ENV_SECT_SIZE=0x1000
@@ -21,7 +22,6 @@ CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
  CONFIG_SPL_SPI_LOAD=y
  CONFIG_TPL=y
-CONFIG_TPL_GPIO_SUPPORT=y
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
author
#5 lore raw

PATCH v6 3/5 rockchip: Don't clear the reset status reg

In reply to Jagan Teki

reset reason can be used several stages of U-Boot bootloader like SPL, U-Boot proper based on the requirements.

Clearing the status register end of get_reset_cause will end up showing the wrong reset cause when it read the second time. For example, if board resets, SPL reads the reset status as RST whereas U-Boot proper reads the status as POR.

However, based on the latest testing clearing reset status won't be required for determine the last reset cause or following resets.

---
Changes for v6:
- collect Kever r-b

 arch/arm/include/asm/arch-rockchip/cru.h | 1 -
 arch/arm/mach-rockchip/cpu-info.c        | 6 ------
 2 files changed, 7 deletions(-)
arch/arm/include/asm/arch-rockchip/cru.h +0 -1
index 5eb17f9d55..d2057cb738 100644
@@ -26,7 +26,6 @@ enum {
 	SND_GLB_TSADC_RST_ST	= BIT(3),
 	FST_GLB_WDT_RST_ST	= BIT(4),
 	SND_GLB_WDT_RST_ST	= BIT(5),
-	GLB_RST_ST_MASK		= GENMASK(5, 0),
 };
 
 #define MHz		1000000
arch/arm/mach-rockchip/cpu-info.c +0 -6
index 21ca9dedce..bb5a198039 100644
@@ -47,12 +47,6 @@ static char *get_reset_cause(void)
 	 */
 	env_set("reset_reason", cause);
 
-	/*
-	 * Clear glb_rst_st, so we can determine the last reset cause
-	 * for following resets.
-	 */
-	rk_clrreg(&cru->glb_rst_st, GLB_RST_ST_MASK);
-
 	return cause;
 }
 
Signature · 1 line
2.25.1
author
#6 lore raw

PATCH v6 4/5 rockchip: Separate the reset cause from display cpuinfo

In reply to Jagan Teki

reset cause is a generic functionality based on the soc cru registers in rockchip. This can be used for printing the cause of reset in cpuinfo or some other place where reset cause is needed.

Other than cpuinfo, reset cause can also be using during bootcount for checking the specific reset cause and glow the led based on the reset cause.

So, let's separate the reset cause code from cpuinfo, and add a check to build it for rk3399, rk3288 since these two soc are supporting reset cause as of now.

---
Changes for v6:
- collect Kever r-b

 arch/arm/include/asm/arch-rockchip/cru.h |  2 ++
 arch/arm/mach-rockchip/Makefile          |  5 ++++-
 arch/arm/mach-rockchip/cpu-info.c        | 20 ++++++++++++--------
 3 files changed, 18 insertions(+), 9 deletions(-)
arch/arm/include/asm/arch-rockchip/cru.h +2 -0
index d2057cb738..13ea4aba8e 100644
@@ -30,4 +30,6 @@ enum {
 
 #define MHz		1000000
 
+char *get_reset_cause(void);
+
 #endif /* _ROCKCHIP_CLOCK_H */
arch/arm/mach-rockchip/Makefile +4 -1
index 5b38526fe0..121f23a563 100644
@@ -22,11 +22,14 @@ ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),)
 # we can have the preprocessor correctly recognise both 0x0 and 0
 # meaning "turn it off".
 obj-y += boot_mode.o
-obj-$(CONFIG_DISPLAY_CPUINFO) += cpu-info.o
 obj-$(CONFIG_ROCKCHIP_COMMON_BOARD) += board.o
 obj-$(CONFIG_MISC_INIT_R) += misc.o
 endif
 
+ifeq ($(CONFIG_TPL_BUILD),)
+obj-$(CONFIG_DISPLAY_CPUINFO) += cpu-info.o
+endif
+
 obj-$(CONFIG_$(SPL_TPL_)RAM) += sdram.o
 
 obj-$(CONFIG_ROCKCHIP_PX30) += px30/
arch/arm/mach-rockchip/cpu-info.c +12 -8
index bb5a198039..d0f030109f 100644
@@ -13,7 +13,7 @@
 #include <asm/arch-rockchip/hardware.h>
 #include <linux/err.h>
 
-static char *get_reset_cause(void)
+char *get_reset_cause(void)
 {
 	struct rockchip_cru *cru = rockchip_get_cru();
 	char *cause = NULL;
@@ -41,21 +41,25 @@ static char *get_reset_cause(void)
 		cause = "unknown reset";
 	}
 
-	/**
-	 * reset_reason env is used by rk3288, due to special use case
-	 * to figure it the boot behavior. so keep this as it is.
-	 */
-	env_set("reset_reason", cause);
-
 	return cause;
 }
 
+#if CONFIG_IS_ENABLED(DISPLAY_CPUINFO)
 int print_cpuinfo(void)
 {
+	char *cause = get_reset_cause();
+
 	printf("SoC: Rockchip %s\n", CONFIG_SYS_SOC);
-	printf("Reset cause: %s\n", get_reset_cause());
+	printf("Reset cause: %s\n", cause);
+
+	/**
+	 * reset_reason env is used by rk3288, due to special use case
+	 * to figure it the boot behavior. so keep this as it is.
+	 */
+	env_set("reset_reason", cause);
 
 	/* TODO print operating temparature and clock */
 
 	return 0;
 }
+#endif
Signature · 1 line
2.25.1
author
#7 lore raw

PATCH v6 5/5 rockchip: roc-rk3399-pc: Set LED only during POR and pwr_key=y

In reply to Jagan Teki

ROC-RK3399-PC has specific set of configurations for on-board led setup.

Due to easiness for user to know the state of the board roc-rk339-pc board code will setup the low power led on/off, and waiting for user to press power key and then glow full power led.

All this needs to happen only during power-on-reset not for soft reset or WDT.

Also, it is not a proper usage to ask the user to press the Power key if the board connected remotely, so add the environment variable 'pwr_key' to check as well.

So, user need to press Power key only
- during POR
- pwr_key=y

---
Changes for v6:
- increase SPL _R malloc

 board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 38 +++++++++++++++++++--
 configs/roc-pc-mezzanine-rk3399_defconfig   |  4 ++-
 configs/roc-pc-rk3399_defconfig             |  4 ++-
 3 files changed, 42 insertions(+), 4 deletions(-)
board/firefly/roc-pc-rk3399/roc-pc-rk3399.c +36 -2
index 2b447df8aa..93e7d776fb 100644
@@ -5,11 +5,15 @@
 
 #include <common.h>
 #include <dm.h>
+#include <env.h>
 #include <log.h>
-#include <power/regulator.h>
 #include <spl_gpio.h>
 #include <asm/io.h>
+#include <power/regulator.h>
+
+#include <asm/arch-rockchip/cru.h>
 #include <asm/arch-rockchip/gpio.h>
+#include <asm/arch-rockchip/grf_rk3399.h>
 
 #ifndef CONFIG_SPL_BUILD
 int board_early_init_f(void)
@@ -32,13 +36,43 @@ out:
 
 #else
 
+#define PMUGRF_BASE	0xff320000
 #define GPIO0_BASE	0xff720000
 
+/**
+ * LED setup for roc-rk3399-pc
+ *
+ * 1. Set the low power leds (only during POR, pwr_key env is 'y')
+ *    glow yellow LED, termed as low power
+ *    poll for on board power key press
+ *    once powe key pressed, turn off yellow
+ * 2. Turn on red LED, indicating full power mode
+ */
 void led_setup(void)
 {
 	struct rockchip_gpio_regs * const gpio0 = (void *)GPIO0_BASE;
+	struct rk3399_pmugrf_regs * const pmugrf = (void *)PMUGRF_BASE;
+	bool press_pwr_key = false;
+
+	if (IS_ENABLED(CONFIG_SPL_ENV_SUPPORT)) {
+		env_init();
+		env_load();
+		if (env_get_yesno("pwr_key") == 1)
+			press_pwr_key = true;
+	}
+
+	if (press_pwr_key && !strcmp(get_reset_cause(), "POR")) {
+		spl_gpio_output(gpio0, GPIO(BANK_A, 2), 1);
+
+		spl_gpio_set_pull(&pmugrf->gpio0_p, GPIO(BANK_A, 5),
+				  GPIO_PULL_NORMAL);
+		while (readl(&gpio0->ext_port) & 0x20)
+			;
+
+		spl_gpio_output(gpio0, GPIO(BANK_A, 2), 0);
+	}
 
-	/* Turn on red LED, indicating full power mode */
 	spl_gpio_output(gpio0, GPIO(BANK_B, 5), 1);
 }
+
 #endif
configs/roc-pc-mezzanine-rk3399_defconfig +3 -1
index 15d511741f..9a01de454f 100644
@@ -19,7 +19,8 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc-mezzanine.dtb"
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
 CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x20000
+CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_TPL=y
 CONFIG_CMD_BOOTZ=y
@@ -34,6 +35,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-roc-pc-mezzanine"
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MISC=y
configs/roc-pc-rk3399_defconfig +3 -1
index 2a6d0d22c8..6181da763d 100644
@@ -19,7 +19,8 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc.dtb"
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
 CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x20000
+CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_TPL=y
 CONFIG_CMD_BOOTZ=y
@@ -33,6 +34,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-roc-pc"
 CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MISC=y
Signature · 1 line
2.25.1
Reviewed-by on v6 5/5
#8 lore raw

Re: [PATCH v6 5/5] rockchip: roc-rk3399-pc: Set LED only during POR and pwr_key=y

Quoted 15 lines · Jagan Teki

ROC-RK3399-PC has specific set of configurations for on-board led setup.

Due to easiness for user to know the state of the board roc-rk339-pc board code will setup the low power led on/off, and waiting for user to press power key and then glow full power led.

All this needs to happen only during power-on-reset not for soft reset or WDT.

Also, it is not a proper usage to ask the user to press the Power key if the board connected remotely, so add the environment variable 'pwr_key' to check as well.

Quoted 6 lines

So, user need to press Power key only
- during POR
- pwr_key=y

Thanks,
- Kever

Quoted 119 lines

---
Changes for v6:
- increase SPL _R malloc

  board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 38 +++++++++++++++++++--
  configs/roc-pc-mezzanine-rk3399_defconfig   |  4 ++-
  configs/roc-pc-rk3399_defconfig             |  4 ++-
  3 files changed, 42 insertions(+), 4 deletions(-)
board/firefly/roc-pc-rk3399/roc-pc-rk3399.c +36 -2
index 2b447df8aa..93e7d776fb 100644
@@ -5,11 +5,15 @@
 
  #include <common.h>
  #include <dm.h>
+#include <env.h>
  #include <log.h>
-#include <power/regulator.h>
  #include <spl_gpio.h>
  #include <asm/io.h>
+#include <power/regulator.h>
+
+#include <asm/arch-rockchip/cru.h>
  #include <asm/arch-rockchip/gpio.h>
+#include <asm/arch-rockchip/grf_rk3399.h>
 
  #ifndef CONFIG_SPL_BUILD
  int board_early_init_f(void)
@@ -32,13 +36,43 @@ out:
 
  #else
 
+#define PMUGRF_BASE	0xff320000
  #define GPIO0_BASE	0xff720000
 
+/**
+ * LED setup for roc-rk3399-pc
+ *
+ * 1. Set the low power leds (only during POR, pwr_key env is 'y')
+ *    glow yellow LED, termed as low power
+ *    poll for on board power key press
+ *    once powe key pressed, turn off yellow
+ * 2. Turn on red LED, indicating full power mode
+ */
  void led_setup(void)
  {
  	struct rockchip_gpio_regs * const gpio0 = (void *)GPIO0_BASE;
+	struct rk3399_pmugrf_regs * const pmugrf = (void *)PMUGRF_BASE;
+	bool press_pwr_key = false;
+
+	if (IS_ENABLED(CONFIG_SPL_ENV_SUPPORT)) {
+		env_init();
+		env_load();
+		if (env_get_yesno("pwr_key") == 1)
+			press_pwr_key = true;
+	}
+
+	if (press_pwr_key && !strcmp(get_reset_cause(), "POR")) {
+		spl_gpio_output(gpio0, GPIO(BANK_A, 2), 1);
+
+		spl_gpio_set_pull(&pmugrf->gpio0_p, GPIO(BANK_A, 5),
+				  GPIO_PULL_NORMAL);
+		while (readl(&gpio0->ext_port) & 0x20)
+			;
+
+		spl_gpio_output(gpio0, GPIO(BANK_A, 2), 0);
+	}
 
-	/* Turn on red LED, indicating full power mode */
  	spl_gpio_output(gpio0, GPIO(BANK_B, 5), 1);
  }
+
  #endif
configs/roc-pc-mezzanine-rk3399_defconfig +3 -1
index 15d511741f..9a01de454f 100644
@@ -19,7 +19,8 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc-mezzanine.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
  CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x20000
+CONFIG_SPL_ENV_SUPPORT=y
  CONFIG_SPL_SPI_LOAD=y
  CONFIG_TPL=y
  CONFIG_CMD_BOOTZ=y
@@ -34,6 +35,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-roc-pc-mezzanine"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_ROCKCHIP_GPIO=y
  CONFIG_SYS_I2C_ROCKCHIP=y
  CONFIG_MISC=y
configs/roc-pc-rk3399_defconfig +3 -1
index 2a6d0d22c8..6181da763d 100644
@@ -19,7 +19,8 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc.dtb"
  CONFIG_DISPLAY_BOARDINFO_LATE=y
  # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
  CONFIG_SPL_STACK_R=y
-CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x20000
+CONFIG_SPL_ENV_SUPPORT=y
  CONFIG_SPL_SPI_LOAD=y
  CONFIG_TPL=y
  CONFIG_CMD_BOOTZ=y
@@ -33,6 +34,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-roc-pc"
  CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_ROCKCHIP_GPIO=y
  CONFIG_SYS_I2C_ROCKCHIP=y
  CONFIG_MISC=y
#9 lore raw
In reply to Jagan Teki
Quoted 31 lines · Jagan Teki

This series supports custom initialization code required for roc-rk3399-pc board on SPL stage.

Now this series is well mature code handling to add custom spl_board_init code parts.

roc-rk3399-pc would require custom leds initialization based on user intervention of the power key. This code handles the user intervention via SPI environment variable. If someone or production systems wants this feature then 'pwr_key' has to be set otherwise it is normal like other rk3399 boards in Mainline.

Changes for v6:
- use spl board init code for led_setup
Changes for v5:
- drop banner changes
- add code changes in roc-pc-rk3399.c
Changes for v4:
- enable SPL_BOARD_INIT in all platforms
Changes for v3:
- support leds on SPL
- support env 'pwr_key'

Jagan Teki (5):
rockchip: rk3399: Add weak led_setup()
rockchip: roc-rk3399-pc: Add custom led_setup()
rockchip: Don't clear the reset status reg
rockchip: Separate the reset cause from display cpuinfo
rockchip: roc-rk3399-pc: Set LED only during POR and pwr_key=y

Quoted 9 lines
  arch/arm/include/asm/arch-rockchip/cru.h    |  3 +-
  arch/arm/mach-rockchip/Makefile             |  5 ++-
  arch/arm/mach-rockchip/cpu-info.c           | 26 ++++++-----
  arch/arm/mach-rockchip/rk3399/rk3399.c      |  6 +++
  arch/arm/mach-rockchip/tpl.c                |  7 ---
  board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 48 +++++++++++++++++----
  configs/roc-pc-mezzanine-rk3399_defconfig   |  6 ++-
  configs/roc-pc-rk3399_defconfig             |  6 ++-
  8 files changed, 71 insertions(+), 36 deletions(-)

Applied to u-boot-rockchip master for this patch set, thanks.