Commit 14e609d6 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm/32: add base address to mmu_mapin_ram() 



At the time being, mmu_mapin_ram() always maps RAM from the beginning.
But some platforms like the WII have to map a second block of RAM.

This patch adds to mmu_mapin_ram() the base address of the block.
At the moment, only base address 0 is supported.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 6d183ca8

arch/powerpc/mm/40x_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ void __init MMU_init_hw(void) 
#define LARGE_PAGE_SIZE_16M	(1<<24)

#define LARGE_PAGE_SIZE_4M	(1<<22)



unsigned long __init mmu_mapin_ram(unsigned long top)

unsigned long __init mmu_mapin_ram(unsigned long base, unsigned long top)

{

	unsigned long v, s, mapped;

	phys_addr_t p;

arch/powerpc/mm/44x_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ void __init MMU_init_hw(void) 
	flush_instruction_cache();

}



unsigned long __init mmu_mapin_ram(unsigned long top)

unsigned long __init mmu_mapin_ram(unsigned long base, unsigned long top)

{

	unsigned long addr;

	unsigned long memstart = memstart_addr & ~(PPC_PIN_SIZE - 1);

arch/powerpc/mm/8xx_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static void __init mmu_patch_cmp_limit(s32 *site, unsigned long mapped) 
	modify_instruction_site(site, 0xffff, (unsigned long)__va(mapped) >> 16);

}



unsigned long __init mmu_mapin_ram(unsigned long top)

unsigned long __init mmu_mapin_ram(unsigned long base, unsigned long top)

{

	unsigned long mapped;

arch/powerpc/mm/fsl_booke_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ unsigned long map_mem_in_cams(unsigned long ram, int max_cam_idx, bool dryrun) 
#error "LOWMEM_CAM_NUM must be less than NUM_TLBCAMS"

#endif



unsigned long __init mmu_mapin_ram(unsigned long top)

unsigned long __init mmu_mapin_ram(unsigned long base, unsigned long top)

{

	return tlbcam_addrs[tlbcam_index - 1].limit - PAGE_OFFSET + 1;

}

arch/powerpc/mm/mmu_decl.h

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ extern void wii_memory_fixups(void); 
 */

#ifdef CONFIG_PPC32

extern void MMU_init_hw(void);

extern unsigned long mmu_mapin_ram(unsigned long top);

unsigned long mmu_mapin_ram(unsigned long base, unsigned long top);

#endif



#ifdef CONFIG_PPC_FSL_BOOK3E

CRA Git | Maintained and supported by SUSTech CRA and CCSE