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

Commit 694caf02 authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

powerpc: Remove CONFIG_POWER4_ONLY 



Remove CONFIG_POWER4_ONLY, the option is badly named and only does two
things:

- It wraps the MMU segment table code. With feature fixups there is
  little downside to compiling this in.

- It uses the newer mtocrf instruction in various assembly functions.
  Instead of making this a compile option just do it at runtime via
  a feature fixup.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 6cd32099

arch/powerpc/configs/g5_defconfig

+0 −1
Original line number Diff line number Diff line 
CONFIG_PPC64=y

CONFIG_POWER4_ONLY=y

CONFIG_ALTIVEC=y

CONFIG_SMP=y

CONFIG_NR_CPUS=4

arch/powerpc/configs/maple_defconfig

+0 −1
Original line number Diff line number Diff line 
CONFIG_PPC64=y

CONFIG_POWER4_ONLY=y

CONFIG_SMP=y

CONFIG_NR_CPUS=4

CONFIG_EXPERIMENTAL=y

arch/powerpc/configs/pasemi_defconfig

+0 −1
Original line number Diff line number Diff line 
CONFIG_PPC64=y

CONFIG_POWER4_ONLY=y

CONFIG_ALTIVEC=y

# CONFIG_VIRT_CPU_ACCOUNTING is not set

CONFIG_SMP=y

arch/powerpc/include/asm/asm-compat.h

+1 −10
Original line number Diff line number Diff line
@@ -29,18 +29,9 @@ 
#define PPC_LLARX(t, a, b, eh)	PPC_LDARX(t, a, b, eh)

#define PPC_STLCX	stringify_in_c(stdcx.)

#define PPC_CNTLZL	stringify_in_c(cntlzd)

#define PPC_MTOCRF(FXM, RS) MTOCRF((FXM), (RS))

#define PPC_LR_STKOFF	16

#define PPC_MIN_STKFRM	112



/* Move to CR, single-entry optimized version. Only available

 * on POWER4 and later.

 */

#ifdef CONFIG_POWER4_ONLY

#define PPC_MTOCRF	stringify_in_c(mtocrf)

#else

#define PPC_MTOCRF	stringify_in_c(mtcrf)

#endif



#else /* 32-bit */



/* operations for longs and pointers */

arch/powerpc/include/asm/ppc_asm.h

+9 −1
Original line number Diff line number Diff line
@@ -369,6 +369,14 @@ BEGIN_FTR_SECTION \ 
END_FTR_SECTION_IFCLR(CPU_FTR_601)

#endif



#ifdef CONFIG_PPC64

#define MTOCRF(FXM, RS)			\

	BEGIN_FTR_SECTION_NESTED(848);	\

	mtcrf	(FXM), (RS);		\

	FTR_SECTION_ELSE_NESTED(848);	\

	mtocrf (FXM), (RS);		\

	ALT_FTR_SECTION_END_NESTED_IFCLR(CPU_FTR_NOEXECUTE, 848)

#endif



/*

 * This instruction is not implemented on the PPC 603 or 601; however, on