ARM: head.S: rename PMD_ORDER to PMD_ENTRY_ORDER

PMD_ORDER denotes order of magnitude for a PMD entry, i.e PMD entry size
is 2 ^ PMD_ORDER.

Rename PMD_ORDER to PMD_ENTRY_ORDER to allow a generic definition of
PMD_ORDER as order of a PMD allocation: (PMD_SHIFT - PAGE_SHIFT).

Link: https://lkml.kernel.org/r/20220705154708.181258-16-rppt@kernel.org
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Acked-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 500612d3da2e2c8b983a0dfeed9e380132238587..29e2900178a1f4c70888fc9e8164924b59a8821c 100644 (file)
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -38,10 +38,10 @@
 #ifdef CONFIG_ARM_LPAE
        /* LPAE requires an additional page for the PGD */
 #define PG_DIR_SIZE    0x5000
-#define PMD_ORDER      3
+#define PMD_ENTRY_ORDER        3       /* PMD entry size is 2^PMD_ENTRY_ORDER */
 #else
 #define PG_DIR_SIZE    0x4000
-#define PMD_ORDER      2
+#define PMD_ENTRY_ORDER        2
 #endif
 
        .globl  swapper_pg_dir
@@ -240,7 +240,7 @@ __create_page_tables:
        mov     r6, r6, lsr #SECTION_SHIFT
 
 1:     orr     r3, r7, r5, lsl #SECTION_SHIFT  @ flags + kernel base
-       str     r3, [r4, r5, lsl #PMD_ORDER]    @ identity mapping
+       str     r3, [r4, r5, lsl #PMD_ENTRY_ORDER]      @ identity mapping
        cmp     r5, r6
        addlo   r5, r5, #1                      @ next section
        blo     1b
@@ -250,7 +250,7 @@ __create_page_tables:
         * set two variables to indicate the physical start and end of the
         * kernel.
         */
-       add     r0, r4, #KERNEL_OFFSET >> (SECTION_SHIFT - PMD_ORDER)
+       add     r0, r4, #KERNEL_OFFSET >> (SECTION_SHIFT - PMD_ENTRY_ORDER)
        ldr     r6, =(_end - 1)
        adr_l   r5, kernel_sec_start            @ _pa(kernel_sec_start)
 #if defined CONFIG_CPU_ENDIAN_BE8 || defined CONFIG_CPU_ENDIAN_BE32
@@ -259,8 +259,8 @@ __create_page_tables:
        str     r8, [r5]                        @ Save physical start of kernel (LE)
 #endif
        orr     r3, r8, r7                      @ Add the MMU flags
-       add     r6, r4, r6, lsr #(SECTION_SHIFT - PMD_ORDER)
-1:     str     r3, [r0], #1 << PMD_ORDER
+       add     r6, r4, r6, lsr #(SECTION_SHIFT - PMD_ENTRY_ORDER)
+1:     str     r3, [r0], #1 << PMD_ENTRY_ORDER
        add     r3, r3, #1 << SECTION_SHIFT
        cmp     r0, r6
        bls     1b
@@ -280,14 +280,14 @@ __create_page_tables:
        mov     r3, pc
        mov     r3, r3, lsr #SECTION_SHIFT
        orr     r3, r7, r3, lsl #SECTION_SHIFT
-       add     r0, r4,  #(XIP_START & 0xff000000) >> (SECTION_SHIFT - PMD_ORDER)
-       str     r3, [r0, #((XIP_START & 0x00f00000) >> SECTION_SHIFT) << PMD_ORDER]!
+       add     r0, r4,  #(XIP_START & 0xff000000) >> (SECTION_SHIFT - PMD_ENTRY_ORDER)
+       str     r3, [r0, #((XIP_START & 0x00f00000) >> SECTION_SHIFT) << PMD_ENTRY_ORDER]!
        ldr     r6, =(_edata_loc - 1)
-       add     r0, r0, #1 << PMD_ORDER
-       add     r6, r4, r6, lsr #(SECTION_SHIFT - PMD_ORDER)
+       add     r0, r0, #1 << PMD_ENTRY_ORDER
+       add     r6, r4, r6, lsr #(SECTION_SHIFT - PMD_ENTRY_ORDER)
 1:     cmp     r0, r6
        add     r3, r3, #1 << SECTION_SHIFT
-       strls   r3, [r0], #1 << PMD_ORDER
+       strls   r3, [r0], #1 << PMD_ENTRY_ORDER
        bls     1b
 #endif
 
@@ -297,10 +297,10 @@ __create_page_tables:
         */
        mov     r0, r2, lsr #SECTION_SHIFT
        cmp     r2, #0
-       ldrne   r3, =FDT_FIXED_BASE >> (SECTION_SHIFT - PMD_ORDER)
+       ldrne   r3, =FDT_FIXED_BASE >> (SECTION_SHIFT - PMD_ENTRY_ORDER)
        addne   r3, r3, r4
        orrne   r6, r7, r0, lsl #SECTION_SHIFT
-       strne   r6, [r3], #1 << PMD_ORDER
+       strne   r6, [r3], #1 << PMD_ENTRY_ORDER
        addne   r6, r6, #1 << SECTION_SHIFT
        strne   r6, [r3]
 
@@ -319,7 +319,7 @@ __create_page_tables:
        addruart r7, r3, r0
 
        mov     r3, r3, lsr #SECTION_SHIFT
-       mov     r3, r3, lsl #PMD_ORDER
+       mov     r3, r3, lsl #PMD_ENTRY_ORDER
 
        add     r0, r4, r3
        mov     r3, r7, lsr #SECTION_SHIFT
@@ -349,7 +349,7 @@ __create_page_tables:
         * If we're using the NetWinder or CATS, we also need to map
         * in the 16550-type serial port for the debug messages
         */
-       add     r0, r4, #0xff000000 >> (SECTION_SHIFT - PMD_ORDER)
+       add     r0, r4, #0xff000000 >> (SECTION_SHIFT - PMD_ENTRY_ORDER)
        orr     r3, r7, #0x7c000000
        str     r3, [r0]
 #endif
@@ -359,10 +359,10 @@ __create_page_tables:
         * Similar reasons here - for debug.  This is
         * only for Acorn RiscPC architectures.
         */
-       add     r0, r4, #0x02000000 >> (SECTION_SHIFT - PMD_ORDER)
+       add     r0, r4, #0x02000000 >> (SECTION_SHIFT - PMD_ENTRY_ORDER)
        orr     r3, r7, #0x02000000
        str     r3, [r0]
-       add     r0, r4, #0xd8000000 >> (SECTION_SHIFT - PMD_ORDER)
+       add     r0, r4, #0xd8000000 >> (SECTION_SHIFT - PMD_ENTRY_ORDER)
        str     r3, [r0]
 #endif
 #endif