Commit 84493804 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc/mm: Move the STAB0 location to 0x8000 to make room in low memory 



Recent upstream builds with allmodconfig fail due to lack of space
between 0x3000 and 0x6000. We have a hard block at 0x7000 but we can
spare a page by moving the STAB0 from 0x6000 to 0x8000.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define STE_VSID_SHIFT	12



/* Location of cpu0's segment table */

#define STAB0_PAGE	0x6

#define STAB0_PAGE	0x8

#define STAB0_OFFSET	(STAB0_PAGE << 12)

#define STAB0_PHYS_ADDR	(STAB0_OFFSET + PHYSICAL_START)

arch/powerpc/kernel/exceptions-64s.S

+14 −14
Original line number Diff line number Diff line
@@ -977,20 +977,6 @@ _GLOBAL(do_stab_bolted) 
	rfid

	b	.	/* prevent speculative execution */



/*

 * Space for CPU0's segment table.

 *

 * On iSeries, the hypervisor must fill in at least one entry before

 * we get control (with relocate on).  The address is given to the hv

 * as a page number (see xLparMap below), so this must be at a

 * fixed address (the linker can't compute (u64)&initial_stab >>

 * PAGE_SHIFT).

 */

	. = STAB0_OFFSET	/* 0x6000 */

	.globl initial_stab

initial_stab:

	.space	4096



#ifdef CONFIG_PPC_PSERIES

/*

 * Data area reserved for FWNMI option.
@@ -1027,3 +1013,17 @@ xLparMap: 
#ifdef CONFIG_PPC_PSERIES

        . = 0x8000

#endif /* CONFIG_PPC_PSERIES */



/*

 * Space for CPU0's segment table.

 *

 * On iSeries, the hypervisor must fill in at least one entry before

 * we get control (with relocate on).  The address is given to the hv

 * as a page number (see xLparMap above), so this must be at a

 * fixed address (the linker can't compute (u64)&initial_stab >>

 * PAGE_SHIFT).

 */

	. = STAB0_OFFSET	/* 0x8000 */

	.globl initial_stab

initial_stab:

	.space	4096

CRA Git | Maintained and supported by SUSTech CRA and CCSE