X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fcpu.c;h=ef08dc7c022faa62a98366e7c77b54b75e78ecde;hb=5f1fd46573aa111018f838db14de53e8ecf854b3;hp=a26d5c9ae1069984860788c284ddb251e9a985a1;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vppinfra/cpu.c b/src/vppinfra/cpu.c
index a26d5c9ae10..ef08dc7c022 100644
--- a/src/vppinfra/cpu.c
+++ b/src/vppinfra/cpu.c
@@ -12,31 +12,62 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include <fcntl.h>
 #include <vppinfra/clib.h>
 #include <vppinfra/format.h>
 #include <vppinfra/cpu.h>
 
 #define foreach_x86_cpu_uarch \
- _(0x06, 0x4f, "Broadwell", "Broadwell-EP/EX") \
- _(0x06, 0x3d, "Broadwell", "Broadwell") \
- _(0x06, 0x3f, "Haswell", "Haswell-E") \
+ _(0x06, 0x9e, "Kaby Lake", "Kaby Lake DT/H/S/X") \
+ _(0x06, 0x8e, "Kaby Lake", "Kaby Lake Y/U") \
+ _(0x06, 0x85, "Knights Mill", "Knights Mill") \
+ _(0x06, 0x5f, "Goldmont", "Denverton") \
+ _(0x06, 0x5e, "Skylake", "Skylake DT/H/S") \
+ _(0x06, 0x5c, "Goldmont", "Apollo Lake") \
+ _(0x06, 0x5a, "Silvermont", "Moorefield") \
+ _(0x06, 0x57, "Knights Landing", "Knights Landing") \
+ _(0x06, 0x56, "Broadwell", "Broadwell DE") \
+ _(0x06, 0x55, "Skylake", "Skylake X/SP") \
+ _(0x06, 0x4f, "Broadwell", "Broadwell EP/EX") \
+ _(0x06, 0x4e, "Skylake", "Skylake Y/U") \
+ _(0x06, 0x4d, "Silvermont", "Rangeley") \
+ _(0x06, 0x4c, "Airmont", "Braswell") \
+ _(0x06, 0x47, "Broadwell", "Broadwell H") \
+ _(0x06, 0x46, "Haswell", "Crystalwell") \
+ _(0x06, 0x45, "Haswell", "Haswell ULT") \
+ _(0x06, 0x3f, "Haswell", "Haswell E") \
+ _(0x06, 0x3e, "Ivy Bridge", "Ivy Bridge E/EN/EP") \
+ _(0x06, 0x3d, "Broadwell", "Broadwell U") \
  _(0x06, 0x3c, "Haswell", "Haswell") \
- _(0x06, 0x3e, "IvyBridge", "IvyBridge-E/EN/EP") \
- _(0x06, 0x3a, "IvyBridge", "IvyBridge") \
- _(0x06, 0x2a, "SandyBridge", "SandyBridge") \
- _(0x06, 0x2d, "SandyBridge", "SandyBridge-E/EN/EP") \
+ _(0x06, 0x3a, "Ivy Bridge", "IvyBridge") \
+ _(0x06, 0x37, "Silvermont", "BayTrail") \
+ _(0x06, 0x36, "Saltwell", "Cedarview,Centerton") \
+ _(0x06, 0x35, "Saltwell", "Cloverview") \
+ _(0x06, 0x2f, "Westmere", "Westmere EX") \
+ _(0x06, 0x2e, "Nehalem", "Nehalem EX") \
+ _(0x06, 0x2d, "Sandy Bridge", "SandyBridge E/EN/EP") \
+ _(0x06, 0x2c, "Westmere", "Westmere EP/EX,Gulftown") \
+ _(0x06, 0x2a, "Sandy Bridge", "Sandy Bridge") \
+ _(0x06, 0x27, "Saltwell", "Medfield") \
+ _(0x06, 0x26, "Bonnell", "Tunnel Creek") \
  _(0x06, 0x25, "Westmere", "Arrandale,Clarksdale") \
- _(0x06, 0x2c, "Westmere", "Westmere-EP/EX,Gulftown") \
- _(0x06, 0x2f, "Westmere", "Westmere-EX") \
  _(0x06, 0x1e, "Nehalem", "Clarksfield,Lynnfield,Jasper Forest") \
