eal/ppc: cpu flag checks for IBM Power

IBM Power processor doesn't have CPU flag hardware registers. This patch
uses aux vector software register to get CPU flags and add CPU flag
checking support for IBM Power architecture.

Signed-off-by: Chao Zhu <chaozhu@linux.vnet.ibm.com>
Acked-by: David Marchand <david.marchand@6wind.com>

diff --git a/app/test/test_cpuflags.c b/app/test/test_cpuflags.c
index 82c0197..5aeba5d 100644 (file)
--- a/app/test/test_cpuflags.c
+++ b/app/test/test_cpuflags.c
@@ -80,6 +80,40 @@ test_cpuflags(void)
        int result;
        printf("\nChecking for flags from different registers...\n");
 
+#ifdef RTE_ARCH_PPC_64
+       printf("Check for PPC64:\t\t");
+       CHECK_FOR_FLAG(RTE_CPUFLAG_PPC64);
+
+       printf("Check for PPC32:\t\t");
+       CHECK_FOR_FLAG(RTE_CPUFLAG_PPC32);
+
+       printf("Check for VSX:\t\t");
+       CHECK_FOR_FLAG(RTE_CPUFLAG_VSX);
+
+       printf("Check for DFP:\t\t");
+       CHECK_FOR_FLAG(RTE_CPUFLAG_DFP);
+
+       printf("Check for FPU:\t\t");
+       CHECK_FOR_FLAG(RTE_CPUFLAG_FPU);
+
+       printf("Check for SMT:\t\t");
+       CHECK_FOR_FLAG(RTE_CPUFLAG_SMT);
+
+       printf("Check for MMU:\t\t");
+       CHECK_FOR_FLAG(RTE_CPUFLAG_MMU);
+
+       printf("Check for ALTIVEC:\t\t");
+       CHECK_FOR_FLAG(RTE_CPUFLAG_ALTIVEC);
+
+       printf("Check for ARCH_2_06:\t\t");
+       CHECK_FOR_FLAG(RTE_CPUFLAG_ARCH_2_06);
+
+       printf("Check for ARCH_2_07:\t\t");
+       CHECK_FOR_FLAG(RTE_CPUFLAG_ARCH_2_07);
+
+       printf("Check for ICACHE_SNOOP:\t\t");
+       CHECK_FOR_FLAG(RTE_CPUFLAG_ICACHE_SNOOP);
+#else
        printf("Check for SSE:\t\t");
        CHECK_FOR_FLAG(RTE_CPUFLAG_SSE);
 
@@ -117,6 +151,7 @@ test_cpuflags(void)
        CHECK_FOR_FLAG(RTE_CPUFLAG_INVTSC);
 
 
