1 files changed, 42 insertions, 16 deletions

diff --git a/arch/mips/mti-malta/malta-memory.c b/arch/mips/mti-malta/malta-memory.c
index 1f73d63e92a7..6d0f4ab3632d 100644
--- a/arch/mips/mti-malta/malta-memory.c
+++ b/arch/mips/mti-malta/malta-memory.c
@@ -24,22 +24,30 @@ static fw_memblock_t mdesc[FW_MAX_MEMBLOCKS];
 /* determined physical memory size, not overridden by command line args  */
 unsigned long physical_memsize = 0L;
 
-fw_memblock_t * __init fw_getmdesc(void)
+fw_memblock_t * __init fw_getmdesc(int eva)
 {
-        char *memsize_str, *ptr;
-        unsigned int memsize;
+        char *memsize_str, *ememsize_str __maybe_unused = NULL, *ptr;
+        unsigned long memsize, ememsize __maybe_unused = 0;
         static char cmdline[COMMAND_LINE_SIZE] __initdata;
-        long val;
         int tmp;
 
         /* otherwise look in the environment */
+
         memsize_str = fw_getenv("memsize");
-        if (!memsize_str) {
+        if (memsize_str)
+                tmp = kstrtol(memsize_str, 0, &memsize);
+        if (eva) {
+        /* Look for ememsize for EVA */
+                ememsize_str = fw_getenv("ememsize");
+                if (ememsize_str)
+                        tmp = kstrtol(ememsize_str, 0, &ememsize);
+        }
+        if (!memsize && !ememsize) {
                 pr_warn("memsize not set in YAMON, set to default (32Mb)\n");
                 physical_memsize = 0x02000000;
         } else {
-                tmp = kstrtol(memsize_str, 0, &val);
-                physical_memsize = (unsigned long)val;
+                /* If ememsize is set, then set physical_memsize to that */
+                physical_memsize = ememsize ? : memsize;
         }
 
 #ifdef CONFIG_CPU_BIG_ENDIAN
@@ -54,20 +62,30 @@ fw_memblock_t * __init fw_getmdesc(void)
         ptr = strstr(cmdline, "memsize=");
         if (ptr && (ptr != cmdline) && (*(ptr - 1) != ' '))
                 ptr = strstr(ptr, " memsize=");
+        /* And now look for ememsize */
+        if (eva) {
+                ptr = strstr(cmdline, "ememsize=");
+                if (ptr && (ptr != cmdline) && (*(ptr - 1) != ' '))
+                        ptr = strstr(ptr, " ememsize=");
+        }
 
         if (ptr)
-                memsize = memparse(ptr + 8, &ptr);
+                memsize = memparse(ptr + 8 + (eva ? 1 : 0), &ptr);
         else
                 memsize = physical_memsize;
 
+        /* Last 64K for HIGHMEM arithmetics */
+        if (memsize > 0x7fff0000)
+                memsize = 0x7fff0000;
+
         memset(mdesc, 0, sizeof(mdesc));
 
         mdesc[0].type = fw_dontuse;
-        mdesc[0].base = 0x00000000;
+        mdesc[0].base = PHYS_OFFSET;
         mdesc[0].size = 0x00001000;
 
         mdesc[1].type = fw_code;
-        mdesc[1].base = 0x00001000;
+        mdesc[1].base = mdesc[0].base + 0x00001000UL;
         mdesc[1].size = 0x000ef000;
 
         /*
@@ -78,21 +96,27 @@ fw_memblock_t * __init fw_getmdesc(void)
          * devices.
          */
         mdesc[2].type = fw_dontuse;
-        mdesc[2].base = 0x000f0000;
+        mdesc[2].base = mdesc[0].base + 0x000f0000UL;
         mdesc[2].size = 0x00010000;
 
         mdesc[3].type = fw_dontuse;
-        mdesc[3].base = 0x00100000;
+        mdesc[3].base = mdesc[0].base + 0x00100000UL;
         mdesc[3].size = CPHYSADDR(PFN_ALIGN((unsigned long)&_end)) -
-                mdesc[3].base;
+                0x00100000UL;
 
         mdesc[4].type = fw_free;
-        mdesc[4].base = CPHYSADDR(PFN_ALIGN(&_end));
-        mdesc[4].size = memsize - mdesc[4].base;
+        mdesc[4].base = mdesc[0].base + CPHYSADDR(PFN_ALIGN(&_end));
+        mdesc[4].size = memsize - CPHYSADDR(mdesc[4].base);
 
         return &mdesc[0];
 }
 
+static void free_init_pages_eva_malta(void *begin, void *end)
+{
+        free_init_pages("unused kernel", __pa_symbol((unsigned long *)begin),
+                        __pa_symbol((unsigned long *)end));
+}
+
 static int __init fw_memtype_classify(unsigned int type)
 {
         switch (type) {
@@ -109,7 +133,9 @@ void __init fw_meminit(void)
 {
         fw_memblock_t *p;
 
-        p = fw_getmdesc();
+        p = fw_getmdesc(config_enabled(CONFIG_EVA));
+        free_init_pages_eva = (config_enabled(CONFIG_EVA) ?
+                               free_init_pages_eva_malta : NULL);
 
         while (p->size) {
                 long type;