Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/book3s: Add a cpu table entry for different POWER9 revs

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

authored by

Aneesh Kumar K.V and committed by
Michael Ellerman
7dccfbc3 687e16bc

+22 -1
+3 -1
arch/powerpc/include/asm/cputable.h
··· 212 212 #define CPU_FTR_DABRX LONG_ASM_CONST(0x0800000000000000) 213 213 #define CPU_FTR_PMAO_BUG LONG_ASM_CONST(0x1000000000000000) 214 214 #define CPU_FTR_SUBCORE LONG_ASM_CONST(0x2000000000000000) 215 + #define CPU_FTR_POWER9_DD1 LONG_ASM_CONST(0x4000000000000000) 215 216 216 217 #ifndef __ASSEMBLY__ 217 218 ··· 473 472 CPU_FTR_ICSWX | CPU_FTR_CFAR | CPU_FTR_HVMODE | CPU_FTR_VMX_COPY | \ 474 473 CPU_FTR_DBELL | CPU_FTR_HAS_PPR | CPU_FTR_DAWR | \ 475 474 CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP | CPU_FTR_ARCH_300) 475 + #define CPU_FTRS_POWER9_DD1 (CPU_FTRS_POWER9 | CPU_FTR_POWER9_DD1) 476 476 #define CPU_FTRS_CELL (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \ 477 477 CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \ 478 478 CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \ ··· 492 490 (CPU_FTRS_POWER4 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | \ 493 491 CPU_FTRS_POWER6 | CPU_FTRS_POWER7 | CPU_FTRS_POWER8E | \ 494 492 CPU_FTRS_POWER8 | CPU_FTRS_POWER8_DD1 | CPU_FTRS_CELL | \ 495 - CPU_FTRS_PA6T | CPU_FTR_VSX | CPU_FTRS_POWER9) 493 + CPU_FTRS_PA6T | CPU_FTR_VSX | CPU_FTRS_POWER9 | CPU_FTRS_POWER9_DD1) 496 494 #endif 497 495 #else 498 496 enum {
+19
arch/powerpc/kernel/cputable.c
··· 506 506 .machine_check_early = __machine_check_early_realmode_p8, 507 507 .platform = "power8", 508 508 }, 509 + { /* Power9 DD1*/ 510 + .pvr_mask = 0xffffff00, 511 + .pvr_value = 0x004e0100, 512 + .cpu_name = "POWER9 (raw)", 513 + .cpu_features = CPU_FTRS_POWER9_DD1, 514 + .cpu_user_features = COMMON_USER_POWER9, 515 + .cpu_user_features2 = COMMON_USER2_POWER9, 516 + .mmu_features = MMU_FTRS_POWER9, 517 + .icache_bsize = 128, 518 + .dcache_bsize = 128, 519 + .num_pmcs = 6, 520 + .pmc_type = PPC_PMC_IBM, 521 + .oprofile_cpu_type = "ppc64/power9", 522 + .oprofile_type = PPC_OPROFILE_INVALID, 523 + .cpu_setup = __setup_cpu_power9, 524 + .cpu_restore = __restore_cpu_power9, 525 + .flush_tlb = __flush_tlb_power9, 526 + .platform = "power9", 527 + }, 509 528 { /* Power9 */ 510 529 .pvr_mask = 0xffff0000, 511 530 .pvr_value = 0x004e0000,