+#endif
 
        /*
         * Check if invalid data is handled properly

diff --git a/lib/librte_eal/common/include/arch/ppc_64/rte_cpuflags.h b/lib/librte_eal/common/include/arch/ppc_64/rte_cpuflags.h
new file mode 100644 (file)
index 0000000..df45047
--- /dev/null
+++ b/lib/librte_eal/common/include/arch/ppc_64/rte_cpuflags.h
@@ -0,0 +1,187 @@
+/*
+ *   BSD LICENSE
+ *
+ *   Copyright (C) IBM Corporation 2014.
+ *
+ *   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 IBM 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.
+*/
+
+#ifndef _RTE_CPUFLAGS_PPC_64_H_
+#define _RTE_CPUFLAGS_PPC_64_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <elf.h>
+#include <fcntl.h>
+#include <assert.h>
+#include <unistd.h>
+
+#include "generic/rte_cpuflags.h"
+
+/* Symbolic values for the entries in the auxiliary table */
+#define AT_HWCAP  16
+#define AT_HWCAP2 26
+
+/* software based registers */
+enum cpu_register_t {
+       REG_HWCAP = 0,
+       REG_HWCAP2,
+};
+
+/**
+ * Enumeration of all CPU features supported
+ */
+enum rte_cpu_flag_t {
+       RTE_CPUFLAG_PPC_LE = 0,
+       RTE_CPUFLAG_TRUE_LE,
+       RTE_CPUFLAG_PSERIES_PERFMON_COMPAT,
+       RTE_CPUFLAG_VSX,
+       RTE_CPUFLAG_ARCH_2_06,
+       RTE_CPUFLAG_POWER6_EXT,
+       RTE_CPUFLAG_DFP,
+       RTE_CPUFLAG_PA6T,
+       RTE_CPUFLAG_ARCH_2_05,
+       RTE_CPUFLAG_ICACHE_SNOOP,
+       RTE_CPUFLAG_SMT,
+       RTE_CPUFLAG_BOOKE,
+       RTE_CPUFLAG_CELLBE,
+       RTE_CPUFLAG_POWER5_PLUS,
+       RTE_CPUFLAG_POWER5,
+       RTE_CPUFLAG_POWER4,
+       RTE_CPUFLAG_NOTB,
+       RTE_CPUFLAG_EFP_DOUBLE,
+       RTE_CPUFLAG_EFP_SINGLE,
+       RTE_CPUFLAG_SPE,
+       RTE_CPUFLAG_UNIFIED_CACHE,
+       RTE_CPUFLAG_4xxMAC,
+       RTE_CPUFLAG_MMU,
+       RTE_CPUFLAG_FPU,
+       RTE_CPUFLAG_ALTIVEC,
+       RTE_CPUFLAG_PPC601,
+       RTE_CPUFLAG_PPC64,
+       RTE_CPUFLAG_PPC32,
+       RTE_CPUFLAG_TAR,
+       RTE_CPUFLAG_LSEL,
+       RTE_CPUFLAG_EBB,
+       RTE_CPUFLAG_DSCR,
+       RTE_CPUFLAG_HTM,
+       RTE_CPUFLAG_ARCH_2_07,
+       /* The last item */
+       RTE_CPUFLAG_NUMFLAGS,/**< This should always be the last! */
+};
+
+static const struct feature_entry cpu_feature_table[] = {
+       FEAT_DEF(PPC_LE, 0x00000001, 0, REG_HWCAP,  0)
+       FEAT_DEF(TRUE_LE, 0x00000001, 0, REG_HWCAP,  1)
+       FEAT_DEF(PSERIES_PERFMON_COMPAT, 0x00000001, 0, REG_HWCAP,  6)
+       FEAT_DEF(VSX, 0x00000001, 0, REG_HWCAP,  7)
+       FEAT_DEF(ARCH_2_06, 0x00000001, 0, REG_HWCAP,  8)
+       FEAT_DEF(POWER6_EXT, 0x00000001, 0, REG_HWCAP,  9)
+       FEAT_DEF(DFP, 0x00000001, 0, REG_HWCAP,  10)
+       FEAT_DEF(PA6T, 0x00000001, 0, REG_HWCAP,  11)
+       FEAT_DEF(ARCH_2_05, 0x00000001, 0, REG_HWCAP,  12)
+       FEAT_DEF(ICACHE_SNOOP, 0x00000001, 0, REG_HWCAP,  13)
+       FEAT_DEF(SMT, 0x00000001, 0, REG_HWCAP,  14)
+       FEAT_DEF(BOOKE, 0x00000001, 0, REG_HWCAP,  15)
+       FEAT_DEF(CELLBE, 0x00000001, 0, REG_HWCAP,  16)
+       FEAT_DEF(POWER5_PLUS, 0x00000001, 0, REG_HWCAP,  17)
+       FEAT_DEF(POWER5, 0x00000001, 0, REG_HWCAP,  18)
+       FEAT_DEF(POWER4, 0x00000001, 0, REG_HWCAP,  19)
+       FEAT_DEF(NOTB, 0x00000001, 0, REG_HWCAP,  20)
+       FEAT_DEF(EFP_DOUBLE, 0x00000001, 0, REG_HWCAP,  21)
+       FEAT_DEF(EFP_SINGLE, 0x00000001, 0, REG_HWCAP,  22)
+       FEAT_DEF(SPE, 0x00000001, 0, REG_HWCAP,  23)
+       FEAT_DEF(UNIFIED_CACHE, 0x00000001, 0, REG_HWCAP,  24)
+       FEAT_DEF(4xxMAC, 0x00000001, 0, REG_HWCAP,  25)
+       FEAT_DEF(MMU, 0x00000001, 0, REG_HWCAP,  26)
+       FEAT_DEF(FPU, 0x00000001, 0, REG_HWCAP,  27)
+       FEAT_DEF(ALTIVEC, 0x00000001, 0, REG_HWCAP,  28)
+       FEAT_DEF(PPC601, 0x00000001, 0, REG_HWCAP,  29)
+       FEAT_DEF(PPC64, 0x00000001, 0, REG_HWCAP,  30)
+       FEAT_DEF(PPC32, 0x00000001, 0, REG_HWCAP,  31)
+       FEAT_DEF(TAR, 0x00000001, 0, REG_HWCAP2,  26)
+       FEAT_DEF(LSEL, 0x00000001, 0, REG_HWCAP2,  27)
+       FEAT_DEF(EBB, 0x00000001, 0, REG_HWCAP2,  28)
+       FEAT_DEF(DSCR, 0x00000001, 0, REG_HWCAP2,  29)
+       FEAT_DEF(HTM, 0x00000001, 0, REG_HWCAP2,  30)
+       FEAT_DEF(ARCH_2_07, 0x00000001, 0, REG_HWCAP2,  31)
+};
+
+/*
+ * Read AUXV software register and get cpu features for Power
+ */
+static inline void
+rte_cpu_get_features(__attribute__((unused)) uint32_t leaf,
+       __attribute__((unused)) uint32_t subleaf, cpuid_registers_t out)
+{
+       int auxv_fd;
+       Elf64_auxv_t auxv;
+
+       auxv_fd = open("/proc/self/auxv", O_RDONLY);
+       assert(auxv_fd);
+       while (read(auxv_fd, &auxv,
+               sizeof(Elf64_auxv_t)) == sizeof(Elf64_auxv_t)) {
+               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;
+       }
+}
+
+/*
+ * Checks if a particular flag is available on current machine.
+ */
+static inline int
+rte_cpu_get_flag_enabled(enum rte_cpu_flag_t feature)
+{
+       const struct feature_entry *feat;
+       cpuid_registers_t regs = {0};
+
+       if (feature >= RTE_CPUFLAG_NUMFLAGS)
+               /* Flag does not match anything in the feature tables */
+               return -ENOENT;
+
+       feat = &cpu_feature_table[feature];
+
+       if (!feat->leaf)
+               /* This entry in the table wasn't filled out! */
+               return -EFAULT;
+
+       /* 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;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_CPUFLAGS_PPC_64_H_ */

diff --git a/mk/rte.cpuflags.mk b/mk/rte.cpuflags.mk
index 65332e1..f595cd0 100644 (file)
--- a/mk/rte.cpuflags.mk
+++ b/mk/rte.cpuflags.mk
@@ -89,6 +89,23 @@ ifneq ($(filter $(AUTO_CPUFLAGS),__AVX2__),)
 CPUFLAGS += AVX2
 endif
 
+# IBM Power CPU flags
+ifneq ($(filter $(AUTO_CPUFLAGS),__PPC64__),)
+CPUFLAGS += PPC64
+endif
+
+ifneq ($(filter $(AUTO_CPUFLAGS),__PPC32__),)
+CPUFLAGS += PPC32
+endif
+
+ifneq ($(filter $(AUTO_CPUFLAGS),__vector),)
+CPUFLAGS += ALTIVEC
+endif
+
+ifneq ($(filter $(AUTO_CPUFLAGS),__builtin_vsx_xvnmaddadp),)
+CPUFLAGS += VSX
+endif
+
 MACHINE_CFLAGS += $(addprefix -DRTE_MACHINE_CPUFLAG_,$(CPUFLAGS))
 
 # To strip whitespace