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

Commit c1807e3f authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/64: Free up CPU_FTR_ICSWX 



The last user of CPU_FTR_ICSWX was removed in commit
6ff4d3e9 ("powerpc: Remove old unused icswx based coprocessor
support"), so free the bit up for future use.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 7f142661

arch/powerpc/include/asm/cputable.h

+3 −3
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ enum { 
#define CPU_FTR_STCX_CHECKS_ADDRESS	LONG_ASM_CONST(0x0004000000000000)

#define CPU_FTR_POPCNTB			LONG_ASM_CONST(0x0008000000000000)

#define CPU_FTR_POPCNTD			LONG_ASM_CONST(0x0010000000000000)

#define CPU_FTR_ICSWX			LONG_ASM_CONST(0x0020000000000000)

/* Free					LONG_ASM_CONST(0x0020000000000000) */

#define CPU_FTR_VMX_COPY		LONG_ASM_CONST(0x0040000000000000)

#define CPU_FTR_TM			LONG_ASM_CONST(0x0080000000000000)

#define CPU_FTR_CFAR			LONG_ASM_CONST(0x0100000000000000)
@@ -451,7 +451,7 @@ enum { 
	    CPU_FTR_PURR | CPU_FTR_SPURR | CPU_FTR_REAL_LE | \

	    CPU_FTR_DSCR | CPU_FTR_SAO  | CPU_FTR_ASYM_SMT | \

	    CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \

	    CPU_FTR_ICSWX | CPU_FTR_CFAR | CPU_FTR_HVMODE | \

	    CPU_FTR_CFAR | CPU_FTR_HVMODE | \

	    CPU_FTR_VMX_COPY | CPU_FTR_HAS_PPR | CPU_FTR_DABRX)

#define CPU_FTRS_POWER8 (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \

	    CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | CPU_FTR_ARCH_206 |\
@@ -460,7 +460,7 @@ enum { 
	    CPU_FTR_PURR | CPU_FTR_SPURR | CPU_FTR_REAL_LE | \

	    CPU_FTR_DSCR | CPU_FTR_SAO  | \

	    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_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)

#define CPU_FTRS_POWER8E (CPU_FTRS_POWER8 | CPU_FTR_PMAO_BUG)

arch/powerpc/kernel/dt_cpu_ftrs.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ static struct dt_cpu_feature_match __initdata 
	{"no-execute", feat_enable, 0},

	{"strong-access-ordering", feat_enable, CPU_FTR_SAO},

	{"cache-inhibited-large-page", feat_enable_large_ci, 0},

	{"coprocessor-icswx", feat_enable, CPU_FTR_ICSWX},

	{"coprocessor-icswx", feat_enable, 0},

	{"hypervisor-virtualization-interrupt", feat_enable_hvi, 0},

	{"program-priority-register", feat_enable, CPU_FTR_HAS_PPR},

	{"wait", feat_enable, 0},