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

Commit 332b42e4 authored by Helge Deller's avatar Helge Deller
Browse files

parisc: Increase initial kernel mapping to 32MB on 64bit kernel 



For the 64bit kernel the initially 16 MB kernel memory might become too
small if you build a kernel with many modules built-in and with kernel
text and data areas mapped on huge pages.

This patch increases the initial mapping to 32MB for 64bit kernels and
keeps 16MB for 32bit kernels.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 4182d0cd

arch/parisc/include/asm/pgtable.h

+5 −1
Original line number Diff line number Diff line
@@ -83,7 +83,11 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr) 
	printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, (unsigned long)pgd_val(e))



/* This is the size of the initially mapped kernel memory */

#define KERNEL_INITIAL_ORDER	24	/* 0 to 1<<24 = 16MB */

#ifdef CONFIG_64BIT

#define KERNEL_INITIAL_ORDER	25	/* 1<<25 = 32MB */

#else

#define KERNEL_INITIAL_ORDER	24	/* 1<<24 = 16MB */

#endif

#define KERNEL_INITIAL_SIZE	(1 << KERNEL_INITIAL_ORDER)



#if CONFIG_PGTABLE_LEVELS == 3

arch/parisc/kernel/head.S

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ $bss_loop: 
	stw,ma          %arg2,4(%r1)

	stw,ma          %arg3,4(%r1)



	/* Initialize startup VM. Just map first 8/16 MB of memory */

	/* Initialize startup VM. Just map first 16/32 MB of memory */

	load32		PA(swapper_pg_dir),%r4

	mtctl		%r4,%cr24	/* Initialize kernel root pointer */

	mtctl		%r4,%cr25	/* Initialize user root pointer */
@@ -107,7 +107,7 @@ $bss_loop: 
	/* Now initialize the PTEs themselves.  We use RWX for

	 * everything ... it will get remapped correctly later */

	ldo		0+_PAGE_KERNEL_RWX(%r0),%r3 /* Hardwired 0 phys addr start */

	ldi		(1<<(KERNEL_INITIAL_ORDER-PAGE_SHIFT)),%r11 /* PFN count */

	load32		(1<<(KERNEL_INITIAL_ORDER-PAGE_SHIFT)),%r11 /* PFN count */

	load32		PA(pg0),%r1



$pgt_fill_loop: