Re: [PATCH v5 01/10] powerpc: unify definition of M_IF_NEEDED

[Jason Yan]

On 2019/8/7 21:13, Michael Ellerman wrote:
> Jason Yan <yanaijie@xxxxxxxxxx> writes:
> > M_IF_NEEDED is defined too many times. Move it to a common place.
>
> The name is not great, can you call it MAS2_M_IF_NEEDED, which at least
> gives a clue what it's for?

OK.

> cheers
>
> > Signed-off-by: Jason Yan <yanaijie@xxxxxxxxxx>
> > Cc: Diana Craciun <diana.craciun@xxxxxxx>
> > Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
> > Cc: Christophe Leroy <christophe.leroy@xxxxxx>
> > Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
> > Cc: Paul Mackerras <paulus@xxxxxxxxx>
> > Cc: Nicholas Piggin <npiggin@xxxxxxxxx>
> > Cc: Kees Cook <keescook@xxxxxxxxxxxx>
> > Reviewed-by: Christophe Leroy <christophe.leroy@xxxxxx>
> > Reviewed-by: Diana Craciun <diana.craciun@xxxxxxx>
> > Tested-by: Diana Craciun <diana.craciun@xxxxxxx>
> > ---
> >   arch/powerpc/include/asm/nohash/mmu-book3e.h  | 10 ++++++++++
> >   arch/powerpc/kernel/exceptions-64e.S          | 10 ----------
> >   arch/powerpc/kernel/fsl_booke_entry_mapping.S | 10 ----------
> >   arch/powerpc/kernel/misc_64.S                 |  5 -----
> >   4 files changed, 10 insertions(+), 25 deletions(-)
> >
> > diff --git a/arch/powerpc/include/asm/nohash/mmu-book3e.h b/arch/powerpc/include/asm/nohash/mmu-book3e.h
> > index 4c9777d256fb..0877362e48fa 100644
> > --- a/arch/powerpc/include/asm/nohash/mmu-book3e.h
> > +++ b/arch/powerpc/include/asm/nohash/mmu-book3e.h
> > @@ -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 M_IF_NEEDED	MAS2_M
> > +#else
> > +#define M_IF_NEEDED	0
> > +#endif
> > +
> >   #ifndef __ASSEMBLY__
> >   #include <asm/bug.h>
> >   
> > diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
> > index 1cfb3da4a84a..fd49ec07ce4a 100644
> > --- a/arch/powerpc/kernel/exceptions-64e.S
> > +++ b/arch/powerpc/kernel/exceptions-64e.S
> > @@ -1342,16 +1342,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
> > diff --git a/arch/powerpc/kernel/fsl_booke_entry_mapping.S b/arch/powerpc/kernel/fsl_booke_entry_mapping.S
> > index ea065282b303..de0980945510 100644
> > --- a/arch/powerpc/kernel/fsl_booke_entry_mapping.S
> > +++ b/arch/powerpc/kernel/fsl_booke_entry_mapping.S
> > @@ -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] */
> > diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
> > index b55a7b4cb543..26074f92d4bc 100644
> > --- a/arch/powerpc/kernel/misc_64.S
> > +++ b/arch/powerpc/kernel/misc_64.S
> > @@ -432,11 +432,6 @@ 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
> > --
> > 2.17.2
>
> .