Commit 62f64b49 authored by Christophe Leroy's avatar Christophe Leroy Committed by Scott Wood

powerpc/8xx: add CONFIG_PIN_TLB_IMMR

CONFIG_PIN_TLB maps IMMR area and the first 24 Mbytes of memory.
In some circunstances it might be more interesting to not map
IMMR but map 32 Mbytes of memory instead.

Therefore we add config option CONFIG_PIN_TLB_IMMR to select if
IMMR shall be pinned or not, hence whether we pin 24 or 32 Mbytes of RAM
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarScott Wood <oss@buserror.net>
parent 4ad27450
...@@ -1056,6 +1056,11 @@ config CONSISTENT_SIZE ...@@ -1056,6 +1056,11 @@ config CONSISTENT_SIZE
config PIN_TLB config PIN_TLB
bool "Pinned Kernel TLBs (860 ONLY)" bool "Pinned Kernel TLBs (860 ONLY)"
depends on ADVANCED_OPTIONS && 8xx depends on ADVANCED_OPTIONS && 8xx
config PIN_TLB_IMMR
bool "Pinned TLB for IMMR"
depends on PIN_TLB
default y
endmenu endmenu
if PPC64 if PPC64
......
...@@ -414,11 +414,11 @@ DataStoreTLBMiss: ...@@ -414,11 +414,11 @@ DataStoreTLBMiss:
*/ */
mfspr r11, SPRN_MD_EPN mfspr r11, SPRN_MD_EPN
rlwinm r11, r11, 16, 0xfff8 rlwinm r11, r11, 16, 0xfff8
#ifndef CONFIG_PIN_TLB #ifndef CONFIG_PIN_TLB_IMMR
cmpli cr0, r11, VIRT_IMMR_BASE@h cmpli cr0, r11, VIRT_IMMR_BASE@h
#endif #endif
cmpli cr7, r11, PAGE_OFFSET@h cmpli cr7, r11, PAGE_OFFSET@h
#ifndef CONFIG_PIN_TLB #ifndef CONFIG_PIN_TLB_IMMR
_ENTRY(DTLBMiss_jmp) _ENTRY(DTLBMiss_jmp)
beq- DTLBMissIMMR beq- DTLBMissIMMR
#endif #endif
...@@ -819,7 +819,6 @@ initial_mmu: ...@@ -819,7 +819,6 @@ initial_mmu:
#ifdef CONFIG_PIN_TLB #ifdef CONFIG_PIN_TLB
oris r10, r10, MD_RSV4I@h oris r10, r10, MD_RSV4I@h
ori r10, r10, 0x1c00
mtspr SPRN_MD_CTR, r10 /* Set data TLB control */ mtspr SPRN_MD_CTR, r10 /* Set data TLB control */
#endif #endif
...@@ -843,7 +842,10 @@ initial_mmu: ...@@ -843,7 +842,10 @@ initial_mmu:
/* Map a 512k page for the IMMR to get the processor /* Map a 512k page for the IMMR to get the processor
* internal registers (among other things). * internal registers (among other things).
*/ */
#ifdef CONFIG_PIN_TLB #ifdef CONFIG_PIN_TLB_IMMR
ori r10, r10, 0x1c00
mtspr SPRN_MD_CTR, r10
mfspr r9, 638 /* Get current IMMR */ mfspr r9, 638 /* Get current IMMR */
andis. r9, r9, 0xfff8 /* Get 512 kbytes boundary */ andis. r9, r9, 0xfff8 /* Get 512 kbytes boundary */
......
...@@ -61,11 +61,15 @@ void __init MMU_init_hw(void) ...@@ -61,11 +61,15 @@ void __init MMU_init_hw(void)
#ifdef CONFIG_PIN_TLB #ifdef CONFIG_PIN_TLB
unsigned long ctr = mfspr(SPRN_MD_CTR) & 0xfe000000; unsigned long ctr = mfspr(SPRN_MD_CTR) & 0xfe000000;
unsigned long flags = 0xf0 | MD_SPS16K | _PAGE_SHARED | _PAGE_DIRTY; unsigned long flags = 0xf0 | MD_SPS16K | _PAGE_SHARED | _PAGE_DIRTY;
int i; #ifdef CONFIG_PIN_TLB_IMMR
int i = 29;
#else
int i = 28;
#endif
unsigned long addr = 0; unsigned long addr = 0;
unsigned long mem = total_lowmem; unsigned long mem = total_lowmem;
for (i = 29; i < 32 && mem >= LARGE_PAGE_SIZE_8M; i++) { for (; i < 32 && mem >= LARGE_PAGE_SIZE_8M; i++) {
mtspr(SPRN_MD_CTR, ctr | (i << 8)); mtspr(SPRN_MD_CTR, ctr | (i << 8));
mtspr(SPRN_MD_EPN, (unsigned long)__va(addr) | MD_EVALID); mtspr(SPRN_MD_EPN, (unsigned long)__va(addr) | MD_EVALID);
mtspr(SPRN_MD_TWC, MD_PS8MEG | MD_SVALID); mtspr(SPRN_MD_TWC, MD_PS8MEG | MD_SVALID);
...@@ -88,7 +92,7 @@ static void mmu_mapin_immr(void) ...@@ -88,7 +92,7 @@ static void mmu_mapin_immr(void)
} }
/* Address of instructions to patch */ /* Address of instructions to patch */
#ifndef CONFIG_PIN_TLB #ifndef CONFIG_PIN_TLB_IMMR
extern unsigned int DTLBMiss_jmp; extern unsigned int DTLBMiss_jmp;
#endif #endif
extern unsigned int DTLBMiss_cmp, FixupDAR_cmp; extern unsigned int DTLBMiss_cmp, FixupDAR_cmp;
...@@ -109,7 +113,7 @@ unsigned long __init mmu_mapin_ram(unsigned long top) ...@@ -109,7 +113,7 @@ unsigned long __init mmu_mapin_ram(unsigned long top)
if (__map_without_ltlbs) { if (__map_without_ltlbs) {
mapped = 0; mapped = 0;
mmu_mapin_immr(); mmu_mapin_immr();
#ifndef CONFIG_PIN_TLB #ifndef CONFIG_PIN_TLB_IMMR
patch_instruction(&DTLBMiss_jmp, PPC_INST_NOP); patch_instruction(&DTLBMiss_jmp, PPC_INST_NOP);
#endif #endif
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment