MIPS: msp: 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/pmcs-msp71xx/msp_prom.c b/arch/mips/pmcs-msp71xx/msp_prom.c
index 6fdcb3d6fbb596e02b14ef780e52707e3ed99b1d..dfb527961a27c3a813f7a6971243eb5f7f455548 100644 (file)
--- a/arch/mips/pmcs-msp71xx/msp_prom.c
+++ b/arch/mips/pmcs-msp71xx/msp_prom.c
@@ -61,6 +61,10 @@ int init_debug = 1;
 /* memory blocks */
 struct prom_pmemblock mdesc[PROM_MAX_PMEMBLOCKS];
 
+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;
+
 /* default feature sets */
 static char msp_default_features[] =
 #if defined(CONFIG_PMC_MSP4200_EVAL) \
@@ -352,6 +356,16 @@ void __init prom_meminit(void)
 
                add_memory_region(base, size, type);
                p++;
+
+               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++;
+               }
        }
 }
 
@@ -407,13 +421,9 @@ void __init prom_free_prom_memory(void)
        envp[i] = NULL;                 /* end array with null pointer */
        prom_envp = envp;
 
-       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]);
        }
 }