diff options
| author |   Kevin Hao <haokexin@gmail.com> | 2013-12-24 15:12:11 +0800 |
|---|---|---|
| committer |   Scott Wood <scottwood@freescale.com> | 2014-01-09 17:52:18 -0600 |
| commit | 0be7d969b0efef085ed6497d462ba16a875ca737 (patch) | |
| tree | c2cf4e6760102757785a0d91fcb052372153e9c7 /arch/powerpc/mm/tlb_nohash_low.S | |
| parent | powerpc/fsl_booke: make sure PAGE_OFFSET map to memstart_addr for relocatable kernel (diff) | |
| download | linux-dev-0be7d969b0efef085ed6497d462ba16a875ca737.tar.xz linux-dev-0be7d969b0efef085ed6497d462ba16a875ca737.zip | |
powerpc/fsl_booke: smp support for booting a relocatable kernel above 64M
When booting above the 64M for a secondary cpu, we also face the
same issue as the boot cpu that the PAGE_OFFSET map two different
physical address for the init tlb and the final map. So we have to use
switch_to_as1/restore_to_as0 between the conversion of these two
maps. When restoring to as0 for a secondary cpu, we only need to
return to the caller. So add a new parameter for function
restore_to_as0 for this purpose.
Use LOAD_REG_ADDR_PIC to get the address of variables which may
be used before we set the final map in cams for the secondary cpu.
Move the setting of cams a bit earlier in order to avoid the
unnecessary using of LOAD_REG_ADDR_PIC.
Signed-off-by: Kevin Hao <haokexin@gmail.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc/mm/tlb_nohash_low.S')
| -rw-r--r-- | arch/powerpc/mm/tlb_nohash_low.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/mm/tlb_nohash_low.S b/arch/powerpc/mm/tlb_nohash_low.S index 626ad081639f..43ff3c797fbf 100644 --- a/arch/powerpc/mm/tlb_nohash_low.S +++ b/arch/powerpc/mm/tlb_nohash_low.S @@ -402,7 +402,9 @@ _GLOBAL(set_context) * Load TLBCAM[index] entry in to the L2 CAM MMU */ _GLOBAL(loadcam_entry) - LOAD_REG_ADDR(r4, TLBCAM) + mflr r5 + LOAD_REG_ADDR_PIC(r4, TLBCAM) + mtlr r5 mulli r5,r3,TLBCAM_SIZE add r3,r5,r4 lwz r4,TLBCAM_MAS0(r3) |