[Patch V3 37/44] imx8ulp: soc: correct reset cause

Peng Fan (OSS)
2021-07-19T07:20:40Z

From: Peng Fan <peng.fan@nxp.com>

The CMC1 SRS reflects the current reset cause, not SSRS.

Then you could get "Reset cause: WARM-WDG" when issue reset in U-Boot.

Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
arch/arm/mach-imx/imx8ulp/soc.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c
index 513c4166c9..052169f5ff 100644
--- a/arch/arm/mach-imx/imx8ulp/soc.c
+++ b/arch/arm/mach-imx/imx8ulp/soc.c
@@ -148,8 +148,6 @@ enum bt_mode get_boot_mode(void)
#define CMC_SRS_POR BIT(1)
#define CMC_SRS_WUP BIT(0)

-static u32 reset_cause = -1;
-
static char *get_reset_cause(char *ret)
{
u32 cause1, cause = 0, srs = 0;
@@ -162,9 +160,7 @@ static char *get_reset_cause(char *ret)
srs = readl(reg_srs);
cause1 = readl(reg_ssrs);

- reset_cause = cause1;
-
- cause = cause1 & (CMC_SRS_POR | CMC_SRS_WUP | CMC_SRS_WARM);
+ cause = srs & (CMC_SRS_POR | CMC_SRS_WUP | CMC_SRS_WARM);

switch (cause) {
case CMC_SRS_POR:
@@ -174,7 +170,7 @@ static char *get_reset_cause(char *ret)
sprintf(ret, "%s", "WUP");
break;
case CMC_SRS_WARM:
- cause = cause1 & (CMC_SRS_WDG | CMC_SRS_SW |
+ cause = srs & (CMC_SRS_WDG | CMC_SRS_SW |
CMC_SRS_JTAG_RST);
switch (cause) {
case CMC_SRS_WDG:
@@ -192,7 +188,7 @@ static char *get_reset_cause(char *ret)
}
break;
default:
- sprintf(ret, "%s-%X", "UNKN", cause1);
+ sprintf(ret, "%s-%X", "UNKN", srs);
break;
}

--
2.30.0