Author: jhibbits
Date: Fri Apr 26 02:30:03 2019
New Revision: 346728
URL: https://svnweb.freebsd.org/changeset/base/346728

Log:
  powerpc: Add another feature2 flag, and update power9 definition
  
  Also fix the definition of PPC_FEATURE2_HTM_NOSUSPEND, a bad line copy.
  
  This now closer matches Linux's definition.

Modified:
  head/sys/powerpc/include/cpu.h
  head/sys/powerpc/powerpc/cpu.c

Modified: head/sys/powerpc/include/cpu.h
==============================================================================
--- head/sys/powerpc/include/cpu.h      Fri Apr 26 02:19:25 2019        
(r346727)
+++ head/sys/powerpc/include/cpu.h      Fri Apr 26 02:30:03 2019        
(r346728)
@@ -81,6 +81,7 @@ extern u_long cpu_features2;
 #define        PPC_FEATURE2_ARCH_2_07  0x80000000
 #define        PPC_FEATURE2_HTM        0x40000000
 #define        PPC_FEATURE2_DSCR       0x20000000
+#define        PPC_FEATURE2_EBB        0x10000000
 #define        PPC_FEATURE2_ISEL       0x08000000
 #define        PPC_FEATURE2_TAR        0x04000000
 #define        PPC_FEATURE2_HAS_VEC_CRYPTO     0x02000000
@@ -89,7 +90,7 @@ extern u_long cpu_features2;
 #define        PPC_FEATURE2_HAS_IEEE128        0x00400000
 #define        PPC_FEATURE2_DARN       0x00200000
 #define        PPC_FEATURE2_SCV        0x00100000
-#define        PPC_FEATURE2_HTM_NOSUSPEND      0x01000000
+#define        PPC_FEATURE2_HTM_NOSUSPEND      0x00080000
 
 #define        PPC_FEATURE_BITMASK                                             
\
        "\20"                                                           \

Modified: head/sys/powerpc/powerpc/cpu.c
==============================================================================
--- head/sys/powerpc/powerpc/cpu.c      Fri Apr 26 02:19:25 2019        
(r346727)
+++ head/sys/powerpc/powerpc/cpu.c      Fri Apr 26 02:30:03 2019        
(r346728)
@@ -183,7 +183,8 @@ static const struct cputab models[] = {
           PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | PPC_FEATURE_ARCH_2_05 |
           PPC_FEATURE_ARCH_2_06 | PPC_FEATURE_HAS_VSX | PPC_FEATURE_TRUE_LE,
           PPC_FEATURE2_ARCH_2_07 | PPC_FEATURE2_HTM | PPC_FEATURE2_DSCR |
-          PPC_FEATURE2_ISEL | PPC_FEATURE2_TAR | PPC_FEATURE2_HAS_VEC_CRYPTO |
+          PPC_FEATURE2_EBB | PPC_FEATURE2_ISEL | PPC_FEATURE2_TAR |
+          PPC_FEATURE2_HAS_VEC_CRYPTO | PPC_FEATURE2_HTM_NOSC |
           PPC_FEATURE2_ARCH_3_00 | PPC_FEATURE2_HAS_IEEE128 |
           PPC_FEATURE2_DARN, cpu_powerx_setup },
         { "Motorola PowerPC 7400",     MPC7400,        REVFMT_MAJMIN,
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to