Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit b3c948e2 authored by Jiaxun Yang's avatar Jiaxun Yang Committed by Paul Burton
Browse files

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: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: default avatarPaul 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
parent 79fd0fe4

arch/mips/pmcs-msp71xx/msp_prom.c

+16 −6
Original line number Diff line number Diff line
@@ -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]);

	}

}