roc-rk3399-pc: Custom SPL init
Subsystems (3)
v4 cover roc-rk3399-pc: Custom SPL init
This series supports custom initialization code required for roc-rk3399-pc board on SPL stage.
Here is the previous v3 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 v4:
- enable SPL_BOARD_INIT in all platforms
Changes for v3:
- support leds on SPL
- support env 'pwr_key'
[1] https://patchwork.ozlabs.org/project/uboot/cover/[email protected]
Any inputs?
Jagan.
Jagan Teki (5):
rockchip: spl: Add spl_board_init
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/Kconfig | 1 + arch/arm/include/asm/arch-rockchip/cru.h | 2 + arch/arm/mach-rockchip/Kconfig | 2 - arch/arm/mach-rockchip/Makefile | 5 +- arch/arm/mach-rockchip/cpu-info.c | 20 +++--- arch/arm/mach-rockchip/rk3188/rk3188.c | 2 +- arch/arm/mach-rockchip/rk3399/rk3399.c | 57 ----------------- arch/arm/mach-rockchip/spl.c | 11 ++++ arch/arm/mach-rockchip/tpl.c | 7 --- board/firefly/firefly-rk3288/firefly-rk3288.c | 2 +- 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 +++++++++++++++++ board/phytec/phycore_rk3288/phycore-rk3288.c | 2 +- .../puma_rk3399/puma-rk3399.c | 61 +++++++++++++++++++ configs/roc-pc-mezzanine-rk3399_defconfig | 6 +- configs/roc-pc-rk3399_defconfig | 6 +- 17 files changed, 162 insertions(+), 103 deletions(-) create mode 100644 board/firefly/roc-pc-rk3399/spl.c
Signature · 1 line
2.25.1
A message that is not in the archive (sent off-list or not yet received): 20200618153948.218506-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org
PATCH v4 1/5 rockchip: spl: Add spl_board_init
spl_board_init is a proper location and common practice option to have a custom board initialization code after relocation in SPL.
This patch add the feasibility to add the custom SPL board initzlaization throughout rockchip platforms and adjust existing the spl board code on respective boards.
---
Changes for v4:
- new patch
arch/arm/Kconfig | 1 + arch/arm/mach-rockchip/Kconfig | 2 - arch/arm/mach-rockchip/rk3188/rk3188.c | 2 +- arch/arm/mach-rockchip/rk3399/rk3399.c | 57 ----------------- arch/arm/mach-rockchip/spl.c | 10 +++ board/firefly/firefly-rk3288/firefly-rk3288.c | 2 +- board/phytec/phycore_rk3288/phycore-rk3288.c | 2 +- .../puma_rk3399/puma-rk3399.c | 61 +++++++++++++++++++ 8 files changed, 75 insertions(+), 62 deletions(-)
arch/arm/Kconfig +1 -0
@@ -1679,6 +1679,7 @@ config ARCH_ROCKCHIP select ENABLE_ARM_SOC_BOOT0_HOOK select OF_CONTROL select SPI + select SPL_BOARD_INIT if SPL select SPL_DM if SPL select SYS_MALLOC_F select SYS_THUMB_BUILD if !ARM64
arch/arm/mach-rockchip/Kconfig +0 -2
@@ -49,7 +49,6 @@ config ROCKCHIP_RK3128 config ROCKCHIP_RK3188 bool "Support Rockchip RK3188" select CPU_V7A - select SPL_BOARD_INIT if SPL select SUPPORT_SPL select SPL select SPL_CLK
@@ -208,7 +207,6 @@ config ROCKCHIP_RK3399 select SPL select SPL_ATF select SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF - select SPL_BOARD_INIT if SPL select SPL_LOAD_FIT select SPL_CLK if SPL select SPL_PINCTRL if SPL
arch/arm/mach-rockchip/rk3188/rk3188.c +1 -1
@@ -111,7 +111,7 @@ static int setup_led(void)return 0 ; } -void spl_board_init (void ) +void rk_spl_board_init (void ) {int ret;
arch/arm/mach-rockchip/rk3399/rk3399.c +0 -57
61 lines not on this page · raw message
arch/arm/mach-rockchip/spl.c +10 -0
@@ -150,6 +150,16 @@ void board_init_f(ulong dummy)preloader_console_init (); } +__weak void rk_spl_board_init (void ) +{ +} + +void spl_board_init (void ) +{ +/* board specific spl init */ +rk_spl_board_init (); +} +#ifdef CONFIG_SPL_LOAD_FIT int __weak board_fit_config_name_match (const char *name) {
board/firefly/firefly-rk3288/firefly-rk3288.c +1 -1
@@ -31,7 +31,7 @@ static int setup_led(void)return 0 ; } -void spl_board_init (void ) +void rk_spl_board_init (void ) {int ret;
board/phytec/phycore_rk3288/phycore-rk3288.c +1 -1
@@ -104,7 +104,7 @@ static int phycore_init(void) }#endif -void spl_board_init (void ) +void rk_spl_board_init (void ) {#if !defined(CONFIG_SPL_OF_PLATDATA )int ret;
board/theobroma-systems/puma_rk3399/puma-rk3399.c +61 -0
64 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v4 1/5] rockchip: spl: Add spl_board_init
Hi Jagan,
Quoted 7 lines · Jagan Teki
spl_board_initis a proper location and common practice option to have a custom board initialization code after relocation in SPL.This patch add the feasibility to add the custom SPL board initzlaization throughout rockchip platforms and adjust existing the spl board code on respective boards.
You make this change because you want to add customize code for led, right?
I think led is a common feature for SBC bring up, could you make it common instead
of custom for one board? eg. there is already "u-boot,boot-led", and led class driver
for gpio led.
For the TPL/SPL framework, drop the code in TPL is necessary, but it would be better
not to use too much layer in SPL board_init, and make it common for common featrure.
Thanks,
- Kever
Quoted 243 lines
Signed-off-by Jagan Teki <[email protected]>---
Changes for v4:
- new patcharch/arm/Kconfig | 1 + arch/arm/mach-rockchip/Kconfig | 2 - arch/arm/mach-rockchip/rk3188/rk3188.c | 2 +- arch/arm/mach-rockchip/rk3399/rk3399.c | 57 ----------------- arch/arm/mach-rockchip/spl.c | 10 +++ board/firefly/firefly-rk3288/firefly-rk3288.c | 2 +- board/phytec/phycore_rk3288/phycore-rk3288.c | 2 +- .../puma_rk3399/puma-rk3399.c | 61 +++++++++++++++++++ 8 files changed, 75 insertions(+), 62 deletions(-)arch/arm/Kconfig +1
-0@@ -1679,6 +1679,7 @@ config ARCH_ROCKCHIP select ENABLE_ARM_SOC_BOOT0_HOOK select OF_CONTROL select SPI + select SPL_BOARD_INIT if SPL select SPL_DM if SPL select SYS_MALLOC_F select SYS_THUMB_BUILD if !ARM64arch/arm/mach-rockchip/Kconfig +0
-2@@ -49,7 +49,6 @@ config ROCKCHIP_RK3128 config ROCKCHIP_RK3188 bool "Support Rockchip RK3188" select CPU_V7A - select SPL_BOARD_INIT if SPL select SUPPORT_SPL select SPL select SPL_CLK@@ -208,7 +207,6 @@ config ROCKCHIP_RK3399 select SPL select SPL_ATF select SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF - select SPL_BOARD_INIT if SPL select SPL_LOAD_FIT select SPL_CLK if SPL select SPL_PINCTRL if SPLarch/arm/mach-rockchip/rk3188/rk3188.c +1
-1@@ -111,7 +111,7 @@ static int setup_led(void)return 0 ; } -void spl_board_init (void ) +void rk_spl_board_init (void ) {int ret;arch/arm/mach-rockchip/rk3399/rk3399.c +0
-57@@ -217,61 +217,4 @@ void spl_perform_fixups(struct spl_image_info *spl_image) "u-boot,spl-boot-device", boot_ofpath); } -#if defined(SPL_GPIO_SUPPORT ) -static void rk3399_force_power_on_reset (void ) -{ -ofnode node; -struct gpio_desc sysreset_gpio; - -debug ("%s: trying to force a power-on reset\n" , __func__); - - node =ofnode_path ("/config" ); -if (!ofnode_valid (node)) { -debug ("%s: no /config node?\n" , __func__); -return ; - } - -if (gpio_request_by_name_nodev (node,"sysreset-gpio" ,0 , - &sysreset_gpio,GPIOD_IS_OUT )) { -debug ("%s: could not find a /config/sysreset-gpio\n" , __func__); -return ; - } - -dm_gpio_set_value (&sysreset_gpio,1 ); -} -#endif - -void spl_board_init (void ) -{ -#if defined(SPL_GPIO_SUPPORT ) -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 - -#if defined(SPL_DM_REGULATOR ) -/* -* Turning the eMMC and SPI back on (if disabled via the Qseven -* BIOS_ENABLE) signal is done through a always-on regulator). -*/ -if (regulators_enable_boot_on (false)) -debug ("%s: Cannot enable boot on regulator\n" , __func__); -#endif -}#endif arch/arm/mach-rockchip/spl.c +10
-0@@ -150,6 +150,16 @@ void board_init_f(ulong dummy)preloader_console_init (); } +__weak void rk_spl_board_init (void ) +{ +} + +void spl_board_init (void ) +{ +/* board specific spl init */ +rk_spl_board_init (); +} +#ifdef CONFIG_SPL_LOAD_FIT int __weak board_fit_config_name_match (const char *name) {board/firefly/firefly-rk3288/firefly-rk3288.c +1
-1@@ -31,7 +31,7 @@ static int setup_led(void)return 0 ; } -void spl_board_init (void ) +void rk_spl_board_init (void ) {int ret;board/phytec/phycore_rk3288/phycore-rk3288.c +1
-1@@ -104,7 +104,7 @@ static int phycore_init(void) }#endif -void spl_board_init (void ) +void rk_spl_board_init (void ) {#if !defined(CONFIG_SPL_OF_PLATDATA )int ret;board/theobroma-systems/puma_rk3399/puma-rk3399.c +61
-0@@ -152,3 +152,64 @@ void get_board_serial(struct tag_serialnr *serialnr) serialnr->low = (u32)(serial &0xffffffff ); }#endif + +#if defined(CONFIG_SPL_BUILD ) + +#if defined(SPL_GPIO_SUPPORT ) +static void rk3399_force_power_on_reset (void ) +{ +ofnode node; +struct gpio_desc sysreset_gpio; + +debug ("%s: trying to force a power-on reset\n" , __func__); + + node =ofnode_path ("/config" ); +if (!ofnode_valid (node)) { +debug ("%s: no /config node?\n" , __func__); +return ; + } + +if (gpio_request_by_name_nodev (node,"sysreset-gpio" ,0 , + &sysreset_gpio,GPIOD_IS_OUT )) { +debug ("%s: could not find a /config/sysreset-gpio\n" , __func__); +return ; + } + +dm_gpio_set_value (&sysreset_gpio,1 ); +} +#endif + +void rk_spl_board_init (void ) +{ +#if defined(SPL_GPIO_SUPPORT ) +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 + +#if defined(SPL_DM_REGULATOR ) +/* +* Turning the eMMC and SPI back on (if disabled via the Qseven +* BIOS_ENABLE) signal is done through a always-on regulator). +*/ +if (regulators_enable_boot_on (false)) +debug ("%s: Cannot enable boot on regulator\n" , __func__); +#endif +} +#endif /* CONFIG_SPL_BUILD */
PATCH v4 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 v4:
- none
arch/arm/mach-rockchip/spl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-rockchip/spl.c +2 -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 (); }__weak void rk_spl_board_init (void )
@@ -158,6 +157,8 @@ void spl_board_init(void) {/* board specific spl init */ rk_spl_board_init (); + +preloader_console_init (); }#ifdef CONFIG_SPL_LOAD_FIT
Signature · 7 lines
2.25.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v4 2/5] rk3399: spl: Print SPL banner after relocation
Hi Jagan,
Quoted 12 lines · Jagan Teki
Usually printing the SPL banner varies between architecture or board codes.
- Some would print before relocation at the endboard_init_ffor 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 thespl_board_initfor 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.
Quoted 6 lines
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.
I don't agree, the banner is tell people we are in SPL now, we should print it as soon as
possible, if any of step like led, env, relocate and etc fails, then user can not see anything,
they don't event know if we have get into SPL. The update of leds and env does not depends
on banner print.
Thanks,
- Kever
Quoted 38 lines
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.
Signed-off-by Jagan Teki <[email protected]>Tested-by Suniel Mahesh <[email protected]>---
Changes for v4:
- nonearch/arm/mach-rockchip/spl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/arm/mach-rockchip/spl.c +2
-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 (); }__weak void rk_spl_board_init (void )@@ -158,6 +157,8 @@ void spl_board_init(void) {/* board specific spl init */ rk_spl_board_init (); + +preloader_console_init (); }#ifdef CONFIG_SPL_LOAD_FIT
Re: [PATCH v4 2/5] rk3399: spl: Print SPL banner after relocation
Hi Kever,
Quoted 26 lines · Kever Yang
Hi Jagan,
Quoted 12 lines · Jagan Teki
Usually printing the SPL banner varies between architecture or board codes.
- Some would print before relocation at the endboard_init_ffor 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 thespl_board_initfor 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.Quoted 6 lines
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.
I don't agree, the banner is tell people we are in SPL now, we should print it as soon as
Quoted 7 lines
possible, if any of step like led, env, relocate and etc fails, then user can not see anything,
they don't event know if we have get into SPL. The update of leds and env does not depends
on banner print.
It is unsafe or sometimes won't work if we do leds, env at _f due to memory availability. Since we have debug uart at _f and moving spl banner to relocation will make the debug available possible in relocation code.
Jagan.
PATCH v4 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 v4:
- none
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
@@ -20,7 +21,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
@@ -20,7 +21,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
Re: [PATCH v4 3/5] roc-rk3399-pc: Move leds setup in SPL
Quoted 66 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.
So, this patch moves the leds code from TPL into SPL after relocation.
Signed-off-by Jagan Teki <[email protected]>Tested-by Suniel Mahesh <[email protected]>---
Changes for v4:
- nonearch/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.carch/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 +endifboard/firefly/roc-pc-rk3399/roc-pc-rk3399.c +0
-0
board/firefly/roc-pc-rk3399/roc-pc-rk3399.c line 13
Quoted 8 lines
board/firefly/roc-pc-rk3399/roc-pc-rk3399.c +0
-4@@ -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>
It will be better to use CONFIG_SPL_BUILD for SPL code in this file instead of
add a new file.
Many other boards will follow up to add this new file, I don't think this is a good idea.
Thanks,
- Kever
Quoted 94 lines
board/firefly/roc-pc-rk3399/roc-pc-rk3399.c +0
-17-#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@@ -20,7 +21,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=yconfigs/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@@ -20,7 +21,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
PATCH v4 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 v4:
- 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.25.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v4 4/5] rockchip: Separate the reset cause from display cpuinfo
HI Jagan,
Quoted 29 lines · 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.
Signed-off-by Jagan Teki <[email protected]>Tested-by Suniel Mahesh <[email protected]>---
Changes for v4:
- nonearch/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 +0
-0
arch/arm/include/asm/arch-rockchip/cru.h enum { · line 34
Quoted 4 lines
arch/arm/include/asm/arch-rockchip/cru.h +1
-0@@ -31,4 +31,6 @@ enum {#define MHz 1000000 +char *get_reset_cause (void );
Since you add a environment, you should use that instead of export get_reset_cause().
arch/arm/mach-rockchip/Makefile obj-tpl-$(CONFIG_ROCKCHIP_PX30) += px30-board-tpl.o · line 20
Quoted 13 lines
arch/arm/include/asm/arch-rockchip/cru.h +1
-0+#endif /* _ROCKCHIP_CLOCK_H */ arch/arm/mach-rockchip/Makefile +3
-0@@ -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
This change is not need, if the soc does not support this feature, they should not enable
CONFIG_DISPLAY_CPUINFO.
Thanks,
- Kever
Quoted 62 lines
arch/arm/mach-rockchip/Makefile +1
-1+ 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 endifarch/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
Re: [PATCH v4 4/5] rockchip: Separate the reset cause from display cpuinfo
Hi Kever,
Quoted 34 lines · Kever Yang
HI Jagan,
Quoted 30 lines · 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.
Signed-off-by Jagan Teki <[email protected]>Tested-by Suniel Mahesh <[email protected]>---
Changes for v4:
- nonearch/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 +0
-0@@ -31,4 +31,6 @@ enum {
Quoted 6 lines
arch/arm/include/asm/arch-rockchip/cru.h enum { · line 34
Quoted 3 lines
arch/arm/include/asm/arch-rockchip/cru.h +1
-0#define MHz 1000000 +char *get_reset_cause (void );Since you add a environment, you should use that instead of export
get_reset_cause().
Yes we can read reset_reason env in SPL but there is a fundamental issue with this, say the previous reset cause is RST so the env set to RST. For next power-on reset the reset_reason still shows RST since it was updated previously but the actual cause of the reset is POR.
Jagan.
PATCH v4 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 v4:
- none
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
@@ -18,7 +18,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
@@ -33,6 +34,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
@@ -18,7 +18,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
@@ -32,6 +33,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