Skip to content

Commit b4d9cc7

Browse files
committed
powerpc/64s: Add CPU_FTRS_POWER10 to ALWAYS mask
CPU_FTRS_POWER10 is missing from the CPU_FTRS_ALWAYS mask. Currently that doesn't cause any bug, because it is a superset of the POWER9 mask, which the exception of CPU_FTR_TM, but POWER7 doesn't have CPU_FTR_TM, so CPU_FTR_TM is not in the ALWAYS mask to begin with. However for consistency, and to be robust against future changes, it should be included in the ALWAYS mask. Fixes: a3ea40d ("powerpc: Add POWER10 architected mode") Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20220519122205.746276-2-mpe@ellerman.id.au
1 parent 3e36960 commit b4d9cc7

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

arch/powerpc/include/asm/cputable.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,14 +541,16 @@ enum {
541541
#define CPU_FTRS_ALWAYS \
542542
(CPU_FTRS_POSSIBLE & ~CPU_FTR_HVMODE & CPU_FTRS_POWER7 & \
543543
CPU_FTRS_POWER8E & CPU_FTRS_POWER8 & CPU_FTRS_POWER9 & \
544-
CPU_FTRS_POWER9_DD2_1 & CPU_FTRS_POWER9_DD2_2 & CPU_FTRS_DT_CPU_BASE)
544+
CPU_FTRS_POWER9_DD2_1 & CPU_FTRS_POWER9_DD2_2 & \
545+
CPU_FTRS_POWER10 & CPU_FTRS_DT_CPU_BASE)
545546
#else
546547
#define CPU_FTRS_ALWAYS \
547548
(CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & \
548549
CPU_FTRS_POWER6 & CPU_FTRS_POWER7 & CPU_FTRS_CELL & \
549550
CPU_FTRS_PA6T & CPU_FTRS_POWER8 & CPU_FTRS_POWER8E & \
550551
~CPU_FTR_HVMODE & CPU_FTRS_POSSIBLE & CPU_FTRS_POWER9 & \
551-
CPU_FTRS_POWER9_DD2_1 & CPU_FTRS_POWER9_DD2_2 & CPU_FTRS_DT_CPU_BASE)
552+
CPU_FTRS_POWER9_DD2_1 & CPU_FTRS_POWER9_DD2_2 & \
553+
CPU_FTRS_POWER10 & CPU_FTRS_DT_CPU_BASE)
552554
#endif /* CONFIG_CPU_LITTLE_ENDIAN */
553555
#endif
554556
#else

0 commit comments

Comments
 (0)