On Wed, 2016-08-24 at 15:03 +0530, Aneesh Kumar K.V wrote: > Signed-off-by: Aneesh Kumar K.V <[email protected]>
Acked-by: Michael Neuling <[email protected]> > --- > arch/powerpc/include/asm/cputable.h | 4 +++- > arch/powerpc/kernel/cputable.c | 19 +++++++++++++++++++ > 2 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/include/asm/cputable.h > b/arch/powerpc/include/asm/cputable.h > index 82026b419341..f752e6f7cfbe 100644 > --- a/arch/powerpc/include/asm/cputable.h > +++ b/arch/powerpc/include/asm/cputable.h > @@ -212,6 +212,7 @@ enum { > #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) > +#define CPU_FTR_POWER9_DD1 LONG_ASM_CONST(0x4000000000000000) > > #ifndef __ASSEMBLY__ > > @@ -472,6 +473,7 @@ enum { > 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_300) > +#define CPU_FTRS_POWER9_DD1 (CPU_FTRS_POWER9 | CPU_FTR_POWER9_DD1) > #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 | \ > @@ -490,7 +492,7 @@ 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_PA6T | CPU_FTR_VSX | CPU_FTRS_POWER9 | > CPU_FTRS_POWER9_DD1) > #endif > #else > enum { > diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c > index 74248ab18e98..6c4646ac9234 100644 > --- a/arch/powerpc/kernel/cputable.c > +++ b/arch/powerpc/kernel/cputable.c > @@ -506,6 +506,25 @@ static struct cpu_spec __initdata cpu_specs[] = { > .machine_check_early = __machine_check_early_realmode_p8, > .platform = "power8", > }, > + { /* Power9 DD1*/ > + .pvr_mask = 0xffffff00, > + .pvr_value = 0x004e0100, > + .cpu_name = "POWER9 (raw)", > + .cpu_features = CPU_FTRS_POWER9_DD1, > + .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, > + .platform = "power9", > + }, > { /* Power9 */ > .pvr_mask = 0xffff0000, > .pvr_value = 0x004e0000,
