|
@@ -452,7 +452,6 @@ static inline void cpu_feature_keys_init(void) { }
|
|
|
CPU_FTR_DBELL | CPU_FTR_HAS_PPR | CPU_FTR_DAWR | \
|
|
|
CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP | CPU_FTR_PKEY)
|
|
|
#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_POWER9 (CPU_FTR_LWSYNC | \
|
|
|
CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | CPU_FTR_ARCH_206 |\
|
|
|
CPU_FTR_MMCRA | CPU_FTR_SMT | \
|
|
@@ -488,16 +487,16 @@ static inline void cpu_feature_keys_init(void) { }
|
|
|
#ifdef CONFIG_CPU_LITTLE_ENDIAN
|
|
|
#define CPU_FTRS_POSSIBLE \
|
|
|
(CPU_FTRS_POWER7 | CPU_FTRS_POWER8E | CPU_FTRS_POWER8 | \
|
|
|
- CPU_FTRS_POWER8_DD1 | CPU_FTR_ALTIVEC_COMP | CPU_FTR_VSX_COMP | \
|
|
|
- CPU_FTRS_POWER9 | CPU_FTRS_POWER9_DD1 | CPU_FTRS_POWER9_DD2_1 | \
|
|
|
+ CPU_FTR_ALTIVEC_COMP | CPU_FTR_VSX_COMP | CPU_FTRS_POWER9 | \
|
|
|
+ CPU_FTRS_POWER9_DD1 | CPU_FTRS_POWER9_DD2_1 | \
|
|
|
CPU_FTRS_POWER9_DD2_2)
|
|
|
#else
|
|
|
#define CPU_FTRS_POSSIBLE \
|
|
|
(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_COMP | CPU_FTR_ALTIVEC_COMP | \
|
|
|
- CPU_FTRS_POWER9 | CPU_FTRS_POWER9_DD1 | CPU_FTRS_POWER9_DD2_1 | \
|
|
|
+ CPU_FTRS_POWER8 | CPU_FTRS_CELL | CPU_FTRS_PA6T | \
|
|
|
+ CPU_FTR_VSX_COMP | CPU_FTR_ALTIVEC_COMP | CPU_FTRS_POWER9 | \
|
|
|
+ CPU_FTRS_POWER9_DD1 | CPU_FTRS_POWER9_DD2_1 | \
|
|
|
CPU_FTRS_POWER9_DD2_2)
|
|
|
#endif /* CONFIG_CPU_LITTLE_ENDIAN */
|
|
|
#endif
|
|
@@ -566,7 +565,7 @@ enum {
|
|
|
#ifdef CONFIG_CPU_LITTLE_ENDIAN
|
|
|
#define CPU_FTRS_ALWAYS \
|
|
|
(CPU_FTRS_POSSIBLE & ~CPU_FTR_HVMODE & CPU_FTRS_POWER7 & \
|
|
|
- CPU_FTRS_POWER8E & CPU_FTRS_POWER8 & CPU_FTRS_POWER8_DD1 & \
|
|
|
+ CPU_FTRS_POWER8E & CPU_FTRS_POWER8 & \
|
|
|
CPU_FTRS_POWER9 & CPU_FTRS_POWER9_DD1 & CPU_FTRS_POWER9_DD2_1 & \
|
|
|
CPU_FTRS_DT_CPU_BASE)
|
|
|
#else
|
|
@@ -574,7 +573,7 @@ enum {
|
|
|
(CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & \
|
|
|
CPU_FTRS_POWER6 & CPU_FTRS_POWER7 & CPU_FTRS_CELL & \
|
|
|
CPU_FTRS_PA6T & CPU_FTRS_POWER8 & CPU_FTRS_POWER8E & \
|
|
|
- CPU_FTRS_POWER8_DD1 & ~CPU_FTR_HVMODE & CPU_FTRS_POSSIBLE & \
|
|
|
+ ~CPU_FTR_HVMODE & CPU_FTRS_POSSIBLE & \
|
|
|
CPU_FTRS_POWER9 & CPU_FTRS_POWER9_DD1 & CPU_FTRS_POWER9_DD2_1 & \
|
|
|
CPU_FTRS_DT_CPU_BASE)
|
|
|
#endif /* CONFIG_CPU_LITTLE_ENDIAN */
|