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

Commit b6b3755e authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc: add POWER9_DD20 feature 



Cc: Michael Neuling <mikey@neuling.org>
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 6f700d38

arch/powerpc/include/asm/cputable.h

+4 −1
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ enum { 
#define CPU_FTR_DABRX			LONG_ASM_CONST(0x0800000000000000)

#define CPU_FTR_PMAO_BUG		LONG_ASM_CONST(0x1000000000000000)

#define CPU_FTR_POWER9_DD1		LONG_ASM_CONST(0x4000000000000000)

#define CPU_FTR_POWER9_DD20		LONG_ASM_CONST(0x8000000000000000)



#ifndef __ASSEMBLY__
@@ -477,6 +478,7 @@ enum { 
	    CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP | CPU_FTR_ARCH_300)

#define CPU_FTRS_POWER9_DD1 ((CPU_FTRS_POWER9 | CPU_FTR_POWER9_DD1) & \

			     (~CPU_FTR_SAO))

#define CPU_FTRS_POWER9_DD20 (CPU_FTRS_POWER9 | CPU_FTR_POWER9_DD20)

#define CPU_FTRS_CELL	(CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \

	    CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \

	    CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \
@@ -495,7 +497,8 @@ enum { 
	    (CPU_FTRS_POWER4 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | \

	     CPU_FTRS_POWER6 | CPU_FTRS_POWER7 | CPU_FTRS_POWER8E | \

	     CPU_FTRS_POWER8 | CPU_FTRS_POWER8_DD1 | CPU_FTRS_CELL | \

	     CPU_FTRS_PA6T | CPU_FTR_VSX | CPU_FTRS_POWER9 | CPU_FTRS_POWER9_DD1)

	     CPU_FTRS_PA6T | CPU_FTR_VSX | CPU_FTRS_POWER9 | \

	     CPU_FTRS_POWER9_DD1 | CPU_FTRS_POWER9_DD20)

#endif

#else

enum {

arch/powerpc/kernel/cputable.c

+20 −0
Original line number Diff line number Diff line
@@ -547,6 +547,26 @@ static struct cpu_spec __initdata cpu_specs[] = { 
		.machine_check_early	= __machine_check_early_realmode_p9,

		.platform		= "power9",

	},

	{	/* Power9 DD2.0 */

		.pvr_mask		= 0xffffefff,

		.pvr_value		= 0x004e0200,

		.cpu_name		= "POWER9 (raw)",

		.cpu_features		= CPU_FTRS_POWER9_DD20,

		.cpu_user_features	= COMMON_USER_POWER9,

		.cpu_user_features2	= COMMON_USER2_POWER9,

		.mmu_features		= MMU_FTRS_POWER9,

		.icache_bsize		= 128,

		.dcache_bsize		= 128,

		.num_pmcs		= 6,

		.pmc_type		= PPC_PMC_IBM,

		.oprofile_cpu_type	= "ppc64/power9",

		.oprofile_type		= PPC_OPROFILE_INVALID,

		.cpu_setup		= __setup_cpu_power9,

		.cpu_restore		= __restore_cpu_power9,

		.flush_tlb		= __flush_tlb_power9,

		.machine_check_early	= __machine_check_early_realmode_p9,

		.platform		= "power9",

	},

	{	/* Power9 */

		.pvr_mask		= 0xffff0000,

		.pvr_value		= 0x004e0000,

arch/powerpc/kernel/dt_cpu_ftrs.c

+2 −0
Original line number Diff line number Diff line
@@ -735,6 +735,8 @@ static __init void cpufeatures_cpu_quirks(void) 
	 */

	if ((version & 0xffffff00) == 0x004e0100)

		cur_cpu_spec->cpu_features |= CPU_FTR_POWER9_DD1;

	else if ((version & 0xffffefff) == 0x004e0200)

		cur_cpu_spec->cpu_features |= CPU_FTR_POWER9_DD20;

}



static void __init cpufeatures_setup_finished(void)