selftests/powerpc: Don't run DSCR tests on old systems

The DSCR tests fail on systems that don't have DSCR, so check for the
DSCR in hwcap and skip if it's not present.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200819015727.1977134-5-mpe@ellerman.id.au

diff --git a/tools/testing/selftests/powerpc/dscr/Makefile b/tools/testing/selftests/powerpc/dscr/Makefile
index cfa6eedcb66ca2ebfbed05e054e9ce8e31e75e8b..845db6273a1b17ca127cf398055a666494449826 100644 (file)
--- a/tools/testing/selftests/powerpc/dscr/Makefile
+++ b/tools/testing/selftests/powerpc/dscr/Makefile
@@ -10,4 +10,4 @@ include ../../lib.mk
 
 $(OUTPUT)/dscr_default_test: LDLIBS += -lpthread
 
-$(TEST_GEN_PROGS): ../harness.c
+$(TEST_GEN_PROGS): ../harness.c ../utils.c

diff --git a/tools/testing/selftests/powerpc/dscr/dscr_default_test.c b/tools/testing/selftests/powerpc/dscr/dscr_default_test.c
index 288a4e2ad156a5ded2cf165b54632842fdb73d8b..e76611e608afe75611f6779ef90faaef5c55b364 100644 (file)
--- a/tools/testing/selftests/powerpc/dscr/dscr_default_test.c
+++ b/tools/testing/selftests/powerpc/dscr/dscr_default_test.c
@@ -63,6 +63,8 @@ int dscr_default(void)
        unsigned long i, *status[THREADS];
        unsigned long orig_dscr_default;
 
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_DSCR));
+
        orig_dscr_default = get_default_dscr();
 
        /* Initial DSCR default */

diff --git a/tools/testing/selftests/powerpc/dscr/dscr_explicit_test.c b/tools/testing/selftests/powerpc/dscr/dscr_explicit_test.c
index aefcd8d8759b666fdcdca134ee7f114875587379..32fcf2b324b1ce25a42acdf8f976beb957bc1a39 100644 (file)
--- a/tools/testing/selftests/powerpc/dscr/dscr_explicit_test.c
+++ b/tools/testing/selftests/powerpc/dscr/dscr_explicit_test.c
@@ -21,6 +21,8 @@ int dscr_explicit(void)
 {
        unsigned long i, dscr = 0;
 
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_DSCR));
+
        srand(getpid());
        set_dscr(dscr);
 

diff --git a/tools/testing/selftests/powerpc/dscr/dscr_inherit_exec_test.c b/tools/testing/selftests/powerpc/dscr/dscr_inherit_exec_test.c
index 7c1cb46397c63ae110e092bad7ea2bf8caf4150b..c6a81b2d6b91936abcf96d61dcf5f616cd879369 100644 (file)
--- a/tools/testing/selftests/powerpc/dscr/dscr_inherit_exec_test.c
+++ b/tools/testing/selftests/powerpc/dscr/dscr_inherit_exec_test.c
@@ -44,6 +44,8 @@ int dscr_inherit_exec(void)
        unsigned long i, dscr = 0;
        pid_t pid;
 
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_DSCR));
+
        for (i = 0; i < COUNT; i++) {
                dscr++;
                if (dscr > DSCR_MAX)

diff --git a/tools/testing/selftests/powerpc/dscr/dscr_inherit_test.c b/tools/testing/selftests/powerpc/dscr/dscr_inherit_test.c
index 04297a69ab59dfa5015573f699192881ccca0320..f9dfd3d3c2d587ecac5c7d2c90b5ec4068db01b5 100644 (file)
--- a/tools/testing/selftests/powerpc/dscr/dscr_inherit_test.c
+++ b/tools/testing/selftests/powerpc/dscr/dscr_inherit_test.c
@@ -22,6 +22,8 @@ int dscr_inherit(void)
        unsigned long i, dscr = 0;
        pid_t pid;
 
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_DSCR));
+
        srand(getpid());
        set_dscr(dscr);
 

diff --git a/tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c b/tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c
index 02f6b4efde145928b98de86d1828db00a5f37b01..fbbdffdb2e5d2a9901e3a1bc241d501b17cac4aa 100644 (file)
--- a/tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c
+++ b/tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c
@@ -77,6 +77,8 @@ int dscr_sysfs(void)
        unsigned long orig_dscr_default;
        int i, j;
 
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_DSCR));
+
        orig_dscr_default = get_default_dscr();
        for (i = 0; i < COUNT; i++) {
                for (j = 0; j < DSCR_MAX; j++) {

diff --git a/tools/testing/selftests/powerpc/dscr/dscr_sysfs_thread_test.c b/tools/testing/selftests/powerpc/dscr/dscr_sysfs_thread_test.c
index 37be2c25f2774790af3fbb091dec5cf7c16d230f..191ed126f1188bba7226e5a0cf174aa7411966cb 100644 (file)
--- a/tools/testing/selftests/powerpc/dscr/dscr_sysfs_thread_test.c
+++ b/tools/testing/selftests/powerpc/dscr/dscr_sysfs_thread_test.c
@@ -56,6 +56,8 @@ int dscr_sysfs_thread(void)
        unsigned long orig_dscr_default;
        int i, j;
 
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_DSCR));
+
        orig_dscr_default = get_default_dscr();
        for (i = 0; i < COUNT; i++) {
                for (j = 0; j < DSCR_MAX; j++) {

diff --git a/tools/testing/selftests/powerpc/dscr/dscr_user_test.c b/tools/testing/selftests/powerpc/dscr/dscr_user_test.c
index eaf785d11eedc6730113b209c70a7f062a38677b..e09072446dd30cfc72bc533684ee729197434936 100644 (file)
--- a/tools/testing/selftests/powerpc/dscr/dscr_user_test.c
+++ b/tools/testing/selftests/powerpc/dscr/dscr_user_test.c
@@ -36,6 +36,8 @@ int dscr_user(void)
 {
        int i;
 
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_DSCR));
+
        check_dscr("");
 
        for (i = 0; i < COUNT; i++) {