lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 489/757] powerpc/book3s64/radix: Make radix_mem_block_size 64bit
    Date
    From: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>

    [ Upstream commit 950805f4d90eda14325ceab56b0f00d034baa8bc ]

    Similar to commit 89c140bbaeee ("pseries: Fix 64 bit logical memory block panic")
    make sure different variables tracking lmb_size are updated to be 64 bit.

    Fixes: af9d00e93a4f ("powerpc/mm/radix: Create separate mappings for hot-plugged memory")
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/20201007114836.282468-4-aneesh.kumar@linux.ibm.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/include/asm/book3s/64/mmu.h | 2 +-
    arch/powerpc/mm/book3s64/radix_pgtable.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/powerpc/include/asm/book3s/64/mmu.h b/arch/powerpc/include/asm/book3s/64/mmu.h
    index b392384a3b150..86173bfc39feb 100644
    --- a/arch/powerpc/include/asm/book3s/64/mmu.h
    +++ b/arch/powerpc/include/asm/book3s/64/mmu.h
    @@ -85,7 +85,7 @@ extern unsigned int mmu_base_pid;
    /*
    * memory block size used with radix translation.
    */
    -extern unsigned int __ro_after_init radix_mem_block_size;
    +extern unsigned long __ro_after_init radix_mem_block_size;

    #define PRTB_SIZE_SHIFT (mmu_pid_bits + 4)
    #define PRTB_ENTRIES (1ul << mmu_pid_bits)
    diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c
    index d5f0c10d752a3..aae8550379bae 100644
    --- a/arch/powerpc/mm/book3s64/radix_pgtable.c
    +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c
    @@ -34,7 +34,7 @@

    unsigned int mmu_pid_bits;
    unsigned int mmu_base_pid;
    -unsigned int radix_mem_block_size __ro_after_init;
    +unsigned long radix_mem_block_size __ro_after_init;

    static __ref void *early_alloc_pgtable(unsigned long size, int nid,
    unsigned long region_start, unsigned long region_end)
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:20    [W:4.088 / U:0.596 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site