Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

powerpc/mm: Extend pte_fragment functionality to PPC32 



In order to allow the 8xx to handle pte_fragments, this patch
extends the use of pte_fragments to PPC32 platforms.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent a74791dd

arch/powerpc/include/asm/book3s/32/mmu-hash.h

+4 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_POWERPC_BOOK3S_32_MMU_HASH_H_

#define _ASM_POWERPC_BOOK3S_32_MMU_HASH_H_



/*

 * 32-bit hash table MMU support

 */
@@ -9,6 +10,8 @@ 
 * BATs

 */



#include <asm/page.h>



/* Block size masks */

#define BL_128K	0x000

#define BL_256K 0x001
@@ -43,7 +46,7 @@ struct ppc_bat { 
	u32 batl;

};



typedef struct page *pgtable_t;

typedef pte_t *pgtable_t;

#endif /* !__ASSEMBLY__ */



/*

arch/powerpc/include/asm/book3s/32/pgalloc.h

+9 −8
Original line number Diff line number Diff line
@@ -59,30 +59,31 @@ static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, 
static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmdp,

				pgtable_t pte_page)

{

	*pmdp = __pmd((page_to_pfn(pte_page) << PAGE_SHIFT) | _PMD_PRESENT);

	*pmdp = __pmd(__pa(pte_page) | _PMD_PRESENT);

}



#define pmd_pgtable(pmd) pmd_page(pmd)

#define pmd_pgtable(pmd) ((pgtable_t)pmd_page_vaddr(pmd))



extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr);

extern pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addr);

void pte_frag_destroy(void *pte_frag);

pte_t *pte_fragment_alloc(struct mm_struct *mm, unsigned long vmaddr, int kernel);

void pte_fragment_free(unsigned long *table, int kernel);



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

{

	free_page((unsigned long)pte);

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

}



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

{

	pgtable_page_dtor(ptepage);

	__free_page(ptepage);

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

}



static inline void pgtable_free(void *table, unsigned index_size)

{

	if (!index_size) {

		pgtable_page_dtor(virt_to_page(table));

		free_page((unsigned long)table);

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

	} else {

		BUG_ON(index_size > MAX_PGTABLE_INDEX_SIZE);

		kmem_cache_free(PGT_CACHE(index_size), table);
@@ -120,6 +121,6 @@ static inline void pgtable_free_tlb(struct mmu_gather *tlb, 
static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,

				  unsigned long address)

{

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

	pgtable_free_tlb(tlb, table, 0);

}

#endif /* _ASM_POWERPC_BOOK3S_32_PGALLOC_H */

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

+3 −2
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma, 
#define pte_same(A,B)	(((pte_val(A) ^ pte_val(B)) & ~_PAGE_HASHPTE) == 0)



#define pmd_page_vaddr(pmd)	\

	((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))

	((unsigned long)__va(pmd_val(pmd) & ~(PTE_TABLE_SIZE - 1)))

#define pmd_page(pmd)		\

	pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)
@@ -346,7 +346,8 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma, 
#define pte_offset_kernel(dir, addr)	\

	((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(addr))

#define pte_offset_map(dir, addr)		\

	((pte_t *) kmap_atomic(pmd_page(*(dir))) + pte_index(addr))

	((pte_t *)(kmap_atomic(pmd_page(*(dir))) + \

		   (pmd_page_vaddr(*(dir)) & ~PAGE_MASK)) + pte_index(addr))

#define pte_unmap(pte)		kunmap_atomic(pte)



/*

arch/powerpc/include/asm/mmu_context.h

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static inline int arch_dup_mmap(struct mm_struct *oldmm, 
	return 0;

}



#ifndef CONFIG_PPC_BOOK3S_64

#ifdef CONFIG_PPC_BOOK3E_64

static inline void arch_exit_mmap(struct mm_struct *mm)

{

}

arch/powerpc/include/asm/nohash/32/mmu.h

+3 −1
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#ifndef _ASM_POWERPC_NOHASH_32_MMU_H_

#define _ASM_POWERPC_NOHASH_32_MMU_H_



#include <asm/page.h>



#if defined(CONFIG_40x)

/* 40x-style software loaded TLB */

#include <asm/nohash/32/mmu-40x.h>
@@ -17,7 +19,7 @@ 
#endif



#ifndef __ASSEMBLY__

typedef struct page *pgtable_t;

typedef pte_t *pgtable_t;

#endif



#endif /* _ASM_POWERPC_NOHASH_32_MMU_H_ */