Commit 52bda69a authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/fsl_booke: Tell map_mem_in_cams() if init is done 



In order to be able to call map_mem_in_cams() once more
after init for STRICT_KERNEL_RWX, add an argument.

For now, map_mem_in_cams() is always called only during init.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/3b69a7e0b393b16984ade882a5eae5d727717459.1634292136.git.christophe.leroy@csgroup.eu
parent a97dd9e2

arch/powerpc/mm/mmu_decl.h

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ unsigned long mmu_mapin_ram(unsigned long base, unsigned long top); 


#ifdef CONFIG_PPC_FSL_BOOK3E

extern unsigned long map_mem_in_cams(unsigned long ram, int max_cam_idx,

				     bool dryrun);

				     bool dryrun, bool init);

extern unsigned long calc_cam_sz(unsigned long ram, unsigned long virt,

				 phys_addr_t phys);

#ifdef CONFIG_PPC32

arch/powerpc/mm/nohash/fsl_book3e.c

+6 −6
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ unsigned long calc_cam_sz(unsigned long ram, unsigned long virt, 


static unsigned long map_mem_in_cams_addr(phys_addr_t phys, unsigned long virt,

					unsigned long ram, int max_cam_idx,

					bool dryrun)

					bool dryrun, bool init)

{

	int i;

	unsigned long amount_mapped = 0;
@@ -202,12 +202,12 @@ static unsigned long map_mem_in_cams_addr(phys_addr_t phys, unsigned long virt, 
	return amount_mapped;

}



unsigned long map_mem_in_cams(unsigned long ram, int max_cam_idx, bool dryrun)

unsigned long map_mem_in_cams(unsigned long ram, int max_cam_idx, bool dryrun, bool init)

{

	unsigned long virt = PAGE_OFFSET;

	phys_addr_t phys = memstart_addr;



	return map_mem_in_cams_addr(phys, virt, ram, max_cam_idx, dryrun);

	return map_mem_in_cams_addr(phys, virt, ram, max_cam_idx, dryrun, init);

}



#ifdef CONFIG_PPC32
@@ -248,7 +248,7 @@ void __init adjust_total_lowmem(void) 
	ram = min((phys_addr_t)__max_low_memory, (phys_addr_t)total_lowmem);



	i = switch_to_as1();

	__max_low_memory = map_mem_in_cams(ram, CONFIG_LOWMEM_CAM_NUM, false);

	__max_low_memory = map_mem_in_cams(ram, CONFIG_LOWMEM_CAM_NUM, false, true);

	restore_to_as0(i, 0, 0, 1);



	pr_info("Memory CAM mapping: ");
@@ -319,11 +319,11 @@ notrace void __init relocate_init(u64 dt_ptr, phys_addr_t start) 
		/* map a 64M area for the second relocation */

		if (memstart_addr > start)

			map_mem_in_cams(0x4000000, CONFIG_LOWMEM_CAM_NUM,

					false);

					false, true);

		else

			map_mem_in_cams_addr(start, PAGE_OFFSET + offset,

					0x4000000, CONFIG_LOWMEM_CAM_NUM,

					false);

					false, true);

		restore_to_as0(n, offset, __va(dt_ptr), 1);

		/* We should never reach here */

		panic("Relocation error");

arch/powerpc/mm/nohash/kaslr_booke.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ static unsigned long __init kaslr_choose_location(void *dt_ptr, phys_addr_t size 
		pr_warn("KASLR: No safe seed for randomizing the kernel base.\n");



	ram = min_t(phys_addr_t, __max_low_memory, size);

	ram = map_mem_in_cams(ram, CONFIG_LOWMEM_CAM_NUM, true);

	ram = map_mem_in_cams(ram, CONFIG_LOWMEM_CAM_NUM, true, false);

	linear_sz = min_t(unsigned long, ram, SZ_512M);



	/* If the linear size is smaller than 64M, do not randmize */

arch/powerpc/mm/nohash/tlb.c

+2 −2
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ static void early_init_this_mmu(void) 


		if (map)

			linear_map_top = map_mem_in_cams(linear_map_top,

							 num_cams, false);

							 num_cams, true, true);

	}

#endif
@@ -764,7 +764,7 @@ void setup_initial_memory_limit(phys_addr_t first_memblock_base, 
		num_cams = (mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) / 4;



		linear_sz = map_mem_in_cams(first_memblock_size, num_cams,

					    true);

					    false, true);



		ppc64_rma_size = min_t(u64, linear_sz, 0x40000000);

	} else