imx: imx8qm/qxp: Fix issue in get_effective_memsize
[oweals/u-boot.git] / arch / arm / mach-imx / imx8 / cpu.c
index 53f9a8735ad6dcd41bc38fc851019879c655a73a..2c79bd009159502b79e243fcd0501d32afd496e3 100644 (file)
@@ -6,11 +6,14 @@
 #include <common.h>
 #include <clk.h>
 #include <cpu.h>
+#include <cpu_func.h>
 #include <dm.h>
+#include <init.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/uclass.h>
 #include <errno.h>
+#include <thermal.h>
 #include <asm/arch/sci/sci.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch-imx/cpu.h>
@@ -59,18 +62,18 @@ int arch_cpu_init_dm(void)
        int node, ret;
 
        node = fdt_node_offset_by_compatible(gd->fdt_blob, -1, "fsl,imx8-mu");
-       ret = device_bind_driver_to_node(gd->dm_root, "imx8_scu", "imx8_scu",
-                                        offset_to_ofnode(node), &devp);
 
+       ret = uclass_get_device_by_of_offset(UCLASS_MISC, node, &devp);
        if (ret) {
-               printf("could not find scu %d\n", ret);
+               printf("could not get scu %d\n", ret);
                return ret;
        }
 
-       ret = device_probe(devp);
-       if (ret) {
-               printf("scu probe failed %d\n", ret);
-               return ret;
+       if (is_imx8qm()) {
+               ret = sc_pm_set_resource_power_mode(-1, SC_R_SMMU,
+                                                   SC_PM_PW_MODE_ON);
+               if (ret)
+                       return ret;
        }
 
        return 0;
@@ -220,7 +223,7 @@ static int get_owned_memreg(sc_rm_mr_t mr, sc_faddr_t *addr_start,
 phys_size_t get_effective_memsize(void)
 {
        sc_rm_mr_t mr;
-       sc_faddr_t start, end, end1;
+       sc_faddr_t start, end, end1, start_aligned;
        int err;
 
        end1 = (sc_faddr_t)PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE;
@@ -228,9 +231,9 @@ phys_size_t get_effective_memsize(void)
        for (mr = 0; mr < 64; mr++) {
                err = get_owned_memreg(mr, &start, &end);
                if (!err) {
-                       start = roundup(start, MEMSTART_ALIGNMENT);
+                       start_aligned = roundup(start, MEMSTART_ALIGNMENT);
                        /* Too small memory region, not use it */
-                       if (start > end)
+                       if (start_aligned > end)
                                continue;
 
                        /* Find the memory region runs the U-Boot */
@@ -474,10 +477,17 @@ u64 get_page_table_size(void)
 }
 #endif
 
+#if defined(CONFIG_IMX8QM)
+#define FUSE_MAC0_WORD0 452
+#define FUSE_MAC0_WORD1 453
+#define FUSE_MAC1_WORD0 454
+#define FUSE_MAC1_WORD1 455
+#elif defined(CONFIG_IMX8QXP)
 #define FUSE_MAC0_WORD0 708
 #define FUSE_MAC0_WORD1 709
 #define FUSE_MAC1_WORD0 710
 #define FUSE_MAC1_WORD1 711
+#endif
 
 void imx_get_mac_from_fuse(int dev_id, unsigned char *mac)
 {
@@ -526,135 +536,3 @@ u32 get_cpu_rev(void)
 
        return (id << 12) | rev;
 }
-
-#if CONFIG_IS_ENABLED(CPU)
-struct cpu_imx_platdata {
-       const char *name;
-       const char *rev;
-       const char *type;
-       u32 cpurev;
-       u32 freq_mhz;
-};
-
-const char *get_imx8_type(u32 imxtype)
-{
-       switch (imxtype) {
-       case MXC_CPU_IMX8QXP:
-       case MXC_CPU_IMX8QXP_A0:
-               return "QXP";
-       case MXC_CPU_IMX8QM:
-               return "QM";
-       default:
-               return "??";
-       }
-}
-
-const char *get_imx8_rev(u32 rev)
-{
-       switch (rev) {
-       case CHIP_REV_A:
-               return "A";
-       case CHIP_REV_B:
-               return "B";
-       default:
-               return "?";
-       }
-}
-
-const char *get_core_name(void)
-{
-       if (is_cortex_a35())
-               return "A35";
-       else if (is_cortex_a53())
-               return "A53";
-       else if (is_cortex_a72())
-               return "A72";
-       else
-               return "?";
-}
-
-int cpu_imx_get_desc(struct udevice *dev, char *buf, int size)
-{
-       struct cpu_imx_platdata *plat = dev_get_platdata(dev);
-
-       if (size < 100)
-               return -ENOSPC;
-
-       snprintf(buf, size, "NXP i.MX8%s Rev%s %s at %u MHz\n",
-                plat->type, plat->rev, plat->name, plat->freq_mhz);
-
-       return 0;
-}
-
-static int cpu_imx_get_info(struct udevice *dev, struct cpu_info *info)
-{
-       struct cpu_imx_platdata *plat = dev_get_platdata(dev);
-
-       info->cpu_freq = plat->freq_mhz * 1000;
-       info->features = BIT(CPU_FEAT_L1_CACHE) | BIT(CPU_FEAT_MMU);
-       return 0;
-}
-
-static int cpu_imx_get_count(struct udevice *dev)
-{
-       return 4;
-}
-
-static int cpu_imx_get_vendor(struct udevice *dev,  char *buf, int size)
-{
-       snprintf(buf, size, "NXP");
-       return 0;
-}
-
-static const struct cpu_ops cpu_imx8_ops = {
-       .get_desc       = cpu_imx_get_desc,
-       .get_info       = cpu_imx_get_info,
-       .get_count      = cpu_imx_get_count,
-       .get_vendor     = cpu_imx_get_vendor,
-};
-
-static const struct udevice_id cpu_imx8_ids[] = {
-       { .compatible = "arm,cortex-a35" },
-       { .compatible = "arm,cortex-a53" },
-       { }
-};
-
-static ulong imx8_get_cpu_rate(void)
-{
-       ulong rate;
-       int ret;
-
-       ret = sc_pm_get_clock_rate(-1, SC_R_A35, SC_PM_CLK_CPU,
-                                  (sc_pm_clock_rate_t *)&rate);
-       if (ret) {
-               printf("Could not read CPU frequency: %d\n", ret);
-               return 0;
-       }
-
-       return rate;
-}
-
-static int imx8_cpu_probe(struct udevice *dev)
-{
-       struct cpu_imx_platdata *plat = dev_get_platdata(dev);
-       u32 cpurev;
-
-       cpurev = get_cpu_rev();
-       plat->cpurev = cpurev;
-       plat->name = get_core_name();
-       plat->rev = get_imx8_rev(cpurev & 0xFFF);
-       plat->type = get_imx8_type((cpurev & 0xFF000) >> 12);
-       plat->freq_mhz = imx8_get_cpu_rate() / 1000000;
-       return 0;
-}
-
-U_BOOT_DRIVER(cpu_imx8_drv) = {
-       .name           = "imx8x_cpu",
-       .id             = UCLASS_CPU,
-       .of_match       = cpu_imx8_ids,
-       .ops            = &cpu_imx8_ops,
-       .probe          = imx8_cpu_probe,
-       .platdata_auto_alloc_size = sizeof(struct cpu_imx_platdata),
-       .flags          = DM_FLAG_PRE_RELOC,
-};
-#endif