Commit 8054df05 authored by Jason Yan's avatar Jason Yan Committed by Michael Ellerman
Browse files

powerpc: unify definition of M_IF_NEEDED 



M_IF_NEEDED is defined too many times. Move it to a common place and
rename it to MAS2_M_IF_NEEDED which is much readable.

Signed-off-by: default avatarJason Yan <yanaijie@huawei.com>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Reviewed-by: default avatarDiana Craciun <diana.craciun@nxp.com>
Tested-by: default avatarDiana Craciun <diana.craciun@nxp.com>
Signed-off-by: default avatarScott Wood <oss@buserror.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent da0c9ea1

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

+10 −0
Original line number Diff line number Diff line
@@ -221,6 +221,16 @@ 
#define TLBILX_T_CLASS2			6

#define TLBILX_T_CLASS3			7



/*

 * The mapping only needs to be cache-coherent on SMP, except on

 * Freescale e500mc derivatives where it's also needed for coherent DMA.

 */

#if defined(CONFIG_SMP) || defined(CONFIG_PPC_E500MC)

#define MAS2_M_IF_NEEDED	MAS2_M

#else

#define MAS2_M_IF_NEEDED	0

#endif



#ifndef __ASSEMBLY__

#include <asm/bug.h>

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

+1 −11
Original line number Diff line number Diff line
@@ -1346,16 +1346,6 @@ skpinv: addi r6,r6,1 /* Increment */ 
	sync

	isync



/*

 * The mapping only needs to be cache-coherent on SMP, except on

 * Freescale e500mc derivatives where it's also needed for coherent DMA.

 */

#if defined(CONFIG_SMP) || defined(CONFIG_PPC_E500MC)

#define M_IF_NEEDED	MAS2_M

#else

#define M_IF_NEEDED	0

#endif



/* 6. Setup KERNELBASE mapping in TLB[0]

 *

 * r3 = MAS0 w/TLBSEL & ESEL for the entry we started in
@@ -1368,7 +1358,7 @@ skpinv: addi r6,r6,1 /* Increment */ 
	ori	r6,r6,(MAS1_TSIZE(BOOK3E_PAGESZ_1GB))@l

	mtspr	SPRN_MAS1,r6



	LOAD_REG_IMMEDIATE(r6, PAGE_OFFSET | M_IF_NEEDED)

	LOAD_REG_IMMEDIATE(r6, PAGE_OFFSET | MAS2_M_IF_NEEDED)

	mtspr	SPRN_MAS2,r6



	rlwinm	r5,r5,0,0,25

arch/powerpc/kernel/fsl_booke_entry_mapping.S

+2 −12
Original line number Diff line number Diff line
@@ -153,16 +153,6 @@ skpinv: addi r6,r6,1 /* Increment */ 
	tlbivax 0,r9

	TLBSYNC



/*

 * The mapping only needs to be cache-coherent on SMP, except on

 * Freescale e500mc derivatives where it's also needed for coherent DMA.

 */

#if defined(CONFIG_SMP) || defined(CONFIG_PPC_E500MC)

#define M_IF_NEEDED	MAS2_M

#else

#define M_IF_NEEDED	0

#endif



#if defined(ENTRY_MAPPING_BOOT_SETUP)



/* 6. Setup KERNELBASE mapping in TLB1[0] */
@@ -171,8 +161,8 @@ skpinv: addi r6,r6,1 /* Increment */ 
	lis	r6,(MAS1_VALID|MAS1_IPROT)@h

	ori	r6,r6,(MAS1_TSIZE(BOOK3E_PAGESZ_64M))@l

	mtspr	SPRN_MAS1,r6

	lis	r6,MAS2_VAL(PAGE_OFFSET, BOOK3E_PAGESZ_64M, M_IF_NEEDED)@h

	ori	r6,r6,MAS2_VAL(PAGE_OFFSET, BOOK3E_PAGESZ_64M, M_IF_NEEDED)@l

	lis	r6,MAS2_VAL(PAGE_OFFSET, BOOK3E_PAGESZ_64M, MAS2_M_IF_NEEDED)@h

	ori	r6,r6,MAS2_VAL(PAGE_OFFSET, BOOK3E_PAGESZ_64M, MAS2_M_IF_NEEDED)@l

	mtspr	SPRN_MAS2,r6

	mtspr	SPRN_MAS3,r8

	tlbwe

arch/powerpc/kernel/misc_64.S

+1 −6
Original line number Diff line number Diff line
@@ -432,18 +432,13 @@ kexec_create_tlb: 
	rlwimi	r9,r10,16,4,15		/* Setup MAS0 = TLBSEL | ESEL(r9) */



/* Set up a temp identity mapping v:0 to p:0 and return to it. */

#if defined(CONFIG_SMP) || defined(CONFIG_PPC_E500MC)

#define M_IF_NEEDED	MAS2_M

#else

#define M_IF_NEEDED	0

#endif

	mtspr	SPRN_MAS0,r9



	lis	r9,(MAS1_VALID|MAS1_IPROT)@h

	ori	r9,r9,(MAS1_TSIZE(BOOK3E_PAGESZ_1GB))@l

	mtspr	SPRN_MAS1,r9



	LOAD_REG_IMMEDIATE(r9, 0x0 | M_IF_NEEDED)

	LOAD_REG_IMMEDIATE(r9, 0x0 | MAS2_M_IF_NEEDED)

	mtspr	SPRN_MAS2,r9



	LOAD_REG_IMMEDIATE(r9, 0x0 | MAS3_SR | MAS3_SW | MAS3_SX)

CRA Git | Maintained and supported by SUSTech CRA and CCSE