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

Commit def3ab5d authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: mm: compile maar_init unconditionally 



maar_init was previously only compiled when CONFIG_NEED_MULTIPLE_NODES
was not set, which has been fine since it is only called from the
standard implementation of mem_init which has the same condition. In
preparation for calling it from the SMP startup code on secondary CPUs,
move maar_init outside of the #ifndef such that it is always compiled.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: David Hildenbrand <dahi@linux.vnet.ibm.com>
Cc: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>
Patchwork: https://patchwork.linux-mips.org/patch/11237/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent d77d5ac9

arch/mips/mm/init.c

+63 −63
Original line number Diff line number Diff line
@@ -252,6 +252,69 @@ void __init fixrange_init(unsigned long start, unsigned long end, 
#endif

}



unsigned __weak platform_maar_init(unsigned num_pairs)

{

	struct maar_config cfg[BOOT_MEM_MAP_MAX];

	unsigned i, num_configured, num_cfg = 0;

	phys_addr_t skip;



	for (i = 0; i < boot_mem_map.nr_map; i++) {

		switch (boot_mem_map.map[i].type) {

		case BOOT_MEM_RAM:

		case BOOT_MEM_INIT_RAM:

			break;

		default:

			continue;

		}



		skip = 0x10000 - (boot_mem_map.map[i].addr & 0xffff);



		cfg[num_cfg].lower = boot_mem_map.map[i].addr;

		cfg[num_cfg].lower += skip;



		cfg[num_cfg].upper = cfg[num_cfg].lower;

		cfg[num_cfg].upper += boot_mem_map.map[i].size - 1;

		cfg[num_cfg].upper -= skip;



		cfg[num_cfg].attrs = MIPS_MAAR_S;

		num_cfg++;

	}



	num_configured = maar_config(cfg, num_cfg, num_pairs);

	if (num_configured < num_cfg)

		pr_warn("Not enough MAAR pairs (%u) for all bootmem regions (%u)\n",

			num_pairs, num_cfg);



	return num_configured;

}



static void maar_init(void)

{

	unsigned num_maars, used, i;



	if (!cpu_has_maar)

		return;



	/* Detect the number of MAARs */

	write_c0_maari(~0);

	back_to_back_c0_hazard();

	num_maars = read_c0_maari() + 1;



	/* MAARs should be in pairs */

	WARN_ON(num_maars % 2);



	/* Configure the required MAARs */

	used = platform_maar_init(num_maars / 2);



	/* Disable any further MAARs */

	for (i = (used * 2); i < num_maars; i++) {

		write_c0_maari(i);

		back_to_back_c0_hazard();

		write_c0_maar(0);

		back_to_back_c0_hazard();

	}

}



#ifndef CONFIG_NEED_MULTIPLE_NODES

int page_is_ram(unsigned long pagenr)

{
@@ -334,69 +397,6 @@ static inline void mem_init_free_highmem(void) 
#endif

}



unsigned __weak platform_maar_init(unsigned num_pairs)

{

	struct maar_config cfg[BOOT_MEM_MAP_MAX];

	unsigned i, num_configured, num_cfg = 0;

	phys_addr_t skip;



	for (i = 0; i < boot_mem_map.nr_map; i++) {

		switch (boot_mem_map.map[i].type) {

		case BOOT_MEM_RAM:

		case BOOT_MEM_INIT_RAM:

			break;

		default:

			continue;

		}



		skip = 0x10000 - (boot_mem_map.map[i].addr & 0xffff);



		cfg[num_cfg].lower = boot_mem_map.map[i].addr;

		cfg[num_cfg].lower += skip;



		cfg[num_cfg].upper = cfg[num_cfg].lower;

		cfg[num_cfg].upper += boot_mem_map.map[i].size - 1;

		cfg[num_cfg].upper -= skip;



		cfg[num_cfg].attrs = MIPS_MAAR_S;

		num_cfg++;

	}



	num_configured = maar_config(cfg, num_cfg, num_pairs);

	if (num_configured < num_cfg)

		pr_warn("Not enough MAAR pairs (%u) for all bootmem regions (%u)\n",

			num_pairs, num_cfg);



	return num_configured;

}



static void maar_init(void)

{

	unsigned num_maars, used, i;



	if (!cpu_has_maar)

		return;



	/* Detect the number of MAARs */

	write_c0_maari(~0);

	back_to_back_c0_hazard();

	num_maars = read_c0_maari() + 1;



	/* MAARs should be in pairs */

	WARN_ON(num_maars % 2);



	/* Configure the required MAARs */

	used = platform_maar_init(num_maars / 2);



	/* Disable any further MAARs */

	for (i = (used * 2); i < num_maars; i++) {

		write_c0_maari(i);

		back_to_back_c0_hazard();

		write_c0_maar(0);

		back_to_back_c0_hazard();

	}

}



void __init mem_init(void)

{

#ifdef CONFIG_HIGHMEM