Skip to content

Commit 3e36960

Browse files
committed
powerpc/64s: Add CPU_FTRS_POWER9_DD2_2 to CPU_FTRS_ALWAYS mask
CPU_FTRS_POWER9_DD2_2 is missing from CPU_FTRS_ALWAYS. That doesn't cause any bug, because CPU_FTRS_POWER9_DD2_2 adds new bits that don't appear in other values, so when anded with the other masks the result is the same. But for consistency we should have all values in the CPU_FTRS_ALWAYS mask, so that the logic is robust against the values being changed in future. Fixes: b5af4f2 ("powerpc: Add CPU feature bits for TM bug workarounds on POWER9 v2.2") Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20220519122205.746276-1-mpe@ellerman.id.au
1 parent 87c78b6 commit 3e36960

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/powerpc/include/asm/cputable.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,14 +541,14 @@ 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_DT_CPU_BASE)
544+
CPU_FTRS_POWER9_DD2_1 & CPU_FTRS_POWER9_DD2_2 & CPU_FTRS_DT_CPU_BASE)
545545
#else
546546
#define CPU_FTRS_ALWAYS \
547547
(CPU_FTRS_PPC970 & CPU_FTRS_POWER5 & \
548548
CPU_FTRS_POWER6 & CPU_FTRS_POWER7 & CPU_FTRS_CELL & \
549549
CPU_FTRS_PA6T & CPU_FTRS_POWER8 & CPU_FTRS_POWER8E & \
550550
~CPU_FTR_HVMODE & CPU_FTRS_POSSIBLE & CPU_FTRS_POWER9 & \
551-
CPU_FTRS_POWER9_DD2_1 & CPU_FTRS_DT_CPU_BASE)
551+
CPU_FTRS_POWER9_DD2_1 & CPU_FTRS_POWER9_DD2_2 & CPU_FTRS_DT_CPU_BASE)
552552
#endif /* CONFIG_CPU_LITTLE_ENDIAN */
553553
#endif
554554
#else

0 commit comments

Comments
 (0)