aarch64 compatibility

[vpp.git] / vppinfra / vppinfra / cpu.h

diff --git a/vppinfra/vppinfra/cpu.h b/vppinfra/vppinfra/cpu.h
index 961af70..9c149f3 100644 (file)
--- a/vppinfra/vppinfra/cpu.h
+++ b/vppinfra/vppinfra/cpu.h
@@ -51,8 +51,6 @@
   return & fn;                                                         \
 }
 
-#if __x86_64__
-#include "cpuid.h"
 
 #define foreach_x86_64_flags \
 _ (sse3,     1, ecx, 0)   \
@@ -63,17 +61,21 @@ _ (avx,      1, ecx, 28)  \
 _ (avx2,     7, ebx, 5)   \
 _ (avx512f,  7, ebx, 16)  \
 _ (aes,      1, ecx, 25)  \
-_ (sha,      7, ebx, 29)
+_ (sha,      7, ebx, 29)  \
+_ (invariant_tsc, 0x80000007, edx, 8)
+
+#if defined(__x86_64__)
+#include "cpuid.h"
 
 static inline int
-clib_get_cpuid(const u32 lev, u32 * eax, u32 *ebx, u32 * ecx, u32 * edx)
+clib_get_cpuid (const u32 lev, u32 * eax, u32 * ebx, u32 * ecx, u32 * edx)
 {
   if ((u32) __get_cpuid_max (0x80000000 & lev, 0) < lev)
     return 0;
   if (lev == 7)
-    __cpuid_count(lev, 0, *eax, *ebx, *ecx, *edx);
+    __cpuid_count (lev, 0, *eax, *ebx, *ecx, *edx);
   else
-    __cpuid(lev, *eax, *ebx, *ecx, *edx);
+    __cpuid (lev, *eax, *ebx, *ecx, *edx);
   return 1;
 }
 
@@ -87,12 +89,24 @@ clib_cpu_supports_ ## flag()                                                \
                                                                        \
   return ((reg & (1 << bit)) != 0);                                    \
 }
-  foreach_x86_64_flags
+foreach_x86_64_flags
 #undef _
-#endif
+#else
 
-format_function_t format_cpu_uarch;
+#define _(flag, func, reg, bit) \
+static inline int clib_cpu_supports_ ## flag() { return 0; }
+foreach_x86_64_flags
+#undef _
+#endif
+#endif
+  format_function_t format_cpu_uarch;
 format_function_t format_cpu_model_name;
 format_function_t format_cpu_flags;
 
-#endif
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */