Re: [PATCH] riscv: Use PMD_SIZE to repalce PTE_PARENT_SIZE

From: Zong Li
Date: Thu Oct 31 2019 - 22:42:25 EST


Zong Li <zong.li@xxxxxxxxxx> æ 2019å11æ1æ éä äå10:20åéï
>
> The PMD_SIZE is equal to PGDIR_SIZE when __PAGETABLE_PMD_FOLDED is
> defined.
>
> Signed-off-by: Zong Li <zong.li@xxxxxxxxxx>
> ---
> arch/riscv/mm/init.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> index 573463d..9a9b01a 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
>
> @@ -317,9 +315,9 @@ 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 */

This comment should be fixed also. this patch needs the next version.

> - if (!(base & (PTE_PARENT_SIZE - 1)) &&
> - !(size & (PTE_PARENT_SIZE - 1)))
> - map_size = PTE_PARENT_SIZE;
> + if (!(base & (PMD_SIZE - 1)) &&
> + !(size & (PMD_SIZE - 1)))
> + map_size = PMD_SIZE;
>
> return map_size;
> }
> --
> 2.7.4
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/linux-riscv