roc-rk3399-pc: Custom SPL init
Subsystems (3)
v3 cover roc-rk3399-pc: Custom SPL init
This series supports custom initialization code required for roc-rk3399-pc board on SPL stage. I have marked it as v3, since we have tried this before on this series[1].
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 v3:
- support leds on SPL
- support env 'pwr_key'
Any inputs?
Jagan.
Jagan Teki (5):
rk3399: spl: Add rk_spl_board_init as __weak
rk3399: spl: Print SPL banner after relocation
roc-rk3399-pc: Move leds setup in SPL
rockchip: Separate the reset cause from display cpuinfo
roc-rk3399-pc: Set LED only during POR and pwr_key=y
arch/arm/include/asm/arch-rockchip/cru.h | 2 + arch/arm/mach-rockchip/Makefile | 5 +- arch/arm/mach-rockchip/cpu-info.c | 20 +++++--- arch/arm/mach-rockchip/rk3399/rk3399.c | 11 +++- arch/arm/mach-rockchip/spl.c | 1 - arch/arm/mach-rockchip/tpl.c | 7 --- board/firefly/roc-pc-rk3399/Makefile | 4 ++ board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 21 -------- board/firefly/roc-pc-rk3399/spl.c | 56 +++++++++++++++++++++ configs/roc-pc-mezzanine-rk3399_defconfig | 6 ++- configs/roc-pc-rk3399_defconfig | 6 ++- 11 files changed, 96 insertions(+), 43 deletions(-) create mode 100644 board/firefly/roc-pc-rk3399/spl.c
Signature · 1 line
2.20.1
A message that is not in the archive (sent off-list or not yet received): 20200608183144.26809-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org
PATCH v3 1/5 rk3399: spl: Add rk_spl_board_init as __weak
Current spl_board_init is mostly specific to puma-rk3399 target and in other words it cannot be required or useful for other rk3399 boards.
Some boards require their custom initialization to be part of spl_board_init like roc-rk3399-pc require leds setup, environments.
So, this patch handles all these possible scenarios. Add rk_spl_board_init as __weak so that boards that require their own custom initialization can be defined on their board file.
---
Changes for v3:
- new patch
arch/arm/mach-rockchip/rk3399/rk3399.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/arm/mach-rockchip/rk3399/rk3399.c +8 -1
@@ -241,7 +241,7 @@ static void rk3399_force_power_on_reset(void) }#endif -void spl_board_init (void ) +__weak void rk_spl_board_init (void ) {#if defined(SPL_GPIO_SUPPORT )struct rockchip_cru *cru =rockchip_get_cru ();
@@ -274,4 +274,11 @@ void spl_board_init(void)debug ("%s: Cannot enable boot on regulator\n" , __func__); #endif } + +void spl_board_init (void ) +{ +/* board specific spl init */ +rk_spl_board_init (); +} +#endif
Signature · 1 line
2.20.1
PATCH v3 2/5 rk3399: spl: Print SPL banner after relocation
In reply to a message not in the archiveUsually printing the SPL banner varies between architecture or board codes.
- Some would print before relocation at the end board_init_f for making sure all initialization prior to this would happen properly. if at all there is a requirement for serial init, that happens properly since it prints all after that.
- Some would print after relocation at the spl_board_init for making sure all initialization prior to relocation would happen properly. Also debug uart on these cases would be available before relocation. So debug support is available in before and after relocation.
Rockchip SPL is following formar step to print the banner at the end of board_init_f.
To support various custom use cases in SPL like leds, environment, board detections later options like printing the banner after relocation would be a better option. Printing banner would also help to support debugging availability between relocation codes, like debug uart available before relocation and banner availability after relation.
By demonstrating all the above use cases, this patch is trying to print the SPL banner after relocation.
---
Changes for v3:
- new patch
arch/arm/mach-rockchip/rk3399/rk3399.c | 2 ++ arch/arm/mach-rockchip/spl.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-rockchip/rk3399/rk3399.c +2 -0
@@ -279,6 +279,8 @@ void spl_board_init(void) {/* board specific spl init */ rk_spl_board_init (); + +preloader_console_init (); }#endif
arch/arm/mach-rockchip/spl.c +0 -1
@@ -147,7 +147,6 @@ void board_init_f(ulong dummy) gd->ram_top = gd->ram_base +get_effective_memsize (); gd->ram_top =board_get_usable_ram_top (gd->ram_size);#endif -preloader_console_init (); }#ifdef CONFIG_SPL_LOAD_FIT
Signature · 7 lines
2.20.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v3 3/5 roc-rk3399-pc: Move leds setup in SPL
In reply to a message not in the archiveroc-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 after relocation.
---
Changes for v3:
- new patch
arch/arm/mach-rockchip/tpl.c | 7 ------- board/firefly/roc-pc-rk3399/Makefile | 4 ++++ board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 21 ------------------- board/firefly/roc-pc-rk3399/spl.c | 23 +++++++++++++++++++++ configs/roc-pc-mezzanine-rk3399_defconfig | 2 +- configs/roc-pc-rk3399_defconfig | 2 +- 6 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 board/firefly/roc-pc-rk3399/spl.c
arch/arm/mach-rockchip/tpl.c +0 -7
@@ -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/Makefile +4 -0
@@ -4,4 +4,8 @@ # SPDX-License-Identifier: GPL-2.0+ # +ifdef CONFIG_SPL_BUILD +obj-y += spl.o +else obj-y += roc-pc-rk3399.o +endif
board/firefly/roc-pc-rk3399/roc-pc-rk3399.c +0 -21
@@ -6,13 +6,8 @@#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> -#include <asm/arch-rockchip/gpio.h> -#ifndef CONFIG_SPL_BUILD int board_early_init_f (void ) {struct udevice *regulator;
@@ -30,19 +25,3 @@ int board_early_init_f(void) out:return 0 ; } -#endif - -#if defined(CONFIG_TPL_BUILD ) - -#define GPIO0_BASE 0xff720000 - -int board_early_init_f (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
board/firefly/roc-pc-rk3399/spl.c new file +23 -0
@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (c) 2020 Amarula Solutions(India) +*/ + +#include <common.h> +#include <spl_gpio.h> +#include <asm/arch-rockchip/gpio.h> + +#define GPIO0_BASE 0xff720000 + +static 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 ); +} + +void rk_spl_board_init (void ) +{ +led_setup (); +}
configs/roc-pc-mezzanine-rk3399_defconfig +1 -1
@@ -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
@@ -19,7 +20,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
@@ -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
@@ -19,7 +20,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.20.1
PATCH v3 4/5 rockchip: Separate the reset cause from display cpuinfo
In reply to a message not in the archivereset 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 v3:
- none
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
@@ -31,4 +31,6 @@ enum {#define MHz 1000000 +char *get_reset_cause (void ); +#endif /* _ROCKCHIP_CLOCK_H */
arch/arm/mach-rockchip/Makefile +4 -1
@@ -15,6 +15,10 @@ obj-tpl-$(CONFIG_ROCKCHIP_PX30) += px30-board-tpl.o obj-spl-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o +ifeq ($(CONFIG_ROCKCHIP_RK3288)$(CONFIG_ROCKCHIP_RK3399), y) +obj-y += cpu-info.o +endif + ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),) # Always include boot_mode.o, as we bypass it (i.e. turn it off)
@@ -22,7 +26,6 @@ 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
arch/arm/mach-rockchip/cpu-info.c +12 -8
@@ -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,12 +41,6 @@ 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); -/* * Clear glb_rst_st, so we can determine the last reset cause * for following resets.
@@ -56,12 +50,22 @@ static char *get_reset_cause(void)return cause; } +#ifdef CONFIG_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 · 7 lines
2.20.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v3 5/5 roc-rk3399-pc: Set LED only during POR and pwr_key=y
In reply to a message not in the archiveROC-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 v3:
- new patch
board/firefly/roc-pc-rk3399/spl.c | 35 ++++++++++++++++++++++- configs/roc-pc-mezzanine-rk3399_defconfig | 4 ++- configs/roc-pc-rk3399_defconfig | 4 ++- 3 files changed, 40 insertions(+), 3 deletions(-)
board/firefly/roc-pc-rk3399/spl.c +34 -1
@@ -4,16 +4,49 @@*/ #include <common.h> +#include <env.h> #include <spl_gpio.h> +#include <asm/io.h> +#include <asm/arch-rockchip/cru.h> #include <asm/arch-rockchip/gpio.h> +#include <asm/arch-rockchip/grf_rk3399.h> +#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 +*/ static 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 ); }
configs/roc-pc-mezzanine-rk3399_defconfig +3 -1
@@ -17,7 +17,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
@@ -32,6 +33,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
@@ -17,7 +17,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
@@ -31,6 +32,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.20.1