loongarch: drop definition of PTE_ORDER

This is the order of the page table allocation, not the order of a PTE.
Since its always hardwired to 0, simply drop it.

Link: https://lkml.kernel.org/r/20220703141203.147893-10-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/loongarch/include/asm/pgtable.h b/arch/loongarch/include/asm/pgtable.h
index d9e86cfa53e2203afa60c09855d670d42a9efce5..e0bbfc31fe7263006f7b9ac9bea1fc40ad86a8bc 100644 (file)
--- a/arch/loongarch/include/asm/pgtable.h
+++ b/arch/loongarch/include/asm/pgtable.h
@@ -24,17 +24,16 @@
 #define PGD_ORDER              0
 #define PUD_ORDER              0
 #define PMD_ORDER              0
-#define PTE_ORDER              0
 
 #if CONFIG_PGTABLE_LEVELS == 2
-#define PGDIR_SHIFT    (PAGE_SHIFT + (PAGE_SHIFT + PTE_ORDER - 3))
+#define PGDIR_SHIFT    (PAGE_SHIFT + (PAGE_SHIFT - 3))
 #elif CONFIG_PGTABLE_LEVELS == 3
-#define PMD_SHIFT      (PAGE_SHIFT + (PAGE_SHIFT + PTE_ORDER - 3))
+#define PMD_SHIFT      (PAGE_SHIFT + (PAGE_SHIFT - 3))
 #define PMD_SIZE       (1UL << PMD_SHIFT)
 #define PMD_MASK       (~(PMD_SIZE-1))
 #define PGDIR_SHIFT    (PMD_SHIFT + (PAGE_SHIFT + PMD_ORDER - 3))
 #elif CONFIG_PGTABLE_LEVELS == 4
-#define PMD_SHIFT      (PAGE_SHIFT + (PAGE_SHIFT + PTE_ORDER - 3))
+#define PMD_SHIFT      (PAGE_SHIFT + (PAGE_SHIFT - 3))
 #define PMD_SIZE       (1UL << PMD_SHIFT)
 #define PMD_MASK       (~(PMD_SIZE-1))
 #define PUD_SHIFT      (PMD_SHIFT + (PAGE_SHIFT + PMD_ORDER - 3))
@@ -55,7 +54,7 @@
 #if CONFIG_PGTABLE_LEVELS > 2
 #define PTRS_PER_PMD   ((PAGE_SIZE << PMD_ORDER) >> 3)
 #endif
-#define PTRS_PER_PTE   ((PAGE_SIZE << PTE_ORDER) >> 3)
+#define PTRS_PER_PTE   (PAGE_SIZE >> 3)
 
 #define USER_PTRS_PER_PGD       ((TASK_SIZE64 / PGDIR_SIZE)?(TASK_SIZE64 / PGDIR_SIZE):1)
 

diff --git a/arch/loongarch/kernel/asm-offsets.c b/arch/loongarch/kernel/asm-offsets.c
index bfb65eb2844f501b9ceb297fe9c0d4377e65079b..1a1166a7e61cfea730642a9fd0b9acca76f8dde3 100644 (file)
--- a/arch/loongarch/kernel/asm-offsets.c
+++ b/arch/loongarch/kernel/asm-offsets.c
@@ -194,7 +194,6 @@ void output_mm_defines(void)
 #ifndef __PAGETABLE_PMD_FOLDED
        DEFINE(_PMD_ORDER, PMD_ORDER);
 #endif
-       DEFINE(_PTE_ORDER, PTE_ORDER);
        BLANK();
        DEFINE(_PMD_SHIFT, PMD_SHIFT);
        DEFINE(_PGDIR_SHIFT, PGDIR_SHIFT);

diff --git a/arch/loongarch/mm/tlbex.S b/arch/loongarch/mm/tlbex.S
index 7eee402715774772992fe99c277d92f8f74921cf..e36c2c07dee37f0a0cbfc79770679ab279cdf12e 100644 (file)
--- a/arch/loongarch/mm/tlbex.S
+++ b/arch/loongarch/mm/tlbex.S
@@ -83,7 +83,7 @@ vmalloc_done_load:
        bne     t0, $r0, tlb_huge_update_load
 
        csrrd   t0, LOONGARCH_CSR_BADV
-       srli.d  t0, t0, (PAGE_SHIFT + PTE_ORDER)
+       srli.d  t0, t0, PAGE_SHIFT
        andi    t0, t0, (PTRS_PER_PTE - 1)
        slli.d  t0, t0, _PTE_T_LOG2
        add.d   t1, ra, t0
@@ -247,7 +247,7 @@ vmalloc_done_store:
        bne     t0, $r0, tlb_huge_update_store
 
        csrrd   t0, LOONGARCH_CSR_BADV
-       srli.d  t0, t0, (PAGE_SHIFT + PTE_ORDER)
+       srli.d  t0, t0, PAGE_SHIFT
        andi    t0, t0, (PTRS_PER_PTE - 1)
        slli.d  t0, t0, _PTE_T_LOG2
        add.d   t1, ra, t0
@@ -414,7 +414,7 @@ vmalloc_done_modify:
        bne     t0, $r0, tlb_huge_update_modify
 
        csrrd   t0, LOONGARCH_CSR_BADV
-       srli.d  t0, t0, (PAGE_SHIFT + PTE_ORDER)
+       srli.d  t0, t0, PAGE_SHIFT
        andi    t0, t0, (PTRS_PER_PTE - 1)
        slli.d  t0, t0, _PTE_T_LOG2
        add.d   t1, ra, t0