selftests/powerpc: Add have_hwcap2() helper

We already do this twice and want to add another so add a helper.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/ebb.c b/tools/testing/selftests/powerpc/pmu/ebb/ebb.c
index 9729d9f9021874842e8a18998ba91e3eeae63c74..e67452f1bcffd47141adf60187b052cdf3ae575e 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/ebb.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/ebb.c
@@ -13,7 +13,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
-#include <linux/auxvec.h>
 
 #include "trace.h"
 #include "reg.h"
@@ -324,7 +323,7 @@ bool ebb_is_supported(void)
 {
 #ifdef PPC_FEATURE2_EBB
        /* EBB requires at least POWER8 */
-       return ((long)get_auxv_entry(AT_HWCAP2) & PPC_FEATURE2_EBB);
+       return have_hwcap2(PPC_FEATURE2_EBB);
 #else
        return false;
 #endif

diff --git a/tools/testing/selftests/powerpc/tm/tm-syscall.c b/tools/testing/selftests/powerpc/tm/tm-syscall.c
index e835bf7ec7aedd786a72c192b176e899d202e2c7..d7256b79ec4c9a0928339ac49c70a2d4a81b3cc4 100644 (file)
--- a/tools/testing/selftests/powerpc/tm/tm-syscall.c
+++ b/tools/testing/selftests/powerpc/tm/tm-syscall.c
@@ -14,7 +14,6 @@
 #include <sys/syscall.h>
 #include <asm/tm.h>
 #include <asm/cputable.h>
-#include <linux/auxvec.h>
 #include <sys/time.h>
 #include <stdlib.h>
 
@@ -80,7 +79,7 @@ pid_t getppid_tm(bool suspend)
 static inline bool have_htm_nosc(void)
 {
 #ifdef PPC_FEATURE2_HTM_NOSC
-       return ((long)get_auxv_entry(AT_HWCAP2) & PPC_FEATURE2_HTM_NOSC);
+       return have_hwcap2(PPC_FEATURE2_HTM_NOSC);
 #else
        printf("PPC_FEATURE2_HTM_NOSC not defined, can't check AT_HWCAP2\n");
        return false;

diff --git a/tools/testing/selftests/powerpc/utils.h b/tools/testing/selftests/powerpc/utils.h
index b7d41086bb0a72978263da62440e04c600478bda..fbf2bf530e50ec063a89eea6b0c2c57899e385be 100644 (file)
--- a/tools/testing/selftests/powerpc/utils.h
+++ b/tools/testing/selftests/powerpc/utils.h
@@ -8,6 +8,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <linux/auxvec.h>
 
 /* Avoid headaches with PRI?64 - just use %ll? always */
 typedef unsigned long long u64;
@@ -22,6 +23,11 @@ typedef uint8_t u8;
 int test_harness(int (test_function)(void), char *name);
 extern void *get_auxv_entry(int type);
 
+static inline bool have_hwcap2(unsigned long ftr2)
+{
+       return ((unsigned long)get_auxv_entry(AT_HWCAP2) & ftr2) == ftr2;
+}
+
 /* Yes, this is evil */
 #define FAIL_IF(x)                                             \
 do {                                                           \