mips: rename PGD_ORDER to PGD_TABLE_ORDER

This is the order of the page table allocation, not the order of a PGD.

While at it remove unused defintion of _PGD_ORDER in asm-offsets.

Link: https://lkml.kernel.org/r/20220703141203.147893-7-rppt@kernel.org
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Xuerui Wang <kernel@xen0n.name>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
index 1ef8e86..7960357 100644 (file)
--- a/arch/mips/include/asm/pgalloc.h
+++ b/arch/mips/include/asm/pgalloc.h
@@ -51,7 +51,7 @@ extern pgd_t *pgd_alloc(struct mm_struct *mm);
 
 static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
 {
-       free_pages((unsigned long)pgd, PGD_ORDER);
+       free_pages((unsigned long)pgd, PGD_TABLE_ORDER);
 }
 
 #define __pte_free_tlb(tlb,pte,address)                        \

diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h
index 35bd519..495c603 100644 (file)
--- a/arch/mips/include/asm/pgtable-32.h
+++ b/arch/mips/include/asm/pgtable-32.h
@@ -75,12 +75,12 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
  * we don't really have any PUD/PMD directory physically.
  */
 #if defined(CONFIG_MIPS_HUGE_TLB_SUPPORT) && !defined(CONFIG_PHYS_ADDR_T_64BIT)
-# define __PGD_ORDER   (32 - 3 * PAGE_SHIFT + PGD_T_LOG2 + PTE_T_LOG2 + 1)
+# define __PGD_TABLE_ORDER (32 - 3 * PAGE_SHIFT + PGD_T_LOG2 + PTE_T_LOG2 + 1)
 #else
-# define __PGD_ORDER   (32 - 3 * PAGE_SHIFT + PGD_T_LOG2 + PTE_T_LOG2)
+# define __PGD_TABLE_ORDER (32 - 3 * PAGE_SHIFT + PGD_T_LOG2 + PTE_T_LOG2)
 #endif
 
-#define PGD_ORDER      (__PGD_ORDER >= 0 ? __PGD_ORDER : 0)
+#define PGD_TABLE_ORDER        (__PGD_TABLE_ORDER >= 0 ? __PGD_TABLE_ORDER : 0)
 #define PUD_TABLE_ORDER        aieeee_attempt_to_allocate_pud
 #define PMD_TABLE_ORDER        aieeee_attempt_to_allocate_pmd
 

diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h
index dbf7e46..a259ca4 100644 (file)
--- a/arch/mips/include/asm/pgtable-64.h
+++ b/arch/mips/include/asm/pgtable-64.h
@@ -85,35 +85,35 @@
  */
 #ifdef CONFIG_PAGE_SIZE_4KB
 # ifdef CONFIG_MIPS_VA_BITS_48
-#  define PGD_ORDER            0
+#  define PGD_TABLE_ORDER      0
 #  define PUD_TABLE_ORDER      0
 # else
-#  define PGD_ORDER            1
+#  define PGD_TABLE_ORDER      1
 #  define PUD_TABLE_ORDER      aieeee_attempt_to_allocate_pud
 # endif
 #define PMD_TABLE_ORDER                0
 #endif
 #ifdef CONFIG_PAGE_SIZE_8KB
-#define PGD_ORDER              0
+#define PGD_TABLE_ORDER                0
 #define PUD_TABLE_ORDER                aieeee_attempt_to_allocate_pud
 #define PMD_TABLE_ORDER                0
 #endif
 #ifdef CONFIG_PAGE_SIZE_16KB
 #ifdef CONFIG_MIPS_VA_BITS_48
-#define PGD_ORDER               1
+#define PGD_TABLE_ORDER                1
 #else
-#define PGD_ORDER               0
+#define PGD_TABLE_ORDER                0
 #endif
 #define PUD_TABLE_ORDER                aieeee_attempt_to_allocate_pud
 #define PMD_TABLE_ORDER                0
 #endif
 #ifdef CONFIG_PAGE_SIZE_32KB
-#define PGD_ORDER              0
+#define PGD_TABLE_ORDER                0
 #define PUD_TABLE_ORDER                aieeee_attempt_to_allocate_pud
 #define PMD_TABLE_ORDER                0
 #endif
 #ifdef CONFIG_PAGE_SIZE_64KB
-#define PGD_ORDER              0
+#define PGD_TABLE_ORDER                0
 #define PUD_TABLE_ORDER                aieeee_attempt_to_allocate_pud
 #ifdef CONFIG_MIPS_VA_BITS_48
 #define PMD_TABLE_ORDER                0
@@ -122,7 +122,7 @@
 #endif
 #endif
 
-#define PTRS_PER_PGD   ((PAGE_SIZE << PGD_ORDER) / sizeof(pgd_t))
+#define PTRS_PER_PGD   ((PAGE_SIZE << PGD_TABLE_ORDER) / sizeof(pgd_t))
 #ifndef __PAGETABLE_PUD_FOLDED
 #define PTRS_PER_PUD   ((PAGE_SIZE << PUD_TABLE_ORDER) / sizeof(pud_t))
 #endif

diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 0c97f75..c450189 100644 (file)
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -196,7 +196,6 @@ void output_mm_defines(void)
 #endif
        DEFINE(_PTE_T_LOG2, PTE_T_LOG2);
        BLANK();
-       DEFINE(_PGD_ORDER, PGD_ORDER);
        BLANK();
        DEFINE(_PMD_SHIFT, PMD_SHIFT);
        DEFINE(_PGDIR_SHIFT, PGDIR_SHIFT);

diff --git a/arch/mips/kvm/mmu.c b/arch/mips/kvm/mmu.c
index 1bfd1b5..db17e87 100644 (file)
--- a/arch/mips/kvm/mmu.c
+++ b/arch/mips/kvm/mmu.c
@@ -80,7 +80,7 @@ pgd_t *kvm_pgd_alloc(void)
 {
        pgd_t *ret;
 
-       ret = (pgd_t *)__get_free_pages(GFP_KERNEL, PGD_ORDER);
+       ret = (pgd_t *)__get_free_pages(GFP_KERNEL, PGD_TABLE_ORDER);
        if (ret)
                kvm_pgd_init(ret);
 

diff --git a/arch/mips/mm/pgtable.c b/arch/mips/mm/pgtable.c
index 05560b0..3b75906 100644 (file)
--- a/arch/mips/mm/pgtable.c
+++ b/arch/mips/mm/pgtable.c
@@ -12,7 +12,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
 {
        pgd_t *ret, *init;
 
-       ret = (pgd_t *) __get_free_pages(GFP_KERNEL, PGD_ORDER);
+       ret = (pgd_t *) __get_free_pages(GFP_KERNEL, PGD_TABLE_ORDER);
        if (ret) {
                init = pgd_offset(&init_mm, 0UL);
                pgd_init((unsigned long)ret);

diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 6e8e71f..a57519a 100644 (file)
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -818,7 +818,7 @@ void build_get_pmde64(u32 **p, struct uasm_label **l, struct uasm_reloc **r,
                 * everything but the lower xuseg addresses goes down
                 * the module_alloc/vmalloc path.
                 */
-               uasm_i_dsrl_safe(p, ptr, tmp, PGDIR_SHIFT + PGD_ORDER + PAGE_SHIFT - 3);
+               uasm_i_dsrl_safe(p, ptr, tmp, PGDIR_SHIFT + PGD_TABLE_ORDER + PAGE_SHIFT - 3);
                uasm_il_bnez(p, r, ptr, label_vmalloc);
        } else {
                uasm_il_bltz(p, r, tmp, label_vmalloc);
@@ -1127,7 +1127,7 @@ build_fast_tlb_refill_handler (u32 **p, struct uasm_label **l,
                        UASM_i_SW(p, scratch, scratchpad_offset(0), 0);
 
                uasm_i_dsrl_safe(p, scratch, tmp,
-                                PGDIR_SHIFT + PGD_ORDER + PAGE_SHIFT - 3);
+                                PGDIR_SHIFT + PGD_TABLE_ORDER + PAGE_SHIFT - 3);
                uasm_il_bnez(p, r, scratch, label_vmalloc);
 
                if (pgd_reg == -1) {
@@ -1493,12 +1493,12 @@ static void setup_pw(void)
 #endif
        pgd_i = PGDIR_SHIFT;  /* 1st level PGD */
 #ifndef __PAGETABLE_PMD_FOLDED
-       pgd_w = PGDIR_SHIFT - PMD_SHIFT + PGD_ORDER;
+       pgd_w = PGDIR_SHIFT - PMD_SHIFT + PGD_TABLE_ORDER;
 
        pmd_i = PMD_SHIFT;    /* 2nd level PMD */
        pmd_w = PMD_SHIFT - PAGE_SHIFT;
 #else
-       pgd_w = PGDIR_SHIFT - PAGE_SHIFT + PGD_ORDER;
+       pgd_w = PGDIR_SHIFT - PAGE_SHIFT + PGD_TABLE_ORDER;
 #endif
 
        pt_i  = PAGE_SHIFT;    /* 3rd level PTE */
@@ -1536,7 +1536,7 @@ static void build_loongson3_tlb_refill_handler(void)
 
        if (check_for_high_segbits) {
                uasm_i_dmfc0(&p, K0, C0_BADVADDR);
-               uasm_i_dsrl_safe(&p, K1, K0, PGDIR_SHIFT + PGD_ORDER + PAGE_SHIFT - 3);
+               uasm_i_dsrl_safe(&p, K1, K0, PGDIR_SHIFT + PGD_TABLE_ORDER + PAGE_SHIFT - 3);
                uasm_il_beqz(&p, &r, K1, label_vmalloc);
                uasm_i_nop(&p);
 
@@ -2611,7 +2611,7 @@ void build_tlb_refill_handler(void)
        check_pabits();
 
 #ifdef CONFIG_64BIT
-       check_for_high_segbits = current_cpu_data.vmbits > (PGDIR_SHIFT + PGD_ORDER + PAGE_SHIFT - 3);
+       check_for_high_segbits = current_cpu_data.vmbits > (PGDIR_SHIFT + PGD_TABLE_ORDER + PAGE_SHIFT - 3);
 #endif
 
        if (cpu_has_3kex) {