ticketlock: enable generic ticketlock on all arch

[dpdk.git] / lib / librte_eal / common / include / arch / x86 / rte_cpuflags.h

diff --git a/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h b/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h
index 120ea24..8315f6b 100644 (file)
--- a/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h
+++ b/lib/librte_eal/common/include/arch/x86/rte_cpuflags.h
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #ifndef _RTE_CPUFLAGS_X86_64_H_
@@ -38,15 +9,6 @@
 extern "C" {
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdint.h>
-
-#include "generic/rte_cpuflags.h"
-
-extern const struct feature_entry rte_cpu_feature_table[];
-
 enum rte_cpu_flag_t {
        /* (EAX 01h) ECX features*/
        RTE_CPUFLAG_SSE3 = 0,               /**< SSE3 */
@@ -78,6 +40,7 @@ enum rte_cpu_flag_t {
        RTE_CPUFLAG_AVX,                    /**< AVX */
        RTE_CPUFLAG_F16C,                   /**< F16C */
        RTE_CPUFLAG_RDRAND,                 /**< RDRAND */
+       RTE_CPUFLAG_HYPERVISOR,             /**< Running in a VM */
 
        /* (EAX 01h) EDX features */
        RTE_CPUFLAG_FPU,                    /**< FPU */
@@ -153,64 +116,7 @@ enum rte_cpu_flag_t {
        RTE_CPUFLAG_NUMFLAGS,               /**< This should always be the last! */
 };
 
-enum cpu_register_t {
-       RTE_REG_EAX = 0,
-       RTE_REG_EBX,
-       RTE_REG_ECX,
-       RTE_REG_EDX,
-};
-
-static inline void
-rte_cpu_get_features(uint32_t leaf, uint32_t subleaf, cpuid_registers_t out)
-{
-#if defined(__i386__) && defined(__PIC__)
-    /* %ebx is a forbidden register if we compile with -fPIC or -fPIE */
-    asm volatile("movl %%ebx,%0 ; cpuid ; xchgl %%ebx,%0"
-                : "=r" (out[RTE_REG_EBX]),
-                  "=a" (out[RTE_REG_EAX]),
-                  "=c" (out[RTE_REG_ECX]),
-                  "=d" (out[RTE_REG_EDX])
-                : "a" (leaf), "c" (subleaf));
-#else
-
-    asm volatile("cpuid"
-                : "=a" (out[RTE_REG_EAX]),
-                  "=b" (out[RTE_REG_EBX]),
-                  "=c" (out[RTE_REG_ECX]),
-                  "=d" (out[RTE_REG_EDX])
-                : "a" (leaf), "c" (subleaf));
-
-#endif
-}
-
-static inline int
-rte_cpu_get_flag_enabled(enum rte_cpu_flag_t feature)
-{
-       const struct feature_entry *feat;
-       cpuid_registers_t regs;
-
-
-       if (feature >= RTE_CPUFLAG_NUMFLAGS)
-               /* Flag does not match anything in the feature tables */
-               return -ENOENT;
-
-       feat = &rte_cpu_feature_table[feature];
-
-       if (!feat->leaf)
-               /* This entry in the table wasn't filled out! */
-               return -EFAULT;
-
-       rte_cpu_get_features(feat->leaf & 0xffff0000, 0, regs);
-       if (((regs[RTE_REG_EAX] ^ feat->leaf) & 0xffff0000) ||
-             regs[RTE_REG_EAX] < feat->leaf)
-               return 0;
-
-       /* get the cpuid leaf containing the desired feature */
-       rte_cpu_get_features(feat->leaf, feat->subleaf, regs);
-
-       /* check if the feature is enabled */
-       return (regs[feat->reg] >> feat->bit) & 1;
-}
+#include "generic/rte_cpuflags.h"
 
 #ifdef __cplusplus
 }