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

Commit ce5732a2 authored by Michael Neuling's avatar Michael Neuling Committed by Michael Ellerman
Browse files

powerpc/powernv: Create separate subcores CPU feature bit 



Subcores isn't really part of the 2.07 architecture but currently we
turn it on using the 2.07 feature bit.  Subcores is really a POWER8
specific feature.

This adds a new CPU_FTR bit just for subcores and moves the subcore
init code over to use this.

Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 88409d0c

arch/powerpc/include/asm/cputable.h

+2 −1
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ enum { 
#define CPU_FTR_DAWR			LONG_ASM_CONST(0x0400000000000000)

#define CPU_FTR_DABRX			LONG_ASM_CONST(0x0800000000000000)

#define CPU_FTR_PMAO_BUG		LONG_ASM_CONST(0x1000000000000000)

#define CPU_FTR_SUBCORE			LONG_ASM_CONST(0x2000000000000000)



#ifndef __ASSEMBLY__
@@ -443,7 +444,7 @@ enum { 
	    CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \

	    CPU_FTR_ICSWX | CPU_FTR_CFAR | CPU_FTR_HVMODE | CPU_FTR_VMX_COPY | \

	    CPU_FTR_DBELL | CPU_FTR_HAS_PPR | CPU_FTR_DAWR | \

	    CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP)

	    CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP | CPU_FTR_SUBCORE)

#define CPU_FTRS_POWER8E (CPU_FTRS_POWER8 | CPU_FTR_PMAO_BUG)

#define CPU_FTRS_POWER8_DD1 (CPU_FTRS_POWER8 & ~CPU_FTR_DBELL)

#define CPU_FTRS_CELL	(CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \

arch/powerpc/platforms/powernv/subcore.c

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ static DEVICE_ATTR(subcores_per_core, 0644, 


static int subcore_init(void)

{

	if (!cpu_has_feature(CPU_FTR_ARCH_207S))

	if (!cpu_has_feature(CPU_FTR_SUBCORE))

		return 0;



	/*