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

Commit 813125d8 authored by Kevin Hao's avatar Kevin Hao Committed by Scott Wood
Browse files

powerpc/fsl_booke: introduce map_mem_in_cams_addr 



Introduce this function so we can set both the physical and virtual
address for the map in cams. This will be used by the relocation code.

Signed-off-by: default avatarKevin Hao <haokexin@gmail.com>
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
parent b27652dd

arch/powerpc/mm/fsl_booke_mmu.c

+10 −3
Original line number Diff line number Diff line
@@ -171,11 +171,10 @@ unsigned long calc_cam_sz(unsigned long ram, unsigned long virt, 
	return 1UL << camsize;

}



unsigned long map_mem_in_cams(unsigned long ram, int max_cam_idx)

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

					unsigned long ram, int max_cam_idx)

{

	int i;

	unsigned long virt = PAGE_OFFSET;

	phys_addr_t phys = memstart_addr;

	unsigned long amount_mapped = 0;



	/* Calculate CAM values */
@@ -195,6 +194,14 @@ unsigned long map_mem_in_cams(unsigned long ram, int max_cam_idx) 
	return amount_mapped;

}



unsigned long map_mem_in_cams(unsigned long ram, int max_cam_idx)

{

	unsigned long virt = PAGE_OFFSET;

	phys_addr_t phys = memstart_addr;



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

}



#ifdef CONFIG_PPC32



#if defined(CONFIG_LOWMEM_CAM_NUM_BOOL) && (CONFIG_LOWMEM_CAM_NUM >= NUM_TLBCAMS)