Commit 665bed23 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman

powerpc/8xx: replace most #ifdef by IS_ENABLED() in 8xx_mmu.c

This patch replaces most #ifdef mess by IS_ENABLED() in 8xx_mmu.c
This has the advantage of allowing syntax verification at compile
time regardless of selected options.
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 78a8da06
...@@ -66,26 +66,22 @@ unsigned long p_block_mapped(phys_addr_t pa) ...@@ -66,26 +66,22 @@ unsigned long p_block_mapped(phys_addr_t pa)
void __init MMU_init_hw(void) void __init MMU_init_hw(void)
{ {
/* PIN up to the 3 first 8Mb after IMMR in DTLB table */ /* PIN up to the 3 first 8Mb after IMMR in DTLB table */
#ifdef CONFIG_PIN_TLB_DATA if (IS_ENABLED(CONFIG_PIN_TLB_DATA)) {
unsigned long ctr = mfspr(SPRN_MD_CTR) & 0xfe000000; unsigned long ctr = mfspr(SPRN_MD_CTR) & 0xfe000000;
unsigned long flags = 0xf0 | MD_SPS16K | _PAGE_SH | _PAGE_DIRTY; unsigned long flags = 0xf0 | MD_SPS16K | _PAGE_SH | _PAGE_DIRTY;
#ifdef CONFIG_PIN_TLB_IMMR int i = IS_ENABLED(CONFIG_PIN_TLB_IMMR) ? 29 : 28;
int i = 29; unsigned long addr = 0;
#else unsigned long mem = total_lowmem;
int i = 28;
#endif for (; i < 32 && mem >= LARGE_PAGE_SIZE_8M; i++) {
unsigned long addr = 0; mtspr(SPRN_MD_CTR, ctr | (i << 8));
unsigned long mem = total_lowmem; mtspr(SPRN_MD_EPN, (unsigned long)__va(addr) | MD_EVALID);
mtspr(SPRN_MD_TWC, MD_PS8MEG | MD_SVALID);
for (; i < 32 && mem >= LARGE_PAGE_SIZE_8M; i++) { mtspr(SPRN_MD_RPN, addr | flags | _PAGE_PRESENT);
mtspr(SPRN_MD_CTR, ctr | (i << 8)); addr += LARGE_PAGE_SIZE_8M;
mtspr(SPRN_MD_EPN, (unsigned long)__va(addr) | MD_EVALID); mem -= LARGE_PAGE_SIZE_8M;
mtspr(SPRN_MD_TWC, MD_PS8MEG | MD_SVALID); }
mtspr(SPRN_MD_RPN, addr | flags | _PAGE_PRESENT);
addr += LARGE_PAGE_SIZE_8M;
mem -= LARGE_PAGE_SIZE_8M;
} }
#endif
} }
static void __init mmu_mapin_immr(void) static void __init mmu_mapin_immr(void)
...@@ -110,12 +106,10 @@ unsigned long __init mmu_mapin_ram(unsigned long top) ...@@ -110,12 +106,10 @@ 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_IMMR if (!IS_ENABLED(CONFIG_PIN_TLB_IMMR))
patch_instruction_site(&patch__dtlbmiss_immr_jmp, PPC_INST_NOP); patch_instruction_site(&patch__dtlbmiss_immr_jmp, PPC_INST_NOP);
#endif if (!IS_ENABLED(CONFIG_PIN_TLB_TEXT))
#ifndef CONFIG_PIN_TLB_TEXT mmu_patch_cmp_limit(&patch__itlbmiss_linmem_top, 0);
mmu_patch_cmp_limit(&patch__itlbmiss_linmem_top, 0);
#endif
} else { } else {
mapped = top & ~(LARGE_PAGE_SIZE_8M - 1); mapped = top & ~(LARGE_PAGE_SIZE_8M - 1);
} }
......
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