Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arm64/mm: Unify CONT_PTE_SHIFT

CONT_PTE_SHIFT actually depends on CONFIG_ARM64_CONT_SHIFT. It's
reasonable to reflect the dependency:

* This renames CONFIG_ARM64_CONT_SHIFT to CONFIG_ARM64_CONT_PTE_SHIFT,
so that we can introduce CONFIG_ARM64_CONT_PMD_SHIFT later.

* CONT_{SHIFT, SIZE, MASK}, defined in page-def.h are removed as they
are not used by anyone.

* CONT_PTE_SHIFT is determined by CONFIG_ARM64_CONT_PTE_SHIFT.

Signed-off-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20200910095936.20307-2-gshan@redhat.com
Signed-off-by: Will Deacon <will@kernel.org>

authored by

Gavin Shan and committed by
Will Deacon
c0d6de32 11e339d5

+2 -9
+1 -1
arch/arm64/Kconfig
··· 211 211 default 14 if ARM64_16K_PAGES 212 212 default 12 213 213 214 - config ARM64_CONT_SHIFT 214 + config ARM64_CONT_PTE_SHIFT 215 215 int 216 216 default 5 if ARM64_64K_PAGES 217 217 default 7 if ARM64_16K_PAGES
-5
arch/arm64/include/asm/page-def.h
··· 11 11 #include <linux/const.h> 12 12 13 13 /* PAGE_SHIFT determines the page size */ 14 - /* CONT_SHIFT determines the number of pages which can be tracked together */ 15 14 #define PAGE_SHIFT CONFIG_ARM64_PAGE_SHIFT 16 - #define CONT_SHIFT CONFIG_ARM64_CONT_SHIFT 17 15 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) 18 16 #define PAGE_MASK (~(PAGE_SIZE-1)) 19 - 20 - #define CONT_SIZE (_AC(1, UL) << (CONT_SHIFT + PAGE_SHIFT)) 21 - #define CONT_MASK (~(CONT_SIZE-1)) 22 17 23 18 #endif /* __ASM_PAGE_DEF_H */
+1 -3
arch/arm64/include/asm/pgtable-hwdef.h
··· 81 81 /* 82 82 * Contiguous page definitions. 83 83 */ 84 + #define CONT_PTE_SHIFT (CONFIG_ARM64_CONT_PTE_SHIFT + PAGE_SHIFT) 84 85 #ifdef CONFIG_ARM64_64K_PAGES 85 - #define CONT_PTE_SHIFT (5 + PAGE_SHIFT) 86 86 #define CONT_PMD_SHIFT (5 + PMD_SHIFT) 87 87 #elif defined(CONFIG_ARM64_16K_PAGES) 88 - #define CONT_PTE_SHIFT (7 + PAGE_SHIFT) 89 88 #define CONT_PMD_SHIFT (5 + PMD_SHIFT) 90 89 #else 91 - #define CONT_PTE_SHIFT (4 + PAGE_SHIFT) 92 90 #define CONT_PMD_SHIFT (4 + PMD_SHIFT) 93 91 #endif 94 92