MIPS: fw: Record prom memory

boot_mem_map is nolonger exist so we need to maintain a list
of prom memory by ourselves.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
Cc: yasha.che3@gmail.com
Cc: aurelien@aurel32.net
Cc: sfr@canb.auug.org.au
Cc: fancer.lancer@gmail.com
Cc: matt.redfearn@mips.com
Cc: chenhc@lemote.com

diff --git a/arch/mips/fw/arc/memory.c b/arch/mips/fw/arc/memory.c
index 429b7f8d2aeb4389eacb9d023e7d9a2bd38bcec2..af44b35d79a1d95820354fe410e978e365552a52 100644 (file)
--- a/arch/mips/fw/arc/memory.c
+++ b/arch/mips/fw/arc/memory.c
@@ -27,6 +27,11 @@
 
 #undef DEBUG
 
+#define MAX_PROM_MEM 5
+static phys_addr_t prom_mem_base[MAX_PROM_MEM] __initdata;
+static phys_addr_t prom_mem_size[MAX_PROM_MEM] __initdata;
+static unsigned int nr_prom_mem __initdata;
+
 /*
  * For ARC firmware memory functions the unit of meassuring memory is always
  * a 4k page of memory
@@ -129,6 +134,7 @@ void __init prom_meminit(void)
        }
 #endif
 
+       nr_prom_mem = 0;
        p = PROM_NULL_MDESC;
        while ((p = ArcGetMemoryDescriptor(p))) {
                unsigned long base, size;
@@ -139,6 +145,16 @@ void __init prom_meminit(void)
                type = prom_memtype_classify(p->type);
 
                add_memory_region(base, size, type);
+
+               if (type == BOOT_MEM_ROM_DATA) {
+                       if (nr_prom_mem >= 5) {
+                               pr_err("Too many ROM DATA regions");
+                               continue;
+                       }
+                       prom_mem_base[nr_prom_mem] = base;
+                       prom_mem_size[nr_prom_mem] = size;
+                       nr_prom_mem++;
+               }
        }
 }
 
@@ -150,12 +166,8 @@ void __init prom_free_prom_memory(void)
        if (prom_flags & PROM_FLAG_DONT_FREE_TEMP)
                return;
 
-       for (i = 0; i < boot_mem_map.nr_map; i++) {
-               if (boot_mem_map.map[i].type != BOOT_MEM_ROM_DATA)
-                       continue;
-
-               addr = boot_mem_map.map[i].addr;
+       for (i = 0; i < nr_prom_mem; i++) {
                free_init_pages("prom memory",
-                               addr, addr + boot_mem_map.map[i].size);
+                       prom_mem_base[i], prom_mem_base[i] + prom_mem_size[i]);
        }
 }