ARM: imx8m: Don't use the addr parameter of reset_cpu()

[oweals/u-boot.git] / arch / arm / mach-imx / imx8m / soc.c

diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 9a203e473605ea365072c6151cf46e160fb3c2f7..89229da3b62ac131a651711164a3178b40f11e11 100644 (file)
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <cpu_func.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
@@ -56,7 +57,7 @@ void enable_tzc380(void)
        /* Enable TZASC and lock setting */
        setbits_le32(&gpr->gpr[10], GPR_TZASC_EN);
        setbits_le32(&gpr->gpr[10], GPR_TZASC_EN_LOCK);
-       if (is_imx8mm() || is_imx8mn())
+       if (is_imx8mm() || is_imx8mn() || is_imx8mp())
                setbits_le32(&gpr->gpr[10], BIT(1));
        /*
         * set Region 0 attribute to allow secure and non-secure
@@ -164,7 +165,13 @@ static u32 get_cpu_variant_type(u32 type)
 
        u32 value = readl(&fuse->tester4);
 
-       if (type == MXC_CPU_IMX8MM) {
+       if (type == MXC_CPU_IMX8MQ) {
+               if ((value & 0x3) == 0x2)
+                       return MXC_CPU_IMX8MD;
+               else if (value & 0x200000)
+                       return MXC_CPU_IMX8MQL;
+
+       } else if (type == MXC_CPU_IMX8MM) {
                switch (value & 0x3) {
                case 2:
                        if (value & 0x1c0000)
@@ -181,6 +188,23 @@ static u32 get_cpu_variant_type(u32 type)
                                return MXC_CPU_IMX8MML;
                        break;
                }
+       } else if (type == MXC_CPU_IMX8MN) {
+               switch (value & 0x3) {
+               case 2:
+                       if (value & 0x1000000)
+                               return MXC_CPU_IMX8MNDL;
+                       else
+                               return MXC_CPU_IMX8MND;
+               case 3:
+                       if (value & 0x1000000)
+                               return MXC_CPU_IMX8MNSL;
+                       else
+                               return MXC_CPU_IMX8MNS;
+               default:
+                       if (value & 0x1000000)
+                               return MXC_CPU_IMX8MNL;
+                       break;
+               }
        }
 
        return type;
@@ -196,9 +220,12 @@ u32 get_cpu_rev(void)
 
        reg &= 0xff;
 
-       /* i.MX8MM */
-       if (major_low == 0x42) {
-               return (MXC_CPU_IMX8MN << 12) | reg;
+       /* iMX8MP */
+       if (major_low == 0x43) {
+               return (MXC_CPU_IMX8MP << 12) | reg;
+       } else if (major_low == 0x42) {
+               /* iMX8MN */
+               type = get_cpu_variant_type(MXC_CPU_IMX8MN);
        } else if (major_low == 0x41) {
                type = get_cpu_variant_type(MXC_CPU_IMX8MM);
        } else {
@@ -216,11 +243,14 @@ u32 get_cpu_rev(void)
                                        readl((void __iomem *)ROM_VERSION_A0);
                                if (rom_version != CHIP_REV_1_0) {
                                        rom_version = readl((void __iomem *)ROM_VERSION_B0);
+                                       rom_version &= 0xff;
                                        if (rom_version == CHIP_REV_2_0)
                                                reg = CHIP_REV_2_0;
                                }
                        }
                }
+
+               type = get_cpu_variant_type(type);
        }
 
        return (type << 12) | reg;
@@ -359,16 +389,18 @@ int ft_system_setup(void *blob, bd_t *bd)
                        if (nodeoff < 0)
                                continue; /* Not found, skip it */
 
-                       printf("Found %s node\n", nodes_path[i]);
+                       debug("Found %s node\n", nodes_path[i]);
 
                        rc = fdt_delprop(blob, nodeoff, "cpu-idle-states");
+                       if (rc == -FDT_ERR_NOTFOUND)
+                               continue;
                        if (rc) {
                                printf("Unable to update property %s:%s, err=%s\n",
                                       nodes_path[i], "status", fdt_strerror(rc));
                                return rc;
                        }
 
-                       printf("Remove %s:%s\n", nodes_path[i],
+                       debug("Remove %s:%s\n", nodes_path[i],
                               "cpu-idle-states");
                }
        }
@@ -377,21 +409,42 @@ int ft_system_setup(void *blob, bd_t *bd)
 }
 #endif
 
-#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYSRESET)
+#if !CONFIG_IS_ENABLED(SYSRESET)
 void reset_cpu(ulong addr)
 {
-       struct watchdog_regs *wdog = (struct watchdog_regs *)addr;
+       struct watchdog_regs *wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR;
 
-       if (!addr)
-              wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR;
+       /* Clear WDA to trigger WDOG_B immediately */
+       writew((SET_WCR_WT(1) | WCR_WDT | WCR_WDE | WCR_SRS), &wdog->wcr);
 
-       /* Clear WDA to trigger WDOG_B immediately */
-       writew((WCR_WDE | WCR_SRS), &wdog->wcr);
+       while (1) {
+               /*
+                * spin for .5 seconds before reset
+                */
+       }
+}
+#endif
+
+#if defined(CONFIG_ARCH_MISC_INIT)
+static void acquire_buildinfo(void)
+{
+       u64 atf_commit = 0;
+
+       /* Get ARM Trusted Firmware commit id */
+       atf_commit = call_imx_sip(IMX_SIP_BUILDINFO,
+                                 IMX_SIP_BUILDINFO_GET_COMMITHASH, 0, 0, 0);
+       if (atf_commit == 0xffffffff) {
+               debug("ATF does not support build info\n");
+               atf_commit = 0x30; /* Display 0, 0 ascii is 0x30 */
+       }
 
-       while (1) {
-               /*
-                * spin for .5 seconds before reset
-                */
-       }
+       printf("\n BuildInfo:\n  - ATF %s\n\n", (char *)&atf_commit);
+}
+
+int arch_misc_init(void)
+{
+       acquire_buildinfo();
+
+       return 0;
 }
 #endif