Commit 32a74949 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc/mm: Add support for SPARSEMEM_VMEMMAP on 64-bit Book3E 



The base TLB support didn't include support for SPARSEMEM_VMEMMAP, though
we did carve out some virtual space for it, the necessary support code
wasn't there. This implements it by using 16M pages for now, though the
page size could easily be changed at runtime if necessary.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 25d21ad6

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

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT]; 
#endif



extern int mmu_linear_psize;

extern int mmu_vmemmap_psize;



#endif /* !__ASSEMBLY__ */

arch/powerpc/include/asm/pgtable-ppc64.h

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
/*

 * The vmalloc space starts at the beginning of that region, and

 * occupies half of it on hash CPUs and a quarter of it on Book3E

 * (we keep a quarter for the virtual memmap)

 */

#define VMALLOC_START	KERN_VIRT_START

#ifdef CONFIG_PPC_BOOK3E
@@ -83,7 +84,7 @@ 


#define VMALLOC_REGION_ID	(REGION_ID(VMALLOC_START))

#define KERNEL_REGION_ID	(REGION_ID(PAGE_OFFSET))

#define VMEMMAP_REGION_ID	(0xfUL)

#define VMEMMAP_REGION_ID	(0xfUL)	/* Server only */

#define USER_REGION_ID		(0UL)



/*

arch/powerpc/mm/init_64.c

+48 −7
Original line number Diff line number Diff line
@@ -205,6 +205,47 @@ static int __meminit vmemmap_populated(unsigned long start, int page_size) 
	return 0;

}



/* On hash-based CPUs, the vmemmap is bolted in the hash table.

 *

 * On Book3E CPUs, the vmemmap is currently mapped in the top half of

 * the vmalloc space using normal page tables, though the size of

 * pages encoded in the PTEs can be different

 */



#ifdef CONFIG_PPC_BOOK3E

static void __meminit vmemmap_create_mapping(unsigned long start,

					     unsigned long page_size,

					     unsigned long phys)

{

	/* Create a PTE encoding without page size */

	unsigned long i, flags = _PAGE_PRESENT | _PAGE_ACCESSED |

		_PAGE_KERNEL_RW;



	/* PTEs only contain page size encodings up to 32M */

	BUG_ON(mmu_psize_defs[mmu_vmemmap_psize].enc > 0xf);



	/* Encode the size in the PTE */

	flags |= mmu_psize_defs[mmu_vmemmap_psize].enc << 8;



	/* For each PTE for that area, map things. Note that we don't

	 * increment phys because all PTEs are of the large size and

	 * thus must have the low bits clear

	 */

	for (i = 0; i < page_size; i += PAGE_SIZE)

		BUG_ON(map_kernel_page(start + i, phys, flags));

}

#else /* CONFIG_PPC_BOOK3E */

static void __meminit vmemmap_create_mapping(unsigned long start,

					     unsigned long page_size,

					     unsigned long phys)

{

	int  mapped = htab_bolt_mapping(start, start + page_size, phys,

					PAGE_KERNEL, mmu_vmemmap_psize,

					mmu_kernel_ssize);

	BUG_ON(mapped < 0);

}

#endif /* CONFIG_PPC_BOOK3E */



int __meminit vmemmap_populate(struct page *start_page,

			       unsigned long nr_pages, int node)

{
@@ -215,8 +256,11 @@ int __meminit vmemmap_populate(struct page *start_page, 
	/* Align to the page size of the linear mapping. */

	start = _ALIGN_DOWN(start, page_size);



	pr_debug("vmemmap_populate page %p, %ld pages, node %d\n",

		 start_page, nr_pages, node);

	pr_debug(" -> map %lx..%lx\n", start, end);



	for (; start < end; start += page_size) {

		int mapped;

		void *p;



		if (vmemmap_populated(start, page_size))
@@ -226,13 +270,10 @@ int __meminit vmemmap_populate(struct page *start_page, 
		if (!p)

			return -ENOMEM;



		pr_debug("vmemmap %08lx allocated at %p, physical %08lx.\n",

			start, p, __pa(p));

		pr_debug("      * %016lx..%016lx allocated at %p\n",

			 start, start + page_size, p);



		mapped = htab_bolt_mapping(start, start + page_size, __pa(p),

					   pgprot_val(PAGE_KERNEL),

					   mmu_vmemmap_psize, mmu_kernel_ssize);

		BUG_ON(mapped < 0);

		vmemmap_create_mapping(start, page_size, __pa(p));

	}



	return 0;

arch/powerpc/mm/mmu_decl.h

+6 −1
Original line number Diff line number Diff line
@@ -121,7 +121,12 @@ extern unsigned int rtas_data, rtas_size; 
struct hash_pte;

extern struct hash_pte *Hash, *Hash_end;

extern unsigned long Hash_size, Hash_mask;

#endif



#endif /* CONFIG_PPC32 */



#ifdef CONFIG_PPC64

extern int map_kernel_page(unsigned long ea, unsigned long pa, int flags);

#endif /* CONFIG_PPC64 */



extern unsigned long ioremap_bot;

extern unsigned long __max_low_memory;

arch/powerpc/mm/pgtable_64.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static void *early_alloc_pgtable(unsigned long size) 
 * map_kernel_page adds an entry to the ioremap page table

 * and adds an entry to the HPT, possibly bolting it

 */

static int map_kernel_page(unsigned long ea, unsigned long pa, int flags)

int map_kernel_page(unsigned long ea, unsigned long pa, int flags)

{

	pgd_t *pgdp;

	pud_t *pudp;

CRA Git | Maintained and supported by SUSTech CRA and CCSE