1 files changed, 36 insertions, 4 deletions

diff --git a/arch/mips/mti-malta/malta-memory.c b/arch/mips/mti-malta/malta-memory.c
index 6d9773096750..8fddd2cdbff7 100644
--- a/arch/mips/mti-malta/malta-memory.c
+++ b/arch/mips/mti-malta/malta-memory.c
@@ -16,6 +16,7 @@
 #include <linux/string.h>
 
 #include <asm/bootinfo.h>
+#include <asm/maar.h>
 #include <asm/sections.h>
 #include <asm/fw/fw.h>
 
@@ -34,13 +35,19 @@ fw_memblock_t * __init fw_getmdesc(int eva)
         /* otherwise look in the environment */
 
         memsize_str = fw_getenv("memsize");
-        if (memsize_str)
-                tmp = kstrtol(memsize_str, 0, &memsize);
+        if (memsize_str) {
+                tmp = kstrtoul(memsize_str, 0, &memsize);
+                if (tmp)
+                        pr_warn("Failed to read the 'memsize' env variable.\n");
+        }
         if (eva) {
         /* Look for ememsize for EVA */
                 ememsize_str = fw_getenv("ememsize");
-                if (ememsize_str)
-                        tmp = kstrtol(ememsize_str, 0, &ememsize);
+                if (ememsize_str) {
+                        tmp = kstrtoul(ememsize_str, 0, &ememsize);
+                        if (tmp)
+                                pr_warn("Failed to read the 'ememsize' env variable.\n");
+                }
         }
         if (!memsize && !ememsize) {
                 pr_warn("memsize not set in YAMON, set to default (32Mb)\n");
@@ -164,3 +171,28 @@ void __init prom_free_prom_memory(void)
                                 addr, addr + boot_mem_map.map[i].size);
         }
 }
+
+unsigned platform_maar_init(unsigned num_pairs)
+{
+        phys_addr_t mem_end = (physical_memsize & ~0xffffull) - 1;
+        struct maar_config cfg[] = {
+                /* DRAM preceding I/O */
+                { 0x00000000, 0x0fffffff, MIPS_MAAR_S },
+
+                /* DRAM following I/O */
+                { 0x20000000, mem_end, MIPS_MAAR_S },
+
+                /* DRAM alias in upper half of physical */
+                { 0x80000000, 0x80000000 + mem_end, MIPS_MAAR_S },
+        };
+        unsigned i, num_cfg = ARRAY_SIZE(cfg);
+
+        /* If DRAM fits before I/O, drop the region following it */
+        if (physical_memsize <= 0x10000000) {
+                num_cfg--;
+                for (i = 1; i < num_cfg; i++)
+                        cfg[i] = cfg[i + 1];
+        }
+
+        return maar_config(cfg, num_cfg, num_pairs);
+}