- _(0x06, 0x1a, "Nehalem", "Nehalem-EP,Bloomfield)") \
- _(0x06, 0x2e, "Nehalem", "Nehalem-EX") \
- _(0x06, 0x17, "Penryn", "Yorkfield,Wolfdale,Penryn,Harpertown (DP)") \
- _(0x06, 0x1d, "Penryn", "Dunnington (MP)") \
- _(0x06, 0x37, "Atom", "Bay Trail") \
- _(0x06, 0x36, "Atom", "Cedarview") \
- _(0x06, 0x26, "Atom", "Lincroft") \
- _(0x06, 0x1c, "Atom", "Pineview/Silverthorne")
+ _(0x06, 0x1d, "Penryn", "Dunnington") \
+ _(0x06, 0x1c, "Bonnell", "Pineview,Silverthorne") \
+ _(0x06, 0x1a, "Nehalem", "Nehalem EP,Bloomfield)") \
+ _(0x06, 0x17, "Penryn", "Yorkfield,Wolfdale,Penryn,Harpertown")
+
+#define foreach_aarch64_cpu_uarch \
+ _(0x41, 0xd03, "ARM", "Cortex-A53") \
+ _(0x41, 0xd07, "ARM", "Cortex-A57") \
+ _(0x41, 0xd08, "ARM", "Cortex-A72") \
+ _(0x41, 0xd09, "ARM", "Cortex-A73") \
+ _(0x43, 0x0a1, "Cavium", "ThunderX CN88XX") \
+ _(0x43, 0x0a2, "Cavium", "Octeon TX CN81XX") \
+ _(0x43, 0x0a3, "Cavium", "Octeon TX CN83XX") \
+ _(0x43, 0x0af, "Cavium", "ThunderX2 CN99XX") \
+ _(0x43, 0x0b1, "Cavium", "Octeon TX2 CN98XX") \
+ _(0x43, 0x0b2, "Cavium", "Octeon TX2 CN93XX") \
 
 u8 *
 format_cpu_uarch (u8 * s, va_list * args)
@@ -56,6 +87,43 @@ format_cpu_uarch (u8 * s, va_list * args)
 #undef _
     return format (s, "unknown (family 0x%02x model 0x%02x)", family, model);
 
+#elif __aarch64__
+  int fd;
+  unformat_input_t input;
+  u32 implementer, primary_part_number, variant, revision;
+
+  fd = open ("/proc/cpuinfo", 0);
+  if (fd < 0)
+    return format (s, "unknown");
+
+  unformat_init_clib_file (&input, fd);
+  while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (&input, "CPU implementer%_: 0x%x", &implementer))
+	;
+      else if (unformat (&input, "CPU part%_: 0x%x", &primary_part_number))
+	;
+      else if (unformat (&input, "CPU variant%_: 0x%x", &variant))
+	;
+      else if (unformat (&input, "CPU revision%_: %u", &revision))
+	;
+      else
+	unformat_skip_line (&input);
+    }
+  unformat_free (&input);
+  close (fd);
+
+  /* Note: Cavium starts counting variants from 1 instead of 0 */
+  if (implementer == 0x43)
+    variant++;
+
+#define _(i,p,a,c) if ((implementer == i) && (primary_part_number == p)) \
+  return format(s, "%s (%s PASS %u.%u)", a, c, variant, revision);
+  foreach_aarch64_cpu_uarch
+#undef _
+    return format (s, "unknown (implementer 0x%02x part 0x%03x PASS %u.%u)",
+		   implementer, primary_part_number, variant, revision);
+
 #else /* ! __x86_64__ */
   return format (s, "unknown");
 #endif
@@ -108,16 +176,33 @@ format_cpu_model_name (u8 * s, va_list * args)
 #endif
 }
 
+
+static inline char const *
+flag_skip_prefix (char const *flag)
+{
+  if (memcmp (flag, "x86_", sizeof ("x86_") - 1) == 0)
+    return flag + sizeof ("x86_") - 1;
+  if (memcmp (flag, "aarch64_", sizeof ("aarch64_") - 1) == 0)
+    return flag + sizeof ("aarch64_") - 1;
+  return flag;
+}
+
 u8 *
 format_cpu_flags (u8 * s, va_list * args)
 {
 #if defined(__x86_64__)
 #define _(flag, func, reg, bit) \
   if (clib_cpu_supports_ ## flag()) \
-    s = format (s, #flag " ");
+    s = format (s, "%s ", flag_skip_prefix(#flag));
   foreach_x86_64_flags return s;
 #undef _
-#else /* ! __x86_64__ */
+#elif defined(__aarch64__)
+#define _(flag, bit) \
+  if (clib_cpu_supports_ ## flag()) \
+    s = format (s, "%s ", flag_skip_prefix(#flag));
+  foreach_aarch64_flags return s;
+#undef _
+#else /* ! ! __x86_64__ && ! __aarch64__ */
   return format (s, "unknown");
 #endif
 }