]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
imx8ulp: soc: correct reset cause
authorPeng Fan <peng.fan@nxp.com>
Sat, 7 Aug 2021 08:01:06 +0000 (16:01 +0800)
committerStefano Babic <sbabic@denx.de>
Mon, 9 Aug 2021 12:46:51 +0000 (14:46 +0200)
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

index 0728cb984772b223c4ae879951f3b2505c8b724a..9bdbe3c8462af219f66ae46aadc4de3fc2da82c2 100644 (file)
@@ -149,8 +149,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;
@@ -163,9 +161,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:
@@ -175,7 +171,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:
@@ -193,7 +189,7 @@ static char *get_reset_cause(char *ret)
                }
                break;
        default:
-               sprintf(ret, "%s-%X", "UNKN", cause1);
+               sprintf(ret, "%s-%X", "UNKN", srs);
                break;
        }