[PATCH v2 1/5] rockchip: Separate the reset cause from display cpuinfo

[Suniel Mahesh]

On Thu, Mar 19, 2020 at 3:43 PM Jagan Teki <jagan at amarulasolutions.com> wrote:
>
> 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 <jagan at amarulasolutions.com>
> ---
> Changes for v2:
> - 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(-)
>
> diff --git a/arch/arm/include/asm/arch-rockchip/cru.h b/arch/arm/include/asm/arch-rockchip/cru.h
> index 5cf2aec11a..b2ffc57c7d 100644
> --- a/arch/arm/include/asm/arch-rockchip/cru.h
> +++ b/arch/arm/include/asm/arch-rockchip/cru.h
> @@ -27,4 +27,6 @@ enum {
>
>  #define MHz            1000000
>
> +char *get_reset_cause(void);
> +
>  #endif /* _ROCKCHIP_CLOCK_H */
> diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile
> index 5b38526fe0..ef4898e00c 100644
> --- a/arch/arm/mach-rockchip/Makefile
> +++ b/arch/arm/mach-rockchip/Makefile
> @@ -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
> diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c
> index 4b0e99299a..ee0ec3d082 100644
> --- a/arch/arm/mach-rockchip/cpu-info.c
> +++ b/arch/arm/mach-rockchip/cpu-info.c
> @@ -11,7 +11,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;
> @@ -39,12 +39,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.
> @@ -54,12 +48,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
> --
> 2.17.1
>

Tested-by: Suniel Mahesh <sunil at amarulasolutions.com>