Commit 7820856a authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/mm/book3e/64: Remove unsupported 64Kpage size from 64bit booke 



We have in Kconfig

config PPC_64K_PAGES
	bool "64k page size"
	depends on !PPC_FSL_BOOK3E && (44x || PPC_BOOK3S_64 || PPC_BOOK3E_64)
	select HAVE_ARCH_SOFT_DIRTY if PPC_BOOK3S_64

Only supported BOOK3E 64 bit platforms is FSL_BOOK3E. Remove the dead 64k page
support code from 64bit nohash.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 8ce74cff

arch/powerpc/include/asm/mmu-book3e.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -230,10 +230,6 @@ typedef struct { 
	unsigned int	id;

	unsigned int	id;

	unsigned int	active;

	unsigned int	active;

	unsigned long	vdso_base;

	unsigned long	vdso_base;

#ifdef CONFIG_PPC_64K_PAGES

	/* for 4K PTE fragment support */

	void *pte_frag;

#endif

} mm_context_t;

} mm_context_t;





/* Page size definitions, common between 32 and 64-bit

/* Page size definitions, common between 32 and 64-bit
@@ -275,8 +271,6 @@ static inline unsigned int mmu_psize_to_shift(unsigned int mmu_psize) 
 */

 */

#if defined(CONFIG_PPC_4K_PAGES)

#if defined(CONFIG_PPC_4K_PAGES)

#define mmu_virtual_psize	MMU_PAGE_4K

#define mmu_virtual_psize	MMU_PAGE_4K

#elif defined(CONFIG_PPC_64K_PAGES)

#define mmu_virtual_psize	MMU_PAGE_64K

#else

#else

#error Unsupported page size

#error Unsupported page size

#endif

#endif

arch/powerpc/include/asm/nohash/64/pgalloc.h

+0 −60
Original line number Original line Diff line number Diff line
@@ -52,8 +52,6 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) 
	kmem_cache_free(PGT_CACHE(PGD_INDEX_SIZE), pgd);

	kmem_cache_free(PGT_CACHE(PGD_INDEX_SIZE), pgd);

}

}





#ifndef CONFIG_PPC_64K_PAGES



#define pgd_populate(MM, PGD, PUD)	pgd_set(PGD, (unsigned long)PUD)

#define pgd_populate(MM, PGD, PUD)	pgd_set(PGD, (unsigned long)PUD)





static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)

static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
@@ -131,64 +129,6 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table, 
	pgtable_free_tlb(tlb, page_address(table), 0);

	pgtable_free_tlb(tlb, page_address(table), 0);

}

}





#else /* if CONFIG_PPC_64K_PAGES */



extern pte_t *pte_fragment_alloc(struct mm_struct *, unsigned long, int);

extern void pte_fragment_free(unsigned long *, int);

extern void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift);

#ifdef CONFIG_SMP

extern void __tlb_remove_table(void *_table);

#endif



#define pud_populate(mm, pud, pmd)	pud_set(pud, (unsigned long)pmd)



static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,

				       pte_t *pte)

{

	pmd_set(pmd, (unsigned long)pte);

}



static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,

				pgtable_t pte_page)

{

	pmd_set(pmd, (unsigned long)pte_page);

}



static inline pgtable_t pmd_pgtable(pmd_t pmd)

{

	return (pgtable_t)(pmd_val(pmd) & ~PMD_MASKED_BITS);

}



static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,

					  unsigned long address)

{

	return (pte_t *)pte_fragment_alloc(mm, address, 1);

}



static inline pgtable_t pte_alloc_one(struct mm_struct *mm,

					unsigned long address)

{

	return (pgtable_t)pte_fragment_alloc(mm, address, 0);

}



static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)

{

	pte_fragment_free((unsigned long *)pte, 1);

}



static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage)

{

	pte_fragment_free((unsigned long *)ptepage, 0);

}



static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,

				  unsigned long address)

{

	tlb_flush_pgtable(tlb, address);

	pgtable_free_tlb(tlb, table, 0);

}

#endif /* CONFIG_PPC_64K_PAGES */



static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)

static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)

{

{

	return kmem_cache_alloc(PGT_CACHE(PMD_CACHE_INDEX),

	return kmem_cache_alloc(PGT_CACHE(PMD_CACHE_INDEX),

arch/powerpc/include/asm/nohash/64/pgtable-64k.h

deleted100644 → 0
+0 −57
Original line number Original line Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_POWERPC_NOHASH_64_PGTABLE_64K_H

#define _ASM_POWERPC_NOHASH_64_PGTABLE_64K_H



#define __ARCH_USE_5LEVEL_HACK

#include <asm-generic/pgtable-nopud.h>





#define PTE_INDEX_SIZE  8

#define PMD_INDEX_SIZE  10

#define PUD_INDEX_SIZE	0

#define PGD_INDEX_SIZE  12



/*

 * we support 32 fragments per PTE page of 64K size

 */

#define PTE_FRAG_NR	32

/*

 * We use a 2K PTE page fragment and another 2K for storing

 * real_pte_t hash index

 */

#define PTE_FRAG_SIZE_SHIFT  11

#define PTE_FRAG_SIZE (1UL << PTE_FRAG_SIZE_SHIFT)



#ifndef __ASSEMBLY__

#define PTE_TABLE_SIZE	PTE_FRAG_SIZE

#define PMD_TABLE_SIZE	(sizeof(pmd_t) << PMD_INDEX_SIZE)

#define PUD_TABLE_SIZE	(0)

#define PGD_TABLE_SIZE	(sizeof(pgd_t) << PGD_INDEX_SIZE)

#endif	/* __ASSEMBLY__ */



#define PTRS_PER_PTE	(1 << PTE_INDEX_SIZE)

#define PTRS_PER_PMD	(1 << PMD_INDEX_SIZE)

#define PTRS_PER_PGD	(1 << 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)

#define PMD_MASK	(~(PMD_SIZE-1))



/* PGDIR_SHIFT determines what a third-level page table entry can map */

#define PGDIR_SHIFT	(PMD_SHIFT + PMD_INDEX_SIZE)

#define PGDIR_SIZE	(1UL << PGDIR_SHIFT)

#define PGDIR_MASK	(~(PGDIR_SIZE-1))



/*

 * Bits to mask out from a PMD to get to the PTE page

 * PMDs point to PTE table fragments which are PTE_FRAG_SIZE aligned.

 */

#define PMD_MASKED_BITS		(PTE_FRAG_SIZE - 1)

/* Bits to mask out from a PGD/PUD to get to the PMD page */

#define PUD_MASKED_BITS		0x1ff



#define pgd_pte(pgd)	(pud_pte(((pud_t){ pgd })))

#define pte_pgd(pte)	((pgd_t)pte_pud(pte))



#endif /* _ASM_POWERPC_NOHASH_64_PGTABLE_64K_H */

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -6,13 +6,13 @@ 
 * the ppc64 hashed page table.

 * the ppc64 hashed page table.

 */

 */





#ifdef CONFIG_PPC_64K_PAGES

#include <asm/nohash/64/pgtable-64k.h>

#else

#include <asm/nohash/64/pgtable-4k.h>

#include <asm/nohash/64/pgtable-4k.h>

#endif

#include <asm/barrier.h>

#include <asm/barrier.h>





#ifdef CONFIG_PPC_64K_PAGES

#error "Page size not supported"

#endif



#define FIRST_USER_ADDRESS	0UL

#define FIRST_USER_ADDRESS	0UL





/*

/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE