Commit e72421a0 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Define swapper_pg_dir[] in C 



Don't duplicate swapper_pg_dir[] in each platform's head.S

Define it in mm/pgtable.c

Define MAX_PTRS_PER_PGD because on book3s/64 PTRS_PER_PGD is
not a constant.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/5e3f1b8a4695c33ccc80aa3870e016bef32b85e1.1623063174.git.christophe.leroy@csgroup.eu
parent 45b30faf

arch/powerpc/include/asm/book3s/64/pgtable.h

+3 −0
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ extern unsigned long __pmd_frag_size_shift; 
#define PTRS_PER_PUD	(1 << PUD_INDEX_SIZE)

#define PTRS_PER_PGD	(1 << PGD_INDEX_SIZE)



#define MAX_PTRS_PER_PGD	(1 << (H_PGD_INDEX_SIZE > RADIX_PGD_INDEX_SIZE ? \

				       H_PGD_INDEX_SIZE : RADIX_PGD_INDEX_SIZE))



/* PMD_SHIFT determines what a second-level page table entry can map */

#define PMD_SHIFT	(PAGE_SHIFT + PTE_INDEX_SIZE)

#define PMD_SIZE	(1UL << PMD_SHIFT)

arch/powerpc/include/asm/pgtable.h

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ struct mm_struct; 


#ifndef __ASSEMBLY__



#ifndef MAX_PTRS_PER_PGD

#define MAX_PTRS_PER_PGD PTRS_PER_PGD

#endif



/* Keep these as a macros to avoid include dependency mess */

#define pte_page(x)		pfn_to_page(pte_pfn(x))

#define mk_pte(page, pgprot)	pfn_pte(page_to_pfn(page), (pgprot))

arch/powerpc/kernel/asm-offsets.c

+0 −5
Original line number Diff line number Diff line
@@ -354,11 +354,6 @@ int main(void) 
	DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));

#endif



#ifdef CONFIG_PPC_BOOK3S_64

	DEFINE(PGD_TABLE_SIZE, (sizeof(pgd_t) << max(RADIX_PGD_INDEX_SIZE, H_PGD_INDEX_SIZE)));

#else

	DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);

#endif

	DEFINE(PTE_SIZE, sizeof(pte_t));



#ifdef CONFIG_KVM

arch/powerpc/kernel/head_40x.S

+0 −11
Original line number Diff line number Diff line
@@ -701,14 +701,3 @@ _GLOBAL(abort) 
        mfspr   r13,SPRN_DBCR0

        oris    r13,r13,DBCR0_RST_SYSTEM@h

        mtspr   SPRN_DBCR0,r13
 


/* We put a few things here that have to be page-aligned. This stuff

 * goes at the beginning of the data segment, which is page-aligned.

 */

	.data

	.align	12

	.globl	sdata

sdata:

	.globl	swapper_pg_dir

swapper_pg_dir:

	.space	PGD_TABLE_SIZE

arch/powerpc/kernel/head_44x.S

+1 −16
Original line number Diff line number Diff line
@@ -1233,23 +1233,8 @@ head_start_common: 
	isync

	blr



/*

 * We put a few things here that have to be page-aligned. This stuff

 * goes at the beginning of the data segment, which is page-aligned.

 */

	.data

	.align	PAGE_SHIFT

	.globl	sdata

sdata:



/*

 * To support >32-bit physical addresses, we use an 8KB pgdir.

 */

	.globl	swapper_pg_dir

swapper_pg_dir:

	.space	PGD_TABLE_SIZE



#ifdef CONFIG_SMP

	.data

	.align	12

temp_boot_stack:

	.space	1024