lkml.org 
[lkml]   [2016]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 04/23] powerpc/8xx: move setup_initial_memory_limit() into 8xx_mmu.c
    Date
    Now we have a 8xx specific .c file for that so put it in there
    as other powerpc variants do

    Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
    ---
    v2: no change
    v3: no change
    v4: no change
    v5: no change
    v6: no change
    v8: no change

    arch/powerpc/mm/8xx_mmu.c | 17 +++++++++++++++++
    arch/powerpc/mm/init_32.c | 19 -------------------
    2 files changed, 17 insertions(+), 19 deletions(-)

    diff --git a/arch/powerpc/mm/8xx_mmu.c b/arch/powerpc/mm/8xx_mmu.c
    index 2d42745..a84f5eb 100644
    --- a/arch/powerpc/mm/8xx_mmu.c
    +++ b/arch/powerpc/mm/8xx_mmu.c
    @@ -81,3 +81,20 @@ unsigned long __init mmu_mapin_ram(unsigned long top)

    return mapped;
    }
    +
    +void setup_initial_memory_limit(phys_addr_t first_memblock_base,
    + phys_addr_t first_memblock_size)
    +{
    + /* We don't currently support the first MEMBLOCK not mapping 0
    + * physical on those processors
    + */
    + BUG_ON(first_memblock_base != 0);
    +
    +#ifdef CONFIG_PIN_TLB
    + /* 8xx can only access 24MB at the moment */
    + memblock_set_current_limit(min_t(u64, first_memblock_size, 0x01800000));
    +#else
    + /* 8xx can only access 8MB at the moment */
    + memblock_set_current_limit(min_t(u64, first_memblock_size, 0x00800000));
    +#endif
    +}
    diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
    index a10be66..1a18e4b 100644
    --- a/arch/powerpc/mm/init_32.c
    +++ b/arch/powerpc/mm/init_32.c
    @@ -193,22 +193,3 @@ void __init MMU_init(void)
    /* Shortly after that, the entire linear mapping will be available */
    memblock_set_current_limit(lowmem_end_addr);
    }
    -
    -#ifdef CONFIG_8xx /* No 8xx specific .c file to put that in ... */
    -void setup_initial_memory_limit(phys_addr_t first_memblock_base,
    - phys_addr_t first_memblock_size)
    -{
    - /* We don't currently support the first MEMBLOCK not mapping 0
    - * physical on those processors
    - */
    - BUG_ON(first_memblock_base != 0);
    -
    -#ifdef CONFIG_PIN_TLB
    - /* 8xx can only access 24MB at the moment */
    - memblock_set_current_limit(min_t(u64, first_memblock_size, 0x01800000));
    -#else
    - /* 8xx can only access 8MB at the moment */
    - memblock_set_current_limit(min_t(u64, first_memblock_size, 0x00800000));
    -#endif
    -}
    -#endif /* CONFIG_8xx */
    --
    2.1.0
    \
     
     \ /
      Last update: 2016-02-09 17:41    [W:3.118 / U:0.456 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site