lkml.org 
[lkml]   [2019]   [Nov]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2] riscv: Use PMD_SIZE to repalce PTE_PARENT_SIZE
    Date
    The PMD_SIZE is equal to PGDIR_SIZE when __PAGETABLE_PMD_FOLDED is
    defined.

    Signed-off-by: Zong Li <zong.li@sifive.com>
    ---
    arch/riscv/mm/init.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
    index 573463d..642b330 100644
    --- a/arch/riscv/mm/init.c
    +++ b/arch/riscv/mm/init.c
    @@ -273,7 +273,6 @@ static void __init create_pmd_mapping(pmd_t *pmdp,
    #define get_pgd_next_virt(__pa) get_pmd_virt(__pa)
    #define create_pgd_next_mapping(__nextp, __va, __pa, __sz, __prot) \
    create_pmd_mapping(__nextp, __va, __pa, __sz, __prot)
    -#define PTE_PARENT_SIZE PMD_SIZE
    #define fixmap_pgd_next fixmap_pmd
    #else
    #define pgd_next_t pte_t
    @@ -281,7 +280,6 @@ static void __init create_pmd_mapping(pmd_t *pmdp,
    #define get_pgd_next_virt(__pa) get_pte_virt(__pa)
    #define create_pgd_next_mapping(__nextp, __va, __pa, __sz, __prot) \
    create_pte_mapping(__nextp, __va, __pa, __sz, __prot)
    -#define PTE_PARENT_SIZE PGDIR_SIZE
    #define fixmap_pgd_next fixmap_pte
    #endif

    @@ -316,10 +314,10 @@ static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size)
    {
    uintptr_t map_size = PAGE_SIZE;

    - /* Upgrade to PMD/PGDIR mappings whenever possible */
    - if (!(base & (PTE_PARENT_SIZE - 1)) &&
    - !(size & (PTE_PARENT_SIZE - 1)))
    - map_size = PTE_PARENT_SIZE;
    + /* Upgrade to PMD_SIZE mappings whenever possible */
    + if (!(base & (PMD_SIZE - 1)) &&
    + !(size & (PMD_SIZE - 1)))
    + map_size = PMD_SIZE;

    return map_size;
    }
    --
    2.7.4
    \
     
     \ /
      Last update: 2019-11-05 03:21    [W:3.205 / U:0.580 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site