New upstream version 18.08

[deb_dpdk.git] / lib / librte_eal / common / arch / arm / rte_cpuflags.c

diff --git a/lib/librte_eal/common/arch/arm/rte_cpuflags.c b/lib/librte_eal/common/arch/arm/rte_cpuflags.c
index 88f1cbe..caf3dc8 100644 (file)
--- a/lib/librte_eal/common/arch/arm/rte_cpuflags.c
+++ b/lib/librte_eal/common/arch/arm/rte_cpuflags.c
@@ -1,34 +1,6 @@
-/*
- *   BSD LICENSE
- *
- *   Copyright (C) Cavium, Inc. 2015.
- *   Copyright(c) 2015 RehiveTech. 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 Cavium, Inc 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) Cavium, Inc. 2015.
+ * Copyright(c) 2015 RehiveTech. All rights reserved.
  */
 
 #include "rte_cpuflags.h"
@@ -133,22 +105,10 @@ const struct feature_entry rte_cpu_feature_table[] = {
 static void
 rte_cpu_get_features(hwcap_registers_t out)
 {
-       int auxv_fd;
-       _Elfx_auxv_t auxv;
-
-       auxv_fd = open("/proc/self/auxv", O_RDONLY);
-       assert(auxv_fd != -1);
-       while (read(auxv_fd, &auxv, sizeof(auxv)) == sizeof(auxv)) {
-               if (auxv.a_type == AT_HWCAP) {
-                       out[REG_HWCAP] = auxv.a_un.a_val;
-               } else if (auxv.a_type == AT_HWCAP2) {
-                       out[REG_HWCAP2] = auxv.a_un.a_val;
-               } else if (auxv.a_type == AT_PLATFORM) {
-                       if (!strcmp((const char *)auxv.a_un.a_val, PLATFORM_STR))
-                               out[REG_PLATFORM] = 0x0001;
-               }
-       }
-       close(auxv_fd);
+       out[REG_HWCAP] = rte_cpu_getauxval(AT_HWCAP);
+       out[REG_HWCAP2] = rte_cpu_getauxval(AT_HWCAP2);
+       if (!rte_cpu_strcmp_auxval(AT_PLATFORM, PLATFORM_STR))
+               out[REG_PLATFORM] = 0x0001;
 }
 
 